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-support/libbytesize | |
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-support/libbytesize')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch | 30 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_1.3.bb (renamed from meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb) | 6 |
2 files changed, 3 insertions, 33 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch b/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch deleted file mode 100644 index b57e39fbcc..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2ddc97b30792817d162f51ec3818376aefbf184e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 3 May 2017 02:05:33 -0400 -Subject: [PATCH] remove python2 support - -We use python3 rather than python2 support - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/python/Makefile.am | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/python/Makefile.am b/src/python/Makefile.am -index 567d0d7..8d9f446 100644 ---- a/src/python/Makefile.am -+++ b/src/python/Makefile.am -@@ -1,8 +1,3 @@ --pylibdir = $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") -- --pybytesizedir = $(pylibdir)/bytesize --dist_pybytesize_DATA = bytesize.py __init__.py -- - if WITH_PYTHON3 - py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") - py3bytesizedir = $(py3libdir)/bytesize --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_1.3.bb index 6903021490..caf84de2c5 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_1.3.bb @@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "369127c0edbba7d1a4e2e02486375dd9d379524f" -PV = "0.10+git${SRCPV}" +SRCREV = "b0dcf6f457d700127b43c0e0a198253c266b78ae" +PV = "1.3+git${SRCPV}" SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ - file://0001-remove-python2-support.patch \ " inherit gettext autotools python3native @@ -27,6 +26,7 @@ FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" PACKAGECONFIG ??= "python3" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" |