Package upgrades
cover Package upgrades
The patchset was tested on a local autobuilder, for all major architecture, on the top of the following commit 505114c13d29799a25379f7ce720d632616d8776. Basic functionality tests done using rpm and deb packages on a core-image- sato-sdk.
Cristiana Voicu (4):
liburcu: upgrade to 0.8.0
at: upgrade to 3.1.14
curl: upgrade to 7.33.0
sudo: upgrade to 1.8.8
.../at/{at_3.1.13.bb => at_3.1.14.bb} | 7 ++---
meta/recipes-extended/at/files/configure.patch | 29 --------------------
meta/recipes-extended/at/files/use-ldflags.patch | 24 ----------------
meta/recipes-extended/sudo/sudo.inc | 2 +-
.../sudo/{sudo_1.8.7.bb => sudo_1.8.8.bb} | 4 +--
.../curl/{curl_7.32.0.bb => curl_7.33.0.bb} | 4 +--
meta/recipes-support/liburcu/files/fixCCflag.patch | 18 ++++++++++++
.../liburcu/files/fixsepbuild.patch | 18 ++++++++++++
.../liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} | 8 ++++--
9 files changed, 48 insertions(+), 66 deletions(-)
rename meta/recipes-extended/at/{at_3.1.13.bb => at_3.1.14.bb} (90%)
delete mode 100644 meta/recipes-extended/at/files/configure.patch
delete mode 100644 meta/recipes-extended/at/files/use-ldflags.patch
rename meta/recipes-extended/sudo/{sudo_1.8.7.bb => sudo_1.8.8.bb} (83%)
rename meta/recipes-support/curl/{curl_7.32.0.bb => curl_7.33.0.bb} (93%)
create mode 100644 meta/recipes-support/liburcu/files/fixCCflag.patch
create mode 100644 meta/recipes-support/liburcu/files/fixsepbuild.patch
rename meta/recipes-support/liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} (74%)Signature · 1 line
1.7.9.5
PATCH 1/4 liburcu: upgrade to 0.8.0
Fix case where ${B} != ${S}; add patch to allow out of tree doc exemples build to work
Add patch to remove CC=gcc when CC is defined, in order to use the cross compiler.
---
meta/recipes-support/liburcu/files/fixCCflag.patch | 18 ++++++++++++++++++
.../liburcu/files/fixsepbuild.patch | 18 ++++++++++++++++++
.../liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} | 8 +++++---
3 files changed, 41 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-support/liburcu/files/fixCCflag.patch
create mode 100644 meta/recipes-support/liburcu/files/fixsepbuild.patch
rename meta/recipes-support/liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} (74%)meta/recipes-support/liburcu/files/fixCCflag.patch new file +18 -0
@@ -0,0 +1,18 @@ +Use cross compiler for doc exemples too + +10/23/2013 - created by Cristiana Voicu <[email protected]> + +Index: userspace-rcu-0.8.0/doc/examples/Makefile.examples.template +=================================================================== +--- userspace-rcu-0.8.0.orig/doc/examples/Makefile.examples.template 2013-08-30 21:25:20.000000000 +0300 ++++ userspace-rcu-0.8.0/doc/examples/Makefile.examples.template 2013-10-23 13:34:30.405550556 +0300 +@@ -11,7 +11,9 @@ + # + # This makefile is purposefully kept simple to support GNU and BSD make. + ++ifndef CC + CC = gcc ++endif + CFLAGS = -g -O2 -Wall + + all: $(BINARY)
meta/recipes-support/liburcu/files/fixsepbuild.patch new file +18 -0
@@ -0,0 +1,18 @@ +Upstream-Status: Pending + +Fix out of tree build for doc examples +10/22/2013 - created by Cristiana Voicu <[email protected]> + +Index: userspace-rcu-0.8.0/doc/examples/Makefile.am +=================================================================== +--- userspace-rcu-0.8.0.orig/doc/examples/Makefile.am 2013-08-30 21:25:20.000000000 +0300 ++++ userspace-rcu-0.8.0/doc/examples/Makefile.am 2013-10-21 17:52:34.774597179 +0300 +@@ -128,7 +128,7 @@ + cp -fR $(srcdir)/$$subdir $(builddir); \ + done; \ + fi +- $(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all ++ $(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I$(top_srcdir) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all + + clean-local: + $(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean
meta/recipes-support/liburcu/liburcu_0.8.0.bb renamed from meta/recipes-support/liburcu/liburcu_0.7.7.bb +5 -3
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \ file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" -SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" +SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ + file://fixsepbuild.patch \ + file://fixCCflag.patch" -SRC_URI[md5sum] = "d14de3ff32eb1ab9424b258599c8a6f3" -SRC_URI[sha256sum] = "8ab8a7d8fea47c09ceac24c9277f00da626bbd9426c973eb325b1baf33b4bdfb" +SRC_URI[md5sum] = "ddf193131b9f172c8f540b60d9d339f4" +SRC_URI[sha256sum] = "49fbe70af47945037f437931c9539bfb9cb03ba28b813649ea7394dbdca70658" S = "${WORKDIR}/userspace-rcu-${PV}" CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
Signature · 1 line
1.7.9.5
Re: [PATCH 1/4] liburcu: upgrade to 0.8.0
Quoted 21 lines · Cristiana Voicu
Fix case where ${B} != ${S}; add patch to allow out of tree doc exemples build to work
Add patch to remove CC=gcc when CC is defined, in order to use the cross compiler.Signed-off-by Cristiana Voicu <[email protected]>--- meta/recipes-support/liburcu/files/fixCCflag.patch | 18 ++++++++++++++++++ .../liburcu/files/fixsepbuild.patch | 18 ++++++++++++++++++ .../liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} | 8 +++++--- 3 files changed, 41 insertions(+), 3 deletions(-)create mode 100644
meta/recipes-support/liburcu/files/fixCCflag.patchcreate mode 100644meta/recipes-support/liburcu/files/fixsepbuild.patchrename meta/recipes-support/liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} (74%)meta/recipes-support/liburcu/files/fixCCflag.patch new file +0
-0
meta/recipes-support/liburcu/files/fixCCflag.patch line 4
Quoted 4 lines
meta/recipes-support/liburcu/files/fixCCflag.patch new file +4
-0@@ -0,0 +1,18 @@ +Use cross compiler for doc exemples too + +10/23/2013 - created by Cristiana Voicu <[email protected]> +
This is kind of OK, but really should be Signed-off-by: instead
No Upstream-Status in this patch
Quoted 20 lines
meta/recipes-support/liburcu/files/fixCCflag.patch new file +14
-0+Index: userspace-rcu-0.8.0/doc/examples/Makefile.examples.template +=================================================================== +--- userspace-rcu-0.8.0.orig/doc/examples/Makefile.examples.template 2013-08-30 21:25:20.000000000 +0300 ++++ userspace-rcu-0.8.0/doc/examples/Makefile.examples.template 2013-10-23 13:34:30.405550556 +0300 +@@ -11,7 +11,9 @@ + # + # This makefile is purposefully kept simple to support GNU and BSD make. + ++ifndef CC + CC = gcc ++endif + CFLAGS = -g -O2 -Wall + + all: $(BINARY)meta/recipes-support/liburcu/files/fixsepbuild.patch new file +0
-0
meta/recipes-support/liburcu/files/fixsepbuild.patch line 5
Quoted 5 lines
meta/recipes-support/liburcu/files/fixsepbuild.patch new file +5
-0@@ -0,0 +1,18 @@ +Upstream-Status: Pending + +Fix out of tree build for doc examples +10/22/2013 - created by Cristiana Voicu <[email protected]> +
Same here really should be Signed-off-by
Quoted 37 lines
meta/recipes-support/liburcu/files/fixsepbuild.patch new file +13
-0+Index: userspace-rcu-0.8.0/doc/examples/Makefile.am +=================================================================== +--- userspace-rcu-0.8.0.orig/doc/examples/Makefile.am 2013-08-30 21:25:20.000000000 +0300 ++++ userspace-rcu-0.8.0/doc/examples/Makefile.am 2013-10-21 17:52:34.774597179 +0300 +@@ -128,7 +128,7 @@ + cp -fR $(srcdir)/$$subdir $(builddir); \ + done; \ + fi +- $(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all ++ $(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I$(top_srcdir) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all + + clean-local: + $(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) cleanmeta/recipes-support/liburcu/liburcu_0.8.0.bb renamed from meta/recipes-support/liburcu/liburcu_0.7.7.bb +5
-3@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \ file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" -SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" +SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ + file://fixsepbuild.patch \ + file://fixCCflag.patch" -SRC_URI[md5sum] = "d14de3ff32eb1ab9424b258599c8a6f3" -SRC_URI[sha256sum] = "8ab8a7d8fea47c09ceac24c9277f00da626bbd9426c973eb325b1baf33b4bdfb" +SRC_URI[md5sum] = "ddf193131b9f172c8f540b60d9d339f4" +SRC_URI[sha256sum] = "49fbe70af47945037f437931c9539bfb9cb03ba28b813649ea7394dbdca70658" S = "${WORKDIR}/userspace-rcu-${PV}" CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
PATCH 2/4 at: upgrade to 3.1.14
In reply to Cristiana VoicuRemoved 2 patches because they were merged upstream
---
.../at/{at_3.1.13.bb => at_3.1.14.bb} | 7 ++---
meta/recipes-extended/at/files/configure.patch | 29 --------------------
meta/recipes-extended/at/files/use-ldflags.patch | 24 ----------------
3 files changed, 2 insertions(+), 58 deletions(-)
rename meta/recipes-extended/at/{at_3.1.13.bb => at_3.1.14.bb} (90%)
delete mode 100644 meta/recipes-extended/at/files/configure.patch
delete mode 100644 meta/recipes-extended/at/files/use-ldflags.patchmeta/recipes-extended/at/at_3.1.14.bb renamed from meta/recipes-extended/at/at_3.1.13.bb +2 -5
@@ -16,11 +16,8 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" RCONFLICTS_${PN} = "atd" RREPLACES_${PN} = "atd" -PR = "r5" SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ - file://configure.patch \ - file://use-ldflags.patch \ file://fix_parallel_build_error.patch \ file://posixtm.c \ file://posixtm.h \
@@ -31,8 +28,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" -SRC_URI[md5sum] = "1da61af6c29e323abaaf13ee1a8dad79" -SRC_URI[sha256sum] = "3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072" +SRC_URI[md5sum] = "d41cfd79033b6e49a8838add59a42ac6" +SRC_URI[sha256sum] = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae" EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ --with-daemon_username=root \
meta/recipes-extended/at/files/configure.patch deleted +0 -29
@@ -1,29 +0,0 @@ - -Fix cross-compilation issues in configure.ac -Derived from an OE patch for at-3.1.8 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman <[email protected]> - -Index: at-3.1.12/configure.ac -=================================================================== ---- at-3.1.12.orig/configure.ac -+++ at-3.1.12/configure.ac -@@ -38,12 +38,11 @@ case "$host" in - AC_MSG_RESULT(no) - ;; - esac -+if [ X"${cross_compiling}" = Xno ]; then - AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) --AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) -+fi - - AC_MSG_CHECKING(__attribute__((noreturn))) - AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
meta/recipes-extended/at/files/use-ldflags.patch deleted +0 -24
@@ -1,24 +0,0 @@ -Upstream-Status: Pending - -Ensure use of $LDFLAGS during build -Derived from an OE patch for at-3.1.8 - -Signed-off-by: Scott Garman <[email protected]> ---- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800 -+++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700 -@@ -65,13 +65,13 @@ - all: at atd atrun - - at: $(ATOBJECTS) -- $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) -+ $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS) - rm -f $(CLONES) - $(LN_S) -f at atq - $(LN_S) -f at atrm - - atd: $(RUNOBJECTS) -- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) -+ $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS) - - y.tab.c y.tab.h: parsetime.y - $(YACC) -d parsetime.y
Signature · 1 line
1.7.9.5
PATCH 3/4 curl: upgrade to 7.33.0
In reply to Cristiana Voicu---
.../curl/{curl_7.32.0.bb => curl_7.33.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/curl/{curl_7.32.0.bb => curl_7.33.0.bb} (93%)meta/recipes-support/curl/curl_7.33.0.bb renamed from meta/recipes-support/curl/curl_7.32.0.bb +2 -2
@@ -18,8 +18,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "30d04b0a8c43c6770039d1bf033dfe79" -SRC_URI[sha256sum] = "8e3db42548e01407cb2f1407660c0f528b89ec7afda6264442fc2b229b95223b" +SRC_URI[md5sum] = "57409d6bf0bd97053b8378dbe0cadcef" +SRC_URI[sha256sum] = "0afde4cd949e2658eddc3cda675b19b165eea1af48ac5f3e1ec160792255d1b3" inherit autotools pkgconfig binconfig
Signature · 1 line
1.7.9.5
PATCH 4/4 sudo: upgrade to 1.8.8
In reply to Cristiana VoicuLicense checksum updated to reflect additional Copyright for file getopt_long.c, owned by The NetBSD Foundation, Inc
---
meta/recipes-extended/sudo/sudo.inc | 2 +-
.../sudo/{sudo_1.8.7.bb => sudo_1.8.8.bb} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.7.bb => sudo_1.8.8.bb} (83%)meta/recipes-extended/sudo/sudo.inc +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=9b2b7976b2182ee9a146710b32a01c7a \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=47ae0be3bf895c0bb885fae7e1e83a47 \ file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=e2dbb155fc49beea947515300bab99e0 \ file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
meta/recipes-extended/sudo/sudo_1.8.8.bb renamed from meta/recipes-extended/sudo/sudo_1.8.7.bb +2 -2
@@ -5,8 +5,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "a02367090e1dac8d0c1747de1127b6bf" -SRC_URI[sha256sum] = "39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a" +SRC_URI[md5sum] = "fc4f074090afd56d9ff4ff4e97321971" +SRC_URI[sha256sum] = "9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9" DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
Signature · 1 line
1.7.9.5