* [PATCH 1/6] curl: upgrade to 7.41.0
2015-04-08 10:24 [PATCH 0/6] Package Upgrades Chen Qi
@ 2015-04-08 10:24 ` Chen Qi
2015-04-08 10:24 ` [PATCH 2/6] busybox: upgrade to 1.23.2 Chen Qi
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Chen Qi @ 2015-04-08 10:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
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%)
diff --git a/meta/recipes-support/curl/curl_7.40.0.bb b/meta/recipes-support/curl/curl_7.41.0.bb
similarity index 93%
rename from meta/recipes-support/curl/curl_7.40.0.bb
rename to meta/recipes-support/curl/curl_7.41.0.bb
index 4cde9c6..c3c3c0b 100644
--- a/meta/recipes-support/curl/curl_7.40.0.bb
+++ b/meta/recipes-support/curl/curl_7.41.0.bb
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/6] busybox: upgrade to 1.23.2
2015-04-08 10:24 [PATCH 0/6] Package Upgrades Chen Qi
2015-04-08 10:24 ` [PATCH 1/6] curl: upgrade to 7.41.0 Chen Qi
@ 2015-04-08 10:24 ` Chen Qi
2015-04-08 10:24 ` [PATCH 3/6] kmod: upgrade to 20 Chen Qi
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Chen Qi @ 2015-04-08 10:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
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%)
diff --git a/meta/recipes-core/busybox/busybox_1.23.1.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb
similarity index 90%
rename from meta/recipes-core/busybox/busybox_1.23.1.bb
rename to meta/recipes-core/busybox/busybox_1.23.2.bb
index 1742390..0af292d 100644
--- a/meta/recipes-core/busybox/busybox_1.23.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.23.2.bb
@@ -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"
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index 529ed5b..7b868a2 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -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"
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/6] kmod: upgrade to 20
2015-04-08 10:24 [PATCH 0/6] Package Upgrades Chen Qi
2015-04-08 10:24 ` [PATCH 1/6] curl: upgrade to 7.41.0 Chen Qi
2015-04-08 10:24 ` [PATCH 2/6] busybox: upgrade to 1.23.2 Chen Qi
@ 2015-04-08 10:24 ` Chen Qi
2015-04-09 11:46 ` Richard Purdie
2015-04-08 10:24 ` [PATCH 4/6] sudo: upgrade to 1.8.13 Chen Qi
` (2 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Chen Qi @ 2015-04-08 10:24 UTC (permalink / raw)
To: openembedded-core
The following patches are rebased.
-- Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
-- avoid_parallel_tests.patch
The following patch is added to solve a parallel build bug.
-- 0001-Makefile.am-fix-parallel-build-problem.patch
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-kernel/kmod/kmod.inc | 5 ++--
...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 ++++++++++++++--------
4 files changed, 57 insertions(+), 22 deletions(-)
create mode 100644 meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 899881e..dd2267e 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -16,9 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
"
inherit autotools gtk-doc ptest
-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 \
@@ -26,6 +26,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
file://ptest.patch \
file://avoid_parallel_tests.patch \
file://fix-O_CLOEXEC.patch \
+ file://0001-Makefile.am-fix-parallel-build-problem.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch b/meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
new file mode 100644
index 0000000..49b0209
--- /dev/null
+++ b/meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
@@ -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 <Qi.Chen@windriver.com>
+---
+ 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
+
diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
index 7c0a275..b722183 100644
--- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
@@ -1,7 +1,4 @@
-From 4b68940b1ed46c54a5a0bdf6bb9d4599bc64e6f4 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-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 <Qi.Chen@windriver.com>
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
diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
index 4c37d44..feafcb9 100644
--- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
+++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
@@ -7,15 +7,23 @@ serial-tests is now required
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
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
+
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 3/6] kmod: upgrade to 20
2015-04-08 10:24 ` [PATCH 3/6] kmod: upgrade to 20 Chen Qi
@ 2015-04-09 11:46 ` Richard Purdie
2015-04-10 3:16 ` ChenQi
0 siblings, 1 reply; 11+ messages in thread
From: Richard Purdie @ 2015-04-09 11:46 UTC (permalink / raw)
To: Chen Qi; +Cc: openembedded-core
On Wed, 2015-04-08 at 18:24 +0800, Chen Qi wrote:
> The following patches are rebased.
> -- Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
> -- avoid_parallel_tests.patch
>
> The following patch is added to solve a parallel build bug.
> -- 0001-Makefile.am-fix-parallel-build-problem.patch
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> meta/recipes-kernel/kmod/kmod.inc | 5 ++--
> ...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 ++++++++++++++--------
> 4 files changed, 57 insertions(+), 22 deletions(-)
> create mode 100644 meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
Doesn't seem to build:
https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/250/steps/BuildImages_1/logs/stdio
Cheers,
Richard
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/6] kmod: upgrade to 20
2015-04-09 11:46 ` Richard Purdie
@ 2015-04-10 3:16 ` ChenQi
0 siblings, 0 replies; 11+ messages in thread
From: ChenQi @ 2015-04-10 3:16 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On 04/09/2015 07:46 PM, Richard Purdie wrote:
> On Wed, 2015-04-08 at 18:24 +0800, Chen Qi wrote:
>> The following patches are rebased.
>> -- Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
>> -- avoid_parallel_tests.patch
>>
>> The following patch is added to solve a parallel build bug.
>> -- 0001-Makefile.am-fix-parallel-build-problem.patch
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>> meta/recipes-kernel/kmod/kmod.inc | 5 ++--
>> ...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 ++++++++++++++--------
>> 4 files changed, 57 insertions(+), 22 deletions(-)
>> create mode 100644 meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
> Doesn't seem to build:
>
> https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/250/steps/BuildImages_1/logs/stdio
>
> Cheers,
>
> Richard
>
>
>
Thanks for pointing it out.
I'm looking into this problem.
New version of kmod is modified to use modules from module-playground
instead of copying prebuilt modules to the repository. And those modules
are built against host /lib/modules/xxx directory. I think that's the
root cause.
I'm trying to figure out a solution.
Best Regards,
Chen Qi
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/6] sudo: upgrade to 1.8.13
2015-04-08 10:24 [PATCH 0/6] Package Upgrades Chen Qi
` (2 preceding siblings ...)
2015-04-08 10:24 ` [PATCH 3/6] kmod: upgrade to 20 Chen Qi
@ 2015-04-08 10:24 ` Chen Qi
2015-04-08 13:32 ` Randy MacLeod
2015-04-08 10:24 ` [PATCH 5/6] sysstat: upgrade to 11.1.3 Chen Qi
2015-04-08 10:24 ` [PATCH 6/6] xz: upgrade to 5.2.1 Chen Qi
5 siblings, 1 reply; 11+ messages in thread
From: Chen Qi @ 2015-04-08 10:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
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%)
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 6e9aec8..2d411f3 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -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
diff --git a/meta/recipes-extended/sudo/sudo_1.8.11p2.bb b/meta/recipes-extended/sudo/sudo_1.8.13.bb
similarity index 87%
rename from meta/recipes-extended/sudo/sudo_1.8.11p2.bb
rename to meta/recipes-extended/sudo/sudo_1.8.13.bb
index c5e2545..4494170 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.11p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.13.bb
@@ -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)}"
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 4/6] sudo: upgrade to 1.8.13
2015-04-08 10:24 ` [PATCH 4/6] sudo: upgrade to 1.8.13 Chen Qi
@ 2015-04-08 13:32 ` Randy MacLeod
2015-04-09 1:59 ` ChenQi
0 siblings, 1 reply; 11+ messages in thread
From: Randy MacLeod @ 2015-04-08 13:32 UTC (permalink / raw)
To: Chen Qi, openembedded-core
On 2015-04-08 06:24 AM, Chen Qi wrote:
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> 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%)
>
> diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
> index 6e9aec8..2d411f3 100644
> --- a/meta/recipes-extended/sudo/sudo.inc
> +++ b/meta/recipes-extended/sudo/sudo.inc
> @@ -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
> -}
Is this really safe to drop?
If so please explain why in the long log.
../Randy
> -
> # 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
> diff --git a/meta/recipes-extended/sudo/sudo_1.8.11p2.bb b/meta/recipes-extended/sudo/sudo_1.8.13.bb
> similarity index 87%
> rename from meta/recipes-extended/sudo/sudo_1.8.11p2.bb
> rename to meta/recipes-extended/sudo/sudo_1.8.13.bb
> index c5e2545..4494170 100644
> --- a/meta/recipes-extended/sudo/sudo_1.8.11p2.bb
> +++ b/meta/recipes-extended/sudo/sudo_1.8.13.bb
> @@ -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)}"
>
--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200 Ottawa, Ontario,
Canada K2K 2W5
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 4/6] sudo: upgrade to 1.8.13
2015-04-08 13:32 ` Randy MacLeod
@ 2015-04-09 1:59 ` ChenQi
0 siblings, 0 replies; 11+ messages in thread
From: ChenQi @ 2015-04-09 1:59 UTC (permalink / raw)
To: Randy MacLeod, openembedded-core
On 04/08/2015 09:32 PM, Randy MacLeod wrote:
> On 2015-04-08 06:24 AM, Chen Qi wrote:
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>> 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%)
>>
>> diff --git a/meta/recipes-extended/sudo/sudo.inc
>> b/meta/recipes-extended/sudo/sudo.inc
>> index 6e9aec8..2d411f3 100644
>> --- a/meta/recipes-extended/sudo/sudo.inc
>> +++ b/meta/recipes-extended/sudo/sudo.inc
>> @@ -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
>> -}
>
> Is this really safe to drop?
> If so please explain why in the long log.
>
> ../Randy
I've updated the patch in the repo:
git://git.openembedded.org/openembedded-core-contrib
ChenQi/package-upgrade-20150408
commit 3160a583f7bafb06062840bb0a920416c0e31eec
Author: Chen Qi <Qi.Chen@windriver.com>
Date: Wed Apr 8 14:39:14 2015 +0800
sudo: upgrade to 1.8.13
The do_configure_prepend is deleted because it doesn't seem to have any
positive effect and it causes the following error.
| aclocal: error: acinclude.m4:133: file 'm4/ax_sys_weak_alias.m4'
does not exist
| autoreconf: aclocal failed with exit status: 1
| ERROR: autoreconf execution failed.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Best Regards,
Chen Qi
>> -
>> # 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
>> diff --git a/meta/recipes-extended/sudo/sudo_1.8.11p2.bb
>> b/meta/recipes-extended/sudo/sudo_1.8.13.bb
>> similarity index 87%
>> rename from meta/recipes-extended/sudo/sudo_1.8.11p2.bb
>> rename to meta/recipes-extended/sudo/sudo_1.8.13.bb
>> index c5e2545..4494170 100644
>> --- a/meta/recipes-extended/sudo/sudo_1.8.11p2.bb
>> +++ b/meta/recipes-extended/sudo/sudo_1.8.13.bb
>> @@ -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)}"
>>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/6] sysstat: upgrade to 11.1.3
2015-04-08 10:24 [PATCH 0/6] Package Upgrades Chen Qi
` (3 preceding siblings ...)
2015-04-08 10:24 ` [PATCH 4/6] sudo: upgrade to 1.8.13 Chen Qi
@ 2015-04-08 10:24 ` Chen Qi
2015-04-08 10:24 ` [PATCH 6/6] xz: upgrade to 5.2.1 Chen Qi
5 siblings, 0 replies; 11+ messages in thread
From: Chen Qi @ 2015-04-08 10:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
.../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%)
diff --git a/meta/recipes-extended/sysstat/sysstat_11.0.2.bb b/meta/recipes-extended/sysstat/sysstat_11.1.3.bb
similarity index 40%
rename from meta/recipes-extended/sysstat/sysstat_11.0.2.bb
rename to meta/recipes-extended/sysstat/sysstat_11.1.3.bb
index ce83f4f..061f3db 100644
--- a/meta/recipes-extended/sysstat/sysstat_11.0.2.bb
+++ b/meta/recipes-extended/sysstat/sysstat_11.1.3.bb
@@ -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"
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/6] xz: upgrade to 5.2.1
2015-04-08 10:24 [PATCH 0/6] Package Upgrades Chen Qi
` (4 preceding siblings ...)
2015-04-08 10:24 ` [PATCH 5/6] sysstat: upgrade to 11.1.3 Chen Qi
@ 2015-04-08 10:24 ` Chen Qi
5 siblings, 0 replies; 11+ messages in thread
From: Chen Qi @ 2015-04-08 10:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
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%)
diff --git a/meta/recipes-extended/xz/xz_5.2.0.bb b/meta/recipes-extended/xz/xz_5.2.1.bb
similarity index 92%
rename from meta/recipes-extended/xz/xz_5.2.0.bb
rename to meta/recipes-extended/xz/xz_5.2.1.bb
index 3439ec9..a197f91 100644
--- a/meta/recipes-extended/xz/xz_5.2.0.bb
+++ b/meta/recipes-extended/xz/xz_5.2.1.bb
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread