Package version updates and version check fixes
cover Package version updates and version check fixes
I did a quick review of upstream version checks, and fixed a few recipes where it wasn't working properly. Also bundled version updates for recipes where I'm the maintainer or there is no maintainer and the update is trivial.
The following changes since commit 839fb1893546ad58a1f5475a9e852b81afb056d6:
e2fsprogs: fix PV (2016-01-19 08:53:05 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alexander Kanavin (12):
nss: update to 3.21
bootchart2: update to 0.14.8
btrfs-tools: update to 4.4
build-appliance-image: bump version to 14.0
e2fsprogs: fix upstream version check
libsolv: fix upstream version check
ncurses: fix upstream version check
pbzip2: update to 1.1.13
sysstat: fix upstream version check
gnutls: update to 3.4.8
libical: fix upstream version check
libjpeg-turbo: fix upstream version check (sort of)
...age_12.0.1.bb => build-appliance-image_14.0.bb} | 0
meta/recipes-core/ncurses/ncurses_6.0.bb | 1 +
.../{bootchart2_0.14.7.bb => bootchart2_0.14.8.bb} | 2 +-
.../{btrfs-tools_4.3.1.bb => btrfs-tools_4.4.bb} | 2 +-
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb | 1 +
meta/recipes-extended/libsolv/libsolv_git.bb | 1 +
.../pbzip2/{pbzip2_1.1.12.bb => pbzip2_1.1.13.bb} | 4 ++--
meta/recipes-extended/sysstat/sysstat.inc | 1 +
.../jpeg/libjpeg-turbo_8d+1.4.2.bb | 2 ++
.../gnutls/{gnutls_3.4.7.bb => gnutls_3.4.8.bb} | 4 ++--
meta/recipes-support/libical/libical_1.0.1.bb | 1 +
.../0001-Fix-build-failure-on-opensuse-13.1.patch | 27 ++++++++++++++++++++++
.../nss/{nss_3.19.2.bb => nss_3.21.bb} | 11 ++++++---
13 files changed, 48 insertions(+), 9 deletions(-)
rename meta/recipes-core/images/{build-appliance-image_12.0.1.bb => build-appliance-image_14.0.bb} (100%)
rename meta/recipes-devtools/bootchart2/{bootchart2_0.14.7.bb => bootchart2_0.14.8.bb} (99%)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.3.1.bb => btrfs-tools_4.4.bb} (94%)
rename meta/recipes-extended/pbzip2/{pbzip2_1.1.12.bb => pbzip2_1.1.13.bb} (86%)
rename meta/recipes-support/gnutls/{gnutls_3.4.7.bb => gnutls_3.4.8.bb} (60%)
create mode 100644 meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch
rename meta/recipes-support/nss/{nss_3.19.2.bb => nss_3.21.bb} (95%)Signature · 1 line
2.6.4
PATCH 1/12 nss: update to 3.21
Explicitly disable tests (they were previously implicitly disabled upstream), as they cause various architecture-specific build failures.
Add 0001-Fix-build-failure-on-opensuse-13.1.patch that fixes compilation using gcc 4.8.
---
.../0001-Fix-build-failure-on-opensuse-13.1.patch | 27 ++++++++++++++++++++++
.../nss/{nss_3.19.2.bb => nss_3.21.bb} | 11 ++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch
rename meta/recipes-support/nss/{nss_3.19.2.bb => nss_3.21.bb} (95%)meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 8758c6a4508a5ca01505a8d69a269c912ce10bee Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 18 Jan 2016 18:26:16 +0000 +Subject: [PATCH] Fix build failure on opensuse 13.1 + +Upstream-Status: Inappropriate [gcc 4.8 specific issue] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + nss/cmd/modutil/install-ds.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/cmd/modutil/install-ds.h b/nss/cmd/modutil/install-ds.h +index 3a3afb3..433efe0 100644 +--- a/nss/cmd/modutil/install-ds.h ++++ b/nss/cmd/modutil/install-ds.h +@@ -243,7 +243,7 @@ struct Pk11Install_Info_str { + Pk11Install_Info* + Pk11Install_Info_new(); + void +-Pk11Install_Info_init(); ++Pk11Install_Info_init(Pk11Install_Info* _this); + void + Pk11Install_Info_delete(Pk11Install_Info* _this); + /*// Returns NULL for success, error message if parse error.*/ +-- +1.8.4.5 +
meta/recipes-support/nss/nss_3.21.bb renamed from meta/recipes-support/nss/nss_3.19.2.bb +8 -3
@@ -15,17 +15,18 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" SRC_URI = "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_2_RTM/src/${BP}.tar.gz \ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${BP}.tar.gz \ file://nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ file://nss-fix-nsinstall-build.patch \ + file://0001-Fix-build-failure-on-opensuse-13.1.patch \ file://nss.pc.in \ file://signlibs.sh \ " -SRC_URI[md5sum] = "b02ffd1e8e8ef5f8512fa02d8ca9db3d" -SRC_URI[sha256sum] = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae" +SRC_URI[md5sum] = "3c8b2ed880dd3a8d86c9e0151afe6eba" +SRC_URI[sha256sum] = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
@@ -84,6 +85,8 @@ do_compile() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 + # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! #
@@ -129,6 +132,8 @@ do_install() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 + make -C ./nss \ CCC="${CXX}" \ OS_TEST=${OS_TEST} \
Signature · 1 line
2.6.4
Re: [PATCH 01/12] nss: update to 3.21
Quoted 88 lines · Alexander Kanavin
Explicitly disable tests (they were previously implicitly disabled upstream), as they cause various architecture-specific build failures.
Add 0001-Fix-build-failure-on-opensuse-13.1.patch that fixes compilation using gcc 4.8.
Signed-off-by Alexander Kanavin <[email protected]>---
.../0001-Fix-build-failure-on-opensuse-13.1.patch| 27 ++++++++++++++++++++++
.../nss/{nss_3.19.2.bb => nss_3.21.bb} | 11 ++++++---2 files changed, 35 insertions(+), 3 deletions(-)create mode 100644
meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patchrename meta/recipes-support/nss/{nss_3.19.2.bb => nss_3.21.bb} (95%)meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch new file +27
-0@@ -0,0 +1,27 @@ +From 8758c6a4508a5ca01505a8d69a269c912ce10bee Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 18 Jan 2016 18:26:16 +0000 +Subject: [PATCH] Fix build failure on opensuse 13.1 + +Upstream-Status: Inappropriate [gcc 4.8 specific issue] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + nss/cmd/modutil/install-ds.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/cmd/modutil/install-ds.h b/nss/cmd/modutil/install-ds.h +index 3a3afb3..433efe0 100644 +--- a/nss/cmd/modutil/install-ds.h ++++ b/nss/cmd/modutil/install-ds.h +@@ -243,7 +243,7 @@ struct Pk11Install_Info_str { + Pk11Install_Info* + Pk11Install_Info_new(); + void +-Pk11Install_Info_init(); ++Pk11Install_Info_init(Pk11Install_Info* _this); + void + Pk11Install_Info_delete(Pk11Install_Info* _this); + /*// Returns NULL for success, error message if parse error.*/ +-- +1.8.4.5 +meta/recipes-support/nss/nss_3.21.bb renamed from meta/recipes-support/nss/nss_3.19.2.bb +2
-1@@ -15,17 +15,18 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" SRC_URI = "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_2_RTM/src/${BP}.tar.gz \ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${BP}.tar.gz \ file://nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ file://nss-fix-nsinstall-build.patch \ + file://0001-Fix-build-failure-on-opensuse-13.1.patch \ file://nss.pc.in \ file://signlibs.sh \"
meta/recipes-support/nss/nss_3.21.bb renamed from meta/recipes-support/nss/nss_3.19.2.bb +2
-2-SRC_URI[md5sum] = "b02ffd1e8e8ef5f8512fa02d8ca9db3d" -SRC_URI[sha256sum] = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae" +SRC_URI[md5sum] = "3c8b2ed880dd3a8d86c9e0151afe6eba" +SRC_URI[sha256sum] = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239"
UPSTREAM_CHECK_URI= "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"UPSTREAM_CHECK_REGEX= "NSS_(?P<pver>.+)_release_notes"meta/recipes-support/nss/nss_3.21.bb renamed from meta/recipes-support/nss/nss_3.19.2.bb +2
-0@@ -84,6 +85,8 @@ do_compile() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 + # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! #
meta/recipes-support/nss/nss_3.21.bb do_install() { · line 136
Quoted 5 lines
meta/recipes-support/nss/nss_3.21.bb renamed from meta/recipes-support/nss/nss_3.19.2.bb +2
-0@@ -129,6 +132,8 @@ do_install() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 +
this export is appearing twice
can it be optimized ?
Quoted 11 lines
meta/recipes-support/nss/nss_3.21.bb renamed from meta/recipes-support/nss/nss_3.19.2.bb +0
-1make -C ./nss \ CCC="${CXX}" \ OS_TEST=${OS_TEST} \ --2.6.4
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 01/12] nss: update to 3.21
Quoted 5 lines · Khem Raj
Review
Quoted 2 lines
(quoted diff) +2
-0+ export NSS_DISABLE_GTESTS=1 +this export is appearing twice
can it be optimized ?
I'm only following the pattern in the nss recipe: it has custom do_compile() and do_install() sections which to a large extend duplicate each other. Eliminating this duplication was not a goal, I just wanted to update to latest upstream.
Alex
Re: [PATCH 01/12] nss: update to 3.21
Quoted 6 lines · Alexander Kanavin
Quoted 5 lines · Khem Raj
Quoted 3 lines
(quoted diff) +2
-0+ export NSS_DISABLE_GTESTS=1 +
Quoted 8 lines
Quoted 2 lines
this export is appearing twice
can it be optimized ?I'm only following the pattern in the nss recipe: it has custom
do_compile()anddo_install()sections which to a large extend duplicate each other. Eliminating this duplication was not a goal, I just wanted to update to latest upstream.
understood. Its normal practice to improve things when some one it at it.
Quoted 3 lines
Alex
PATCH 2/12 bootchart2: update to 0.14.8
In reply to Alexander Kanavin---
.../bootchart2/{bootchart2_0.14.7.bb => bootchart2_0.14.8.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/bootchart2/{bootchart2_0.14.7.bb => bootchart2_0.14.8.bb} (99%)meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb renamed from meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb +1 -1
@@ -95,7 +95,7 @@ SRC_URI = "git://github.com/mmeeks/bootchart.git \ " S = "${WORKDIR}/git" -SRCREV = "6f050b65ae9f266645f04f0aecab9efb88375f1c" +SRCREV = "48e0071048564c6af75ab969e842d6dec808da09" inherit systemd inherit update-rc.d
Signature · 1 line
2.6.4
PATCH 3/12 btrfs-tools: update to 4.4
In reply to Alexander Kanavin---
.../btrfs-tools/{btrfs-tools_4.3.1.bb => btrfs-tools_4.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.3.1.bb => btrfs-tools_4.4.bb} (94%)meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.3.1.bb +1 -1
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" SECTION = "base" DEPENDS = "util-linux attr e2fsprogs lzo acl" -SRCREV = "7c3394ed9ef2063a7256d4bc078a485b6f826bc5" +SRCREV = "21258fab2caeade405a15ba932d373b364aa6e8c" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://fix-parallel.patch \ "
Signature · 1 line
2.6.4
PATCH 4/12 build-appliance-image: bump version to 14.0
In reply to Alexander KanavinThis is done to make recipe version reporting tool happy.
---
.../{build-appliance-image_12.0.1.bb => build-appliance-image_14.0.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-core/images/{build-appliance-image_12.0.1.bb => build-appliance-image_14.0.bb} (100%)meta/recipes-core/images/build-appliance-image_14.0.bb renamed from meta/recipes-core/images/build-appliance-image_12.0.1.bb +0 -0
Signature · 1 line
2.6.4
PATCH 5/12 e2fsprogs: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +1 -0
@@ -10,6 +10,7 @@ SRC_URI += "file://acinclude.m4 \ SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544" PV = "1.42.13+git${SRCPV}" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ --enable-elf-shlibs --disable-libuuid --disable-uuidd \
Signature · 1 line
2.6.4
PATCH 6/12 libsolv: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-extended/libsolv/libsolv_git.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-extended/libsolv/libsolv_git.bb +1 -0
@@ -11,6 +11,7 @@ PV = "0.6.14+git${SRCPV}" SRC_URI = "git://github.com/openSUSE/libsolv.git" SRCREV = "b1ea39233f86cd62fbab1964d7497244f6be0087" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.6.4
PATCH 7/12 ncurses: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-core/ncurses/ncurses_6.0.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/ncurses/ncurses_6.0.bb +1 -0
@@ -9,3 +9,4 @@ SRC_URI += "file://tic-hang.patch \ SRCREV = "c6b034b4d69f8c9092c2a1b5d5bb718282b2a522" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
Signature · 1 line
2.6.4
PATCH 8/12 pbzip2: update to 1.1.13
In reply to Alexander Kanavin---
meta/recipes-extended/pbzip2/{pbzip2_1.1.12.bb => pbzip2_1.1.13.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/pbzip2/{pbzip2_1.1.12.bb => pbzip2_1.1.13.bb} (86%)meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb renamed from meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb +2 -2
@@ -13,8 +13,8 @@ DEPENDS_append_class-native = " bzip2-replacement-native" SRC_URI = "https://launchpad.net/${BPN}/1.1/${PV}/+download/${BP}.tar.gz" -SRC_URI[md5sum] = "91a4911b13305850423840eb0fa6f4f9" -SRC_URI[sha256sum] = "573bb358a5a7d3bf5f42f881af324cedf960c786e8d66dd03d448ddd8a0166ee" +SRC_URI[md5sum] = "4cb87da2dba05540afce162f34b3a9a6" +SRC_URI[sha256sum] = "8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6" UPSTREAM_CHECK_URI = "http://compression.ca/pbzip2/"
Signature · 1 line
2.6.4
PATCH 9/12 sysstat: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-extended/sysstat/sysstat.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-extended/sysstat/sysstat.inc +1 -0
@@ -10,6 +10,7 @@ SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \ " UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" DEPENDS += "base-passwd"
Signature · 1 line
2.6.4
PATCH 10/12 gnutls: update to 3.4.8
In reply to Alexander Kanavin---
meta/recipes-support/gnutls/{gnutls_3.4.7.bb => gnutls_3.4.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.4.7.bb => gnutls_3.4.8.bb} (60%)meta/recipes-support/gnutls/gnutls_3.4.8.bb renamed from meta/recipes-support/gnutls/gnutls_3.4.7.bb +2 -2
@@ -4,5 +4,5 @@ SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ file://0001-configure.ac-fix-sed-command.patch \ file://use-pkg-config-to-locate-zlib.patch \ " -SRC_URI[md5sum] = "e7556cec73c8b34fd2ff0b591e24e44c" -SRC_URI[sha256sum] = "c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a" +SRC_URI[md5sum] = "a26e6dd8d5ad92016e3f068795b89624" +SRC_URI[sha256sum] = "e07c05dea525c6bf0dd8017fc5b89d886954f04fedf457ecd1ce488ac3b86ab7"
Signature · 1 line
2.6.4
PATCH 11/12 libical: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-support/libical/libical_1.0.1.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-support/libical/libical_1.0.1.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz \ " SRC_URI[md5sum] = "af91db06b22559f863869c5a382ad08a" SRC_URI[sha256sum] = "7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c" +UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake
Signature · 1 line
2.6.4
PATCH 12/12 libjpeg-turbo: fix upstream version check (sort of)
In reply to Alexander KanavinWe prepend '8d' to the version and at the moment there is no way to strip that out when doing upstream checks. But at least the latest upstream version is reported correctly.
--- meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb +2 -0
@@ -14,6 +14,8 @@ BASEPV = "${@d.getVar('PV',True).split('+')[1]}" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${BASEPV}.tar.gz" SRC_URI[md5sum] = "86b0d5f7507c2e6c21c00219162c3c44" SRC_URI[sha256sum] = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" +UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" S = "${WORKDIR}/${BPN}-${BASEPV}"
Signature · 1 line
2.6.4