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 /poky/meta/recipes-devtools/opkg-utils | |
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 'poky/meta/recipes-devtools/opkg-utils')
-rw-r--r-- | poky/meta/recipes-devtools/opkg-utils/opkg-utils/pigz.patch | 51 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb | 1 |
2 files changed, 52 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/opkg-utils/opkg-utils/pigz.patch b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/pigz.patch new file mode 100644 index 000000000..dd433e8eb --- /dev/null +++ b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/pigz.patch @@ -0,0 +1,51 @@ +From ab1436927b47badcd219a5f075dfc848020e061d Mon Sep 17 00:00:00 2001 +From: Mike Crowe <mac@mcrowe.com> +Date: Thu, 4 Oct 2018 17:54:19 +0100 +Subject: [opkg-utils PATCH] opkg-build: Add support for explicit use of pigz +To: opkg-devel@googlegroups.com, + yocto@yoctoproject.org + +oe-core has stopped[1] installing pigz as gzip. This means that in +order to persuade opkg-build to use pigz it must be specified +explicitly. Let's teach opkg-build to deal with being passed pigz as a +compressor. + +We can't combine the check for whether -T is required with the one for +gzip because opkg-build needs to call $compressor and gzip separately +to construct the package. + +[1] http://lists.openembedded.org/pipermail/openembedded-commits/2018-February/218767.html + +Upstream-Status: Submitted [opkg-devel@googlegroups.com https://groups.google.com/forum/#!topic/opkg-devel/E0WVOhjK61w] +Signed-off-by: Mike Crowe <mac@mcrowe.com> +--- + opkg-build | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/opkg-build b/opkg-build +index 93a7956..f8403ea 100755 +--- a/opkg-build ++++ b/opkg-build +@@ -170,7 +170,7 @@ fi + + compressor_ext() { + case $1 in +- gzip) ++ gzip|pigz) + echo gz + ;; + bzip2) +@@ -232,6 +232,10 @@ if [ $compressor = "gzip" ] ; then + compressorargs=$zipargs + elif [ $compressor = "xz" ] ; then + compressorargs="--threads 0" ++elif [ $compressor = "pigz" ] ; then ++ if $compressor --help 2>&1 | grep -- "-T" > /dev/null; then ++ compressorargs="-9nT" ++ fi + fi + + tsortargs= +-- +2.11.0 + diff --git a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb index 0487c5f30..cb3775d9c 100644 --- a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb +++ b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb @@ -12,6 +12,7 @@ SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV file://0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch \ file://0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch \ file://threaded-xz.patch \ + file://pigz.patch \ " SRC_URI_append_class-native = " file://tar_ignore_error.patch" UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" |