Package upgrades
v2 cover Package upgrades
Changes in V2:
Remove the ptest part of kmod.
The following changes since commit 6333186e9764b2c269a2b3869956860fa8fde2b1:
binutils: Fix packaging now gold is always built (2015-04-08 23:10:57 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/package-upgrades-20140413
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/package-upgrades-20140413
Chen Qi (6):
curl: upgrade to 7.41.0
busybox: upgrade to 1.23.2
kmod: upgrade to 20
sudo: upgrade to 1.8.13
sysstat: upgrade to 11.1.3
xz: upgrade to 5.2.1
.../{busybox_1.23.1.bb => busybox_1.23.2.bb} | 4 +--
meta/recipes-core/busybox/busybox_git.bb | 4 +--
meta/recipes-extended/sudo/sudo.inc | 12 +++------
.../sudo/{sudo_1.8.11p2.bb => sudo_1.8.13.bb} | 4 +--
.../{sysstat_11.0.2.bb => sysstat_11.1.3.bb} | 4 +--
.../xz/{xz_5.2.0.bb => xz_5.2.1.bb} | 4 +--
meta/recipes-kernel/kmod/kmod.inc | 8 +++---
...01-Makefile.am-fix-parallel-build-problem.patch | 29 +++++++++++++++++++++
...alling-bswap_-instead-of-htobe-and-be-toh.patch | 15 +++++------
.../kmod/kmod/avoid_parallel_tests.patch | 30 ++++++++++++++--------
meta/recipes-kernel/kmod/kmod_git.bb | 15 -----------
.../curl/{curl_7.40.0.bb => curl_7.41.0.bb} | 4 +--
12 files changed, 72 insertions(+), 61 deletions(-)
rename meta/recipes-core/busybox/{busybox_1.23.1.bb => busybox_1.23.2.bb} (90%)
rename meta/recipes-extended/sudo/{sudo_1.8.11p2.bb => sudo_1.8.13.bb} (87%)
rename meta/recipes-extended/sysstat/{sysstat_11.0.2.bb => sysstat_11.1.3.bb} (40%)
rename meta/recipes-extended/xz/{xz_5.2.0.bb => xz_5.2.1.bb} (92%)
create mode 100644 meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
rename meta/recipes-support/curl/{curl_7.40.0.bb => curl_7.41.0.bb} (93%)Signature · 1 line
1.9.1
PATCH v2 1/6 curl: upgrade to 7.41.0
---
meta/recipes-support/curl/{curl_7.40.0.bb => curl_7.41.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/curl/{curl_7.40.0.bb => curl_7.41.0.bb} (93%)meta/recipes-support/curl/curl_7.41.0.bb renamed from meta/recipes-support/curl/curl_7.40.0.bb +2 -2
@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "8d30594212e65657a5c32030f0998fa9" -SRC_URI[sha256sum] = "899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f883fba" +SRC_URI[md5sum] = "87e36f88b7a0f9683fa56f1334562c3a" +SRC_URI[sha256sum] = "9f8b546bdc5c57d959151acae7ce6610fe929d82b8d0fc5b25a3a2296e5f8bea" inherit autotools pkgconfig binconfig multilib_header
Signature · 1 line
1.9.1
PATCH v2 2/6 busybox: upgrade to 1.23.2
In reply to Chen Qi---
meta/recipes-core/busybox/{busybox_1.23.1.bb => busybox_1.23.2.bb} | 4 ++--
meta/recipes-core/busybox/busybox_git.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-core/busybox/{busybox_1.23.1.bb => busybox_1.23.2.bb} (90%)meta/recipes-core/busybox/busybox_1.23.2.bb renamed from meta/recipes-core/busybox/busybox_1.23.1.bb +2 -2
@@ -33,8 +33,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ " -SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" -SRC_URI[tarball.sha256sum] = "300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf" +SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73" +SRC_URI[tarball.sha256sum] = "05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
meta/recipes-core/busybox/busybox_git.bb +2 -2
@@ -1,8 +1,8 @@ require busybox.inc -SRCREV = "1ecfe811fe2f70380170ef7d820e8150054e88ca" +SRCREV = "be947c4d97c0dacb703a6f24dd813ff6dd3a33b6" # Lookout for PV bump too when SRCREV is changed -PV = "1.23.1+git${SRCPV}" +PV = "1.23.2+git${SRCPV}" S = "${WORKDIR}/git"
Signature · 1 line
1.9.1
PATCH v2 3/6 kmod: upgrade to 20
In reply to Chen QiThe following patches are rebased.
-- Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch -- avoid_parallel_tests.patch
The ptest part of kmod is removed because new version of kmod port all tests to use modules from module-playground instead of copying prebuilt modules to the repository. So, we cannot use ptest as before. Remove it so that kmod can build successfully.
--- meta/recipes-kernel/kmod/kmod.inc | 8 +++--- ...01-Makefile.am-fix-parallel-build-problem.patch | 29 +++++++++++++++++++++ ...alling-bswap_-instead-of-htobe-and-be-toh.patch | 15 +++++------ .../kmod/kmod/avoid_parallel_tests.patch | 30 ++++++++++++++-------- meta/recipes-kernel/kmod/kmod_git.bb | 15 ----------- 5 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
meta/recipes-kernel/kmod/kmod.inc +3 -5
@@ -14,16 +14,14 @@ DEPENDS += "pkgconfig-native" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " -inherit autotools gtk-doc ptest +inherit autotools gtk-doc -SRCREV = "fd56638aed3fe147015bfa10ed4a5f7491303cb4" +SRCREV = "d9c71758595cad72c8278179eabf17017615f704" # Lookout for PV bump too when SRCREV is changed -PV = "19+git${SRCPV}" +PV = "20+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ - file://run-ptest \ - file://ptest.patch \ file://avoid_parallel_tests.patch \ file://fix-O_CLOEXEC.patch \ "
meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch new file +29 -0
@@ -0,0 +1,29 @@ +Upstream-Status: Pending + +Subject: Makefile.am: fix parallel build problem + +Fix parallel build problem to avoid errors like below. + + install: cannot stat 'testsuite/module-playground/mod-fake-cciss.ko': No such file or directory + +Signed-off-by: Chen Qi <[email protected]> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9457655..d5b02eb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -237,7 +237,7 @@ rootfs: build-module-playground + + .PHONY: rootfs build-playground + +-$(ROOTFS): $(ROOTFS_PRISTINE) ++$(ROOTFS): $(ROOTFS_PRISTINE) build-module-playground + $(CREATE_ROOTFS) + + TESTSUITE_OVERRIDE_LIBS = \ +-- +1.9.1 +
meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch +6 -9
@@ -1,7 +1,4 @@ -From 4b68940b1ed46c54a5a0bdf6bb9d4599bc64e6f4 Mon Sep 17 00:00:00 2001 -From: Chen Qi <[email protected]> -Date: Wed, 24 Dec 2014 10:12:40 +0800 -Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh +Subject: Change to calling bswap_* instead of htobe* and be*toh We can't use htobe* and be*toh functions because they are not available on older versions of glibc, For example, shipped on Centos 5.5.
@@ -17,10 +14,10 @@ Signed-off-by: Chen Qi <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c -index 2b976a5..ffe58c2 100644 +index 6fc06fc..912185a 100644 --- a/libkmod/libkmod-signature.c +++ b/libkmod/libkmod-signature.c -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ */ #include <endian.h>
@@ -28,15 +25,15 @@ index 2b976a5..ffe58c2 100644 #include <inttypes.h> #include <stdio.h> #include <stdlib.h> -@@ -124,7 +125,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat +@@ -127,7 +128,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat modsig->hash >= PKEY_HASH__LAST || modsig->id_type >= PKEY_ID_TYPE__LAST) return false; - sig_len = be32toh(get_unaligned(&modsig->sig_len)); + sig_len = bswap_32(get_unaligned(&modsig->sig_len)); - if (size < (off_t)(modsig->signer_len + modsig->key_id_len + sig_len)) + if (sig_len == 0 || + size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len)) return false; - -- 1.9.1
meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +19 -11
@@ -7,15 +7,23 @@ serial-tests is now required Signed-off-by: Tudor Florea <[email protected]> Upstream-Status: Inappropriate (disable feature incompatible with ptest) -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2013-09-02 15:05:18.662366800 +0200 -+++ b/configure.ac 2013-11-28 09:26:49.557066764 +0200 -@@ -8,7 +8,7 @@ - AC_CONFIG_SRCDIR([libkmod/libkmod.c]) - AC_CONFIG_AUX_DIR([build-aux]) - AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules -- tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) -+ tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) - AC_PROG_CC_STDC - AC_USE_SYSTEM_EXTENSIONS +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index eb0f9d1..a539968 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE + AC_PREFIX_DEFAULT([/usr]) + AM_MAINTAINER_MODE([enable]) +-AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) ++AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) + AM_SILENT_RULES([yes]) + LT_INIT([disable-static pic-only]) + +-- +1.9.1 +
meta/recipes-kernel/kmod/kmod_git.bb +0 -15
@@ -33,27 +33,12 @@ do_install_append () { # install depmod.d file for search/ dir install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" - - if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then - find testsuite -name *.ko -exec tar rf testmodule.tar {} \; - find testsuite -name *.ko -exec rm -f {} \; - fi } do_compile_prepend() { sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status } -do_compile_ptest () { - oe_runmake buildtest-TESTS rootfs -} - -do_install_ptest () { - install testmodule.tar ${D}${PTEST_PATH} -} - -INSANE_SKIP_${PN}-ptest = "arch" - inherit update-alternatives ALTERNATIVE_PRIORITY = "60"
Signature · 1 line
1.9.1
PATCH v2 4/6 sudo: upgrade to 1.8.13
In reply to Chen Qi---
meta/recipes-extended/sudo/sudo.inc | 12 +++---------
.../sudo/{sudo_1.8.11p2.bb => sudo_1.8.13.bb} | 4 ++--
2 files changed, 5 insertions(+), 11 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.11p2.bb => sudo_1.8.13.bb} (87%)meta/recipes-extended/sudo/sudo.inc +3 -9
@@ -4,12 +4,12 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=69e337d679950e304953813158595256 \ - file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=e2dbb155fc49beea947515300bab99e0 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=346ce81ebf0f7f89fd379b40b6a4233b \ + file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=cfe41112f96c19a074934d128f45c693 \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ - file://lib/util/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea \ + file://lib/util/snprintf.c;beginline=6;endline=34;md5=c82c1b3a5c32e08545c9ec5d71e41e50 \ file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a"
@@ -22,12 +22,6 @@ CONFFILES_${PN} = "${sysconfdir}/sudoers" EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - # mksigname/mksiglist are used on build host to generate source files do_compile_prepend () { oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist
meta/recipes-extended/sudo/sudo_1.8.13.bb renamed from meta/recipes-extended/sudo/sudo_1.8.11p2.bb +2 -2
@@ -6,8 +6,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "84012b4871b6c775c957cd310d5bad87" -SRC_URI[sha256sum] = "8133849418fa18cf6b6bb6893d1855ff7afe21db8923234a00bf045c90fba1ad" +SRC_URI[md5sum] = "f61577ec330ad1bd504c0e2eec6ea2d8" +SRC_URI[sha256sum] = "e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
Signature · 1 line
1.9.1
PATCH v2 5/6 sysstat: upgrade to 11.1.3
In reply to Chen Qi---
.../recipes-extended/sysstat/{sysstat_11.0.2.bb => sysstat_11.1.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/sysstat/{sysstat_11.0.2.bb => sysstat_11.1.3.bb} (40%)meta/recipes-extended/sysstat/sysstat_11.1.3.bb renamed from meta/recipes-extended/sysstat/sysstat_11.0.2.bb +2 -2
@@ -2,5 +2,5 @@ require sysstat.inc LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI[md5sum] = "27d4ca66869dce132ace3194dd7d7539" -SRC_URI[sha256sum] = "acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96" +SRC_URI[md5sum] = "27385bcb6c1e585de8ba7cb25ac67aef" +SRC_URI[sha256sum] = "ddbd07dfac47bcf0a6c2ae503bd80ad84dbed80c939d3dd333eb8453c38c337b"
Signature · 1 line
1.9.1
PATCH v2 6/6 xz: upgrade to 5.2.1
In reply to Chen Qi---
meta/recipes-extended/xz/{xz_5.2.0.bb => xz_5.2.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/xz/{xz_5.2.0.bb => xz_5.2.1.bb} (92%)meta/recipes-extended/xz/xz_5.2.1.bb renamed from meta/recipes-extended/xz/xz_5.2.0.bb +2 -2
@@ -25,8 +25,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \ file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 " SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz" -SRC_URI[md5sum] = "be585bdf8672e4406632eda3d819e284" -SRC_URI[sha256sum] = "231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba98bf3d6" +SRC_URI[md5sum] = "3e44c766c3fb4f19e348e646fcd5778a" +SRC_URI[sha256sum] = "b918b6648076e74f8d7ae19db5ee663df800049e187259faf5eb997a7b974681" inherit autotools gettext
Signature · 1 line
1.9.1
Please ignore this one.
I just noticed five of the patches have been merged. I'll send out the patch for kmod.
Regards,
Chen Qi
Quoted 40 lines · Chen Qi
Changes in V2:
Remove the ptest part of kmod.The following changes since commit
6333186e9764b2c269a2b3869956860fa8fde2b1:binutils: Fix packaging now gold is always built (2015-04-08 23:10:57 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribChenQi/package-upgrades-20140413
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/package-upgrades-20140413Chen Qi (6):
curl: upgrade to 7.41.0 busybox: upgrade to 1.23.2 kmod: upgrade to 20 sudo: upgrade to 1.8.13 sysstat: upgrade to 11.1.3 xz: upgrade to 5.2.1.../{busybox_1.23.1.bb => busybox_1.23.2.bb} | 4 +-- meta/recipes-core/busybox/busybox_git.bb | 4 +-- meta/recipes-extended/sudo/sudo.inc | 12 +++------ .../sudo/{sudo_1.8.11p2.bb => sudo_1.8.13.bb} | 4 +-- .../{sysstat_11.0.2.bb => sysstat_11.1.3.bb} | 4 +-- .../xz/{xz_5.2.0.bb => xz_5.2.1.bb} | 4 +-- meta/recipes-kernel/kmod/kmod.inc | 8 +++--- ...01-Makefile.am-fix-parallel-build-problem.patch | 29 +++++++++++++++++++++ ...alling-bswap_-instead-of-htobe-and-be-toh.patch | 15 +++++------ .../kmod/kmod/avoid_parallel_tests.patch | 30 ++++++++++++++-------- meta/recipes-kernel/kmod/kmod_git.bb | 15 ----------- .../curl/{curl_7.40.0.bb => curl_7.41.0.bb} | 4 +-- 12 files changed, 72 insertions(+), 61 deletions(-)rename meta/recipes-core/busybox/{busybox_1.23.1.bb => busybox_1.23.2.bb} (90%) rename meta/recipes-extended/sudo/{sudo_1.8.11p2.bb => sudo_1.8.13.bb} (87%) rename meta/recipes-extended/sysstat/{sysstat_11.0.2.bb => sysstat_11.1.3.bb} (40%) rename meta/recipes-extended/xz/{xz_5.2.0.bb => xz_5.2.1.bb} (92%)
create mode 100644meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patchrename meta/recipes-support/curl/{curl_7.40.0.bb => curl_7.41.0.bb} (93%)