diff options
Diffstat (limited to 'main/s390-tools/0400-busybox-compat.patch')
| -rw-r--r-- | main/s390-tools/0400-busybox-compat.patch | 68 |
1 files changed, 66 insertions, 2 deletions
diff --git a/main/s390-tools/0400-busybox-compat.patch b/main/s390-tools/0400-busybox-compat.patch index be9f841165b..102e63d6eb7 100644 --- a/main/s390-tools/0400-busybox-compat.patch +++ b/main/s390-tools/0400-busybox-compat.patch @@ -1,8 +1,10 @@ +diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile +index 1c77699..16f89c3 100644 --- a/libekmfweb/Makefile +++ b/libekmfweb/Makefile -@@ -73,13 +73,13 @@ libekmfweb.so.$(VERSION): ALL_LDFLAGS += +@@ -91,13 +91,13 @@ libekmfweb.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libekmfweb -Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM) - libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o + libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o $(libs) $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ - ln -srf libekmfweb.so.$(VERSION) libekmfweb.so.$(VERM) - ln -srf libekmfweb.so.$(VERSION) libekmfweb.so @@ -19,3 +21,65 @@ $(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb +diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile +index addd096..9a0b776 100644 +--- a/libkmipclient/Makefile ++++ b/libkmipclient/Makefile +@@ -114,13 +114,13 @@ libkmipclient.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libkmip + libkmipclient.so.$(VERSION): kmip.o request.o response.o attribute.o key.o ttlv.o json.o \ + xml.o https.o tls.o names.o utils.o + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ +- ln -srf libkmipclient.so.$(VERSION) libkmipclient.so.$(VERM) +- ln -srf libkmipclient.so.$(VERSION) libkmipclient.so ++ ln -sf libkmipclient.so.$(VERSION) libkmipclient.so.$(VERM) ++ ln -sf libkmipclient.so.$(VERSION) libkmipclient.so + + install-libkmipclient.so.$(VERSION): libkmipclient.so.$(VERSION) +- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) +- ln -srf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERM) +- ln -srf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so ++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) ++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERM) ++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so + $(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/kmipclient + $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/kmipclient/kmipclient.h $(DESTDIR)$(USRINCLUDEDIR)/kmipclient + +diff --git a/zkey/ekmfweb/Makefile b/zkey/ekmfweb/Makefile +index 013beb8..c8de734 100644 +--- a/zkey/ekmfweb/Makefile ++++ b/zkey/ekmfweb/Makefile +@@ -49,7 +49,7 @@ install: all install-libekmfweb.dep zkey-ekmfweb.so + $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) -m 644 -c zkey-ekmfweb.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) -d -m 755 $(DESTDIR)$(ZKEYKMSPLUGINDIR) +- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-ekmfweb.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-ekmfweb.so ++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-ekmfweb.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-ekmfweb.so + + clean: + rm -f *.o zkey-ekmfweb.so install-libekmfweb.dep libekmfweb.dep +diff --git a/zkey/kmip/Makefile b/zkey/kmip/Makefile +index 14a532e..ca604de 100644 +--- a/zkey/kmip/Makefile ++++ b/zkey/kmip/Makefile +@@ -50,7 +50,7 @@ install: all install-libkmipclient.dep zkey-kmip.so + $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) -m 644 -c zkey-kmip.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) -d -m 755 $(DESTDIR)$(ZKEYKMSPLUGINDIR) +- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-kmip.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-kmip.so ++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-kmip.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-kmip.so + $(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/kmip + $(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/kmip/profiles + $(INSTALL) -m 644 -c profiles/*.profile $(DESTDIR)$(SYSCONFDIR)/zkey/kmip/profiles +diff --git a/chreipl-fcp-mpath/Makefile b/chreipl-fcp-mpath/Makefile +index e7fb920..f628390 100644 +--- a/chreipl-fcp-mpath/Makefile ++++ b/chreipl-fcp-mpath/Makefile +@@ -130,7 +130,7 @@ else # $(ENABLE_DOC) != 1 + # freshness of the man page can be checked, even if `pandoc` is not available, + # or ENABLE_DOC disabled. + +-MANPAGE_FRESH := $(shell sha256sum --check .chreipl-fcp-mpath.7.cksum >/dev/null && echo 1 || echo 0) ++MANPAGE_FRESH := $(shell sha256sum -c .chreipl-fcp-mpath.7.cksum >/dev/null && echo 1 || echo 0) + ifeq ($(MANPAGE_FRESH),0) + $(warning chreipl-fcp-mpath.7 is outdated, please regenerate it by calling `make ENABLE_DOC=1`) + endif |