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/isomd5sum | |
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/isomd5sum')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch | 14 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb (renamed from meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb) | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch index bcfc117245..61310ccf5b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch @@ -1,7 +1,7 @@ -From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001 +From a70513ff59da3c593c76330afb445c21761c3268 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 18 Jul 2017 21:53:00 -0400 -Subject: [PATCH] tweak install prefix +Date: Tue, 31 Jul 2018 17:14:24 +0800 +Subject: [PATCH 1/2] tweak install prefix Upstream-Status: Inappropriate [oe specific] @@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile -index df16a3b..fbdfcb4 100644 +index c98cf35..7c5907f 100644 --- a/Makefile +++ b/Makefile @@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS) @@ -43,7 +43,7 @@ index df16a3b..fbdfcb4 100644 - install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/ - install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) - install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR) -- sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc +- sed "s#@VERSION@#${VERSION}#g; s#@includedir@#/usr/include#g; s#@libdir@#/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc + install -d -m 0755 $(DESTDIR)$(includedir) + install -d -m 0755 $(DESTDIR)$(libdir) + install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig @@ -51,10 +51,10 @@ index df16a3b..fbdfcb4 100644 + install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir) + install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir) + install -m 0644 libcheckisomd5.a $(DESTDIR)$(libdir) -+ sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc ++ sed "s#@VERSION@#${VERSION}#g; s#@includedir@#$(includedir)#g; s#@libdir@#$(libdir)#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc clean: rm -f *.o *.so *.pyc *.a .depend *~ -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index 815113e674..83e8385802 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -25,11 +25,12 @@ do_install () { oe_runmake install } -PACKAGES += "${PYTHON_PN}-${PN} ${PYTHON_PN}-${PN}-dbg" +PACKAGES += "${PYTHON_PN}-${PN}" + +RPROVIDES_${PN}-dbg += "${PYTHON_PN}-${PN}-dbg" FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" -FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so" -SRCREV = "69dc036d20761715b734ca9cc59ecc6dc8145026" +SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b" BBCLASSEXTEND = "native" |