diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch deleted file mode 100644 index ffd7a40fab..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream-Status: Inappropriate [no upstream] - -* nfslib should use NVER instead of VER -* install the missing soname library - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - Makefile.in | 9 ++++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 836ca9b..a589fb8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -27,7 +27,7 @@ install: @INSTALL_TARGETS@ - - static: liblockfile.a dotlockfile - shared: liblockfile.so dotlockfile --nfslib: nfslock.so.$(VER) -+nfslib: nfslock.so.$(NVER) - - liblockfile.a: lockfile.o - $(AR) rv liblockfile.a lockfile.o -@@ -36,7 +36,7 @@ liblockfile.so: liblockfile.a - $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ - -o liblockfile.so lockfile.o $(LDFLAGS) -lc - --nfslock.so.$(VER): nfslock.o -+nfslock.so.$(NVER): nfslock.o - $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ - -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) - -@@ -59,6 +59,7 @@ install_shared: shared install_common - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so -+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.1 - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -@@ -72,7 +73,9 @@ install_common: - - install_nfslib: nfslib - install -d $(ROOT)$(nfslockdir) -- install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) -+ install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir) -+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so -+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so.0 - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - clean: --- -1.7.9.5 - |