Recipe updates
cover Recipe updates
This patchset contains various recipe version updates that have accumulated; I have also deprectead upstream_tracking.inc and moved its contents to recipes. The same thing will be done later with package_regex.inc and maintainers.inc.
Also no update reasons are added for rpm, db and e2fsprogs.
The following changes since commit 393bd7496d71eb101f21234c1233a2d18fd2c73e:
oeqa/oetest.py: add better package search for hasPackage() (2015-08-26 08:28:06 +0100)
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 (8):
upstream_tracking.inc: deprecate and move contents to recipes
dpkg: update to 1.18.2
dropbear: update to 2015.68
libnotify: don't inherit unnecessary distro_features_check
e2fsprogs: explain why there is no update for now package_regex.inc: updates to improve upstream tracking
ccache: update to 3.2.3
cmake: update to 3.3.1
meta/conf/distro/include/package_regex.inc | 8 +++-
meta/conf/distro/include/upstream_tracking.inc | 18 +--------
.../recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 +
meta/recipes-core/dropbear/dropbear.inc | 2 +-
meta/recipes-core/dropbear/dropbear_2015.67.bb | 4 --
meta/recipes-core/dropbear/dropbear_2015.68.bb | 4 ++
meta/recipes-devtools/ccache/ccache.inc | 4 +-
meta/recipes-devtools/ccache/ccache_3.1.11.bb | 7 ----
meta/recipes-devtools/ccache/ccache_3.2.3.bb | 6 +++
...cmake-native_3.2.2.bb => cmake-native_3.3.1.bb} | 3 --
meta/recipes-devtools/cmake/cmake.inc | 3 ++
.../cmake/{cmake_3.2.2.bb => cmake_3.3.1.bb} | 3 --
meta/recipes-devtools/dpkg/dpkg.inc | 2 +-
...-do_package_write_deb-we-have-trees-of-h.patch} | 37 +++++++++++-------
...nux-wrs-kernel-version-which-has-characte.patch | 38 ++++++++++++++++++
...insts-expect-D-to-be-set-when-running-in.patch} | 29 +++++++++-----
...-function-doesn-t-work-properly-for-all-s.patch | 31 +++++++++++++++
...tch => 0005-dpkg-compiler.m4-remove-Wvla.patch} | 26 +++++++------
.../dpkg/dpkg/check_snprintf.patch | 34 ----------------
.../recipes-devtools/dpkg/dpkg/check_version.patch | 28 --------------
.../dpkg/dpkg/fix-timestamps.patch | 21 ----------
meta/recipes-devtools/dpkg/dpkg/tarfix.patch | 45 ----------------------
.../dpkg/{dpkg_1.17.25.bb => dpkg_1.18.2.bb} | 14 +++----
.../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 1 +
.../python/python-pygobject_2.28.3.bb | 3 ++
meta/recipes-devtools/rpm/rpm_5.4.14.bb | 2 +
meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb | 5 +++
.../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 2 +
meta/recipes-gnome/libnotify/libnotify_0.7.6.bb | 2 +-
.../ttf-fonts/liberation-fonts_1.04.bb | 2 +
meta/recipes-multimedia/tremor/tremor_20150107.bb | 5 +++
.../createrepo/createrepo_0.4.11.bb | 2 +
meta/recipes-support/db/db_6.0.30.bb | 2 +
33 files changed, 185 insertions(+), 210 deletions(-)
delete mode 100644 meta/recipes-core/dropbear/dropbear_2015.67.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_2015.68.bb
delete mode 100644 meta/recipes-devtools/ccache/ccache_3.1.11.bb
create mode 100644 meta/recipes-devtools/ccache/ccache_3.2.3.bb
rename meta/recipes-devtools/cmake/{cmake-native_3.2.2.bb => cmake-native_3.3.1.bb} (72%)
rename meta/recipes-devtools/cmake/{cmake_3.2.2.bb => cmake_3.3.1.bb} (92%)
rename meta/recipes-devtools/dpkg/dpkg/{tar-error-code.patch => 0001-When-running-do_package_write_deb-we-have-trees-of-h.patch} (60%)
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
rename meta/recipes-devtools/dpkg/dpkg/{preinst.patch => 0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch} (59%)
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
rename meta/recipes-devtools/dpkg/dpkg/{no-vla-warning.patch => 0005-dpkg-compiler.m4-remove-Wvla.patch} (58%)
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/check_version.patch
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/fix-timestamps.patch
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/tarfix.patch
rename meta/recipes-devtools/dpkg/{dpkg_1.17.25.bb => dpkg_1.18.2.bb} (49%)Signature · 1 line
2.1.4
PATCH 1/8 upstream_tracking.inc: deprecate and move contents to recipes
No-update reasons and manual version checks should be in the recipes themselves because otherwise they're prone to getting out of date.
--- meta/conf/distro/include/upstream_tracking.inc | 18 ++---------------- meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 ++ .../recipes-devtools/python/python-pygobject_2.28.3.bb | 3 +++ meta/recipes-devtools/rpm/rpm_5.4.14.bb | 2 ++ meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb | 5 +++++ meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb | 2 ++ .../ttf-fonts/liberation-fonts_1.04.bb | 2 ++ meta/recipes-multimedia/tremor/tremor_20150107.bb | 5 +++++ meta/recipes-support/createrepo/createrepo_0.4.11.bb | 2 ++ meta/recipes-support/db/db_6.0.30.bb | 2 ++ 10 files changed, 27 insertions(+), 16 deletions(-)
meta/conf/distro/include/upstream_tracking.inc +2 -16
@@ -1,3 +1,5 @@ +# NOTE: THIS FILE IS DEPRECATED. Please add new entries to the recipes themselves. +# # upstream_tracking.inc - This file contains data that tracks the # upstream project associated with a given recipe. This list is needed # for recipes that version information can not be automagically discovered.
@@ -20,19 +22,3 @@ # the information in this file. So for existing recipes that we can get # from the Recipe reporting system, the entries here can be removed. # - -# SVN support isn't implemented -# Also a new tarball release (or SVN tag) hasn't happened in a long time -RECIPE_UPSTREAM_VERSION_pn-unfs3="0.9.22.r495" -RECIPE_UPSTREAM_DATE_pn-unfs3="Feb 05, 2015" -CHECK_DATE_pn-unfs3 = "Jun 10, 2015" - -# NO UPDATE REASONS -RECIPE_NO_UPDATE_REASON_pn-base-passwd = "Version 3.5.38 requires cdebconf for update-passwd utility" -RECIPE_NO_UPDATE_REASON_pn-chkconfig = "Version 1.5 requires selinux" -RECIPE_NO_UPDATE_REASON_pn-createrepo = "Versions after 0.9.* use YUM, so we hold at 0.4.11" -RECIPE_NO_UPDATE_REASON_pn-jpeg = "webkit-gtk 1.8.3 doesn't work with jpeg 9" -RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = "2.x depends on fontforge package, which is not yet provided in oe-core" -RECIPE_NO_UPDATE_REASON_pn-pkgconfig = "removes glib-conf, adds circular depends" -RECIPE_NO_UPDATE_REASON_pn-python-pygobject = "Newer versions of python-pygobject depend on gobject-introspection which doesn't cross-compile" -RECIPE_NO_UPDATE_REASON_pn-webkit-gtk = ">= 1.10.2 needs ruby"
meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +2 -0
@@ -4,6 +4,8 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" +RECIPE_NO_UPDATE_REASON = "Version 3.5.38 requires cdebconf for update-passwd utility" + SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.gz \ file://add_shutdown.patch \ file://nobash.patch \
meta/recipes-devtools/python/python-pygobject_2.28.3.bb +3 -0
@@ -1,6 +1,9 @@ SUMMARY = "Python GObject bindings" SECTION = "devel/python" LICENSE = "LGPLv2.1" + +RECIPE_NO_UPDATE_REASON = "Newer versions of python-pygobject depend on gobject-introspection which doesn't cross-compile" + LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" DEPENDS = "python python-pygobject-native libffi glib-2.0" DEPENDS_class-native = "python-native libffi-native glib-2.0-native"
meta/recipes-devtools/rpm/rpm_5.4.14.bb +2 -0
@@ -5,6 +5,8 @@ verifying, querying, and updating software packages. Each software \ package consists of an archive of files along with information about \ the package like its version, a description, etc." +RECIPE_NO_UPDATE_REASON = "5.4.15 has a package database issue: http://lists.openembedded.org/pipermail/openembedded-core/2015-August/109187.html" + SUMMARY_${PN}-libs = "Libraries for manipulating RPM packages" DESCRIPTION_${PN}-libs = "This package contains the RPM shared libraries."
meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb +5 -0
@@ -3,6 +3,11 @@ SECTION = "console/network" LICENSE = "unfs3" LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" +# SVN support for upstream version check isn't implemented yet +RECIPE_UPSTREAM_VERSION = "0.9.22.r495" +RECIPE_UPSTREAM_DATE = "Feb 05, 2015" +CHECK_DATE = "Jun 10, 2015" + DEPENDS = "flex-native bison-native flex" DEPENDS_append_class-nativesdk += "flex-nativesdk"
meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +2 -0
@@ -4,6 +4,8 @@ information for system services. Chkconfig manipulates the numerous \ symbolic links in /etc/rc.d, to relieve system administrators of some \ of the drudgery of manually editing the symbolic links." +RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" + HOMEPAGE = "http://fedorahosted.org/releases/c/h/chkconfig" LICENSE = "GPLv2"
meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +2 -0
@@ -5,6 +5,8 @@ Arial, Times New Roman, Courier New." HOMEPAGE = "https://fedorahosted.org/liberation-fonts/" BUGTRACKER = "https://bugzilla.redhat.com/" +RECIPE_NO_UPDATE_REASON = "2.x depends on fontforge package, which is not yet provided in oe-core" + SECTION = "x11/fonts" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
meta/recipes-multimedia/tremor/tremor_20150107.bb +5 -0
@@ -8,6 +8,11 @@ DEPENDS = "libogg" SRCDATE = "${PV}" PR = "r1" +# SVN support for upstream version check isn't implemented yet +RECIPE_UPSTREAM_VERSION = "20150107" +RECIPE_UPSTREAM_DATE = "Jan 07, 2015" +CHECK_DATE = "Aug 12, 2015" + SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http \ file://obsolete_automake_macros.patch;striplevel=0 \ file://tremor-arm-thumb2.patch \
meta/recipes-support/createrepo/createrepo_0.4.11.bb +2 -0
@@ -1,6 +1,8 @@ SUMMARY = "Creates metadata indexes for RPM package repositories" HOMEPAGE = "http://createrepo.baseurl.org/" +RECIPE_NO_UPDATE_REASON = "Versions after 0.9.* use YUM, so we hold at 0.4.11" + LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
meta/recipes-support/db/db_6.0.30.bb +2 -0
@@ -15,6 +15,8 @@ LICENSE = "AGPL-3.0" VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" +RECIPE_NO_UPDATE_REASON = "Updating to 6.1.x requires also updating rpm to 5.4.15" + SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ file://fix-parallel-build.patch \
Signature · 1 line
2.1.4
PATCH 2/8 dpkg: update to 1.18.2
In reply to Alexander Kanavincheck_snprintf.patch has been dropped, because it seems to fix a problem that doesn't anymore exist, and doesn't have any description of what the problem was and how was it fixed.
tarfix.patch has been merged upstream.
The rest of the patches have been rebased to the new upstream release
---
meta/recipes-devtools/dpkg/dpkg.inc | 2 +-
...-do_package_write_deb-we-have-trees-of-h.patch} | 37 +++++++++++-------
...nux-wrs-kernel-version-which-has-characte.patch | 38 ++++++++++++++++++
...insts-expect-D-to-be-set-when-running-in.patch} | 29 +++++++++-----
...-function-doesn-t-work-properly-for-all-s.patch | 31 +++++++++++++++
...tch => 0005-dpkg-compiler.m4-remove-Wvla.patch} | 26 +++++++------
.../dpkg/dpkg/check_snprintf.patch | 34 ----------------
.../recipes-devtools/dpkg/dpkg/check_version.patch | 28 --------------
.../dpkg/dpkg/fix-timestamps.patch | 21 ----------
meta/recipes-devtools/dpkg/dpkg/tarfix.patch | 45 ----------------------
.../dpkg/{dpkg_1.17.25.bb => dpkg_1.18.2.bb} | 14 +++----
11 files changed, 133 insertions(+), 172 deletions(-)
rename meta/recipes-devtools/dpkg/dpkg/{tar-error-code.patch => 0001-When-running-do_package_write_deb-we-have-trees-of-h.patch} (60%)
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
rename meta/recipes-devtools/dpkg/dpkg/{preinst.patch => 0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch} (59%)
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
rename meta/recipes-devtools/dpkg/dpkg/{no-vla-warning.patch => 0005-dpkg-compiler.m4-remove-Wvla.patch} (58%)
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/check_version.patch
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/fix-timestamps.patch
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/tarfix.patch
rename meta/recipes-devtools/dpkg/{dpkg_1.17.25.bb => dpkg_1.18.2.bb} (49%)meta/recipes-devtools/dpkg/dpkg.inc +1 -1
@@ -4,7 +4,7 @@ SECTION = "base" SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz" -SRC_URI_append_class-native = " file://tar-error-code.patch" +SRC_URI_append_class-native = " file://0001-When-running-do_package_write_deb-we-have-trees-of-h.patch" DEPENDS = "zlib bzip2 perl ncurses" DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native"
meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch renamed from meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch +23 -14
@@ -1,7 +1,10 @@ -When running do_package_write_deb, we have trees of hardlinked files -such as the dbg source files in ${PN}-dbg. If something makes another -copy of one of those files (or deletes one), the number of links a file -has changes and tar can notice this, e.g.: +From d14ffd786993da60ca84c4812da8a6594a8c764e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 26 Aug 2015 15:48:13 +0300 +Subject: [PATCH 1/5] When running do_package_write_deb, we have trees of + hardlinked files such as the dbg source files in ${PN}-dbg. If something + makes another copy of one of those files (or deletes one), the number of + links a file has changes and tar can notice this, e.g.: | DEBUG: Executing python function do_package_deb | dpkg-deb: building package `sed-ptest' in `/media/build1/poky/build/tmp/work/i586-poky-linux/sed/4.2.2-r0/deploy-debs/i586/sed-ptest_4.2.2-r0.3_i386.deb'.
@@ -15,13 +18,16 @@ place to avoid that kind of issue). Upstream-Status: Inappropriate RP 2015/3/27 +--- + dpkg-deb/build.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) -Index: dpkg-1.17.21/dpkg-deb/build.c -=================================================================== ---- dpkg-1.17.21.orig/dpkg-deb/build.c -+++ dpkg-1.17.21/dpkg-deb/build.c -@@ -398,7 +398,7 @@ do_build(const char *const *argv) - bool subdir; +diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c +index ea3d861..1589927 100644 +--- a/dpkg-deb/build.c ++++ b/dpkg-deb/build.c +@@ -458,7 +458,7 @@ do_build(const char *const *argv) + char *debar; char *tfbuf; int arfd; - int p1[2], p2[2], gzfd;
@@ -29,10 +35,10 @@ Index: dpkg-1.17.21/dpkg-deb/build.c pid_t c1, c2; /* Decode our arguments. */ -@@ -493,7 +493,9 @@ do_build(const char *const *argv) +@@ -538,7 +538,9 @@ do_build(const char *const *argv) } close(p1[0]); - subproc_reap(c2, "gzip -9c", 0); + subproc_reap(c2, _("<compress> from tar -cf"), 0); - subproc_reap(c1, "tar -cf", 0); + rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); + if (rc && rc != 1)
@@ -40,8 +46,8 @@ Index: dpkg-1.17.21/dpkg-deb/build.c if (lseek(gzfd, 0, SEEK_SET)) ohshite(_("failed to rewind temporary file (%s)"), _("control member")); -@@ -581,7 +583,10 @@ do_build(const char *const *argv) - /* All done, clean up wait for tar and gzip to finish their job. */ +@@ -626,7 +628,10 @@ do_build(const char *const *argv) + /* All done, clean up wait for tar and <compress> to finish their job. */ close(p1[1]); subproc_reap(c2, _("<compress> from tar -cf"), 0); - subproc_reap(c1, "tar -cf", 0);
@@ -52,3 +58,6 @@ Index: dpkg-1.17.21/dpkg-deb/build.c /* Okay, we have data.tar as well now, add it to the ar wrapper. */ if (deb_format.major == 2) { char datamember[16 + 1]; +-- +2.1.4 +
meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch new file +38 -0
@@ -0,0 +1,38 @@ +From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 26 Aug 2015 16:16:16 +0300 +Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character + '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). + +Signed-off-by: Dongxiao Xu <[email protected]> +Signed-off-by: Constantin Musca <[email protected]> + +Upstream-Status: Inappropriate [embedded specific] +--- + lib/dpkg/parsehelp.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c +index 79b2908..7758aa5 100644 +--- a/lib/dpkg/parsehelp.c ++++ b/lib/dpkg/parsehelp.c +@@ -235,14 +235,12 @@ parseversion(struct dpkg_version *rversion, const char *string, + + /* XXX: Would be faster to use something like cisversion and cisrevision. */ + ptr = rversion->version; +- if (*ptr && !c_isdigit(*ptr++)) +- return dpkg_put_warn(err, _("version number does not start with digit")); + for (; *ptr; ptr++) { +- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) ++ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) + return dpkg_put_warn(err, _("invalid character in version number")); + } + for (ptr = rversion->revision; *ptr; ptr++) { +- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".+~", *ptr) == NULL) ++ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) + return dpkg_put_warn(err, _("invalid character in revision number")); + } + +-- +2.1.4 +
meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch renamed from meta/recipes-devtools/dpkg/dpkg/preinst.patch +19 -10
@@ -1,16 +1,22 @@ -Our pre/postinsts expect $D to be set when running in a sysroot and -don't expect a chroot. This matches up our system expectations with -what dpkg does. +From 24229971492515b64c81e8c6392e5dfbdc22b44c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 26 Aug 2015 16:25:45 +0300 +Subject: [PATCH 3/5] Our pre/postinsts expect $D to be set when running in a + sysroot and don't expect a chroot. This matches up our system expectations + with what dpkg does. Upstream-Status: Inappropriate [OE Specific] RP 2011/12/07 +--- + src/script.c | 31 ++----------------------------- + 1 file changed, 2 insertions(+), 29 deletions(-) -Index: dpkg-1.17.1/src/script.c -=================================================================== ---- dpkg-1.17.1.orig/src/script.c -+++ dpkg-1.17.1/src/script.c -@@ -111,36 +111,9 @@ preexecscript(struct command *cmd) +diff --git a/src/script.c b/src/script.c +index a958145..24c49f9 100644 +--- a/src/script.c ++++ b/src/script.c +@@ -100,36 +100,9 @@ maintscript_pre_exec(struct command *cmd) size_t instdirl = strlen(instdir); if (*instdir) {
@@ -20,12 +26,12 @@ Index: dpkg-1.17.1/src/script.c - ohshite(_("unable to setenv for subprocesses")); - - if (chroot(instdir)) -- ohshite(_("failed to chroot to `%.250s'"), instdir); +- ohshite(_("failed to chroot to '%.250s'"), instdir); - } - /* Switch to a known good directory to give the maintainer script - * a saner environment, also needed after the chroot(). */ - if (chdir("/")) -- ohshite(_("failed to chdir to `%.255s'"), "/"); +- ohshite(_("failed to chdir to '%.255s'"), "/"); - if (debug_has_flag(dbg_scripts)) { - struct varbuf args = VARBUF_INIT; - const char **argv = cmd->argv;
@@ -49,3 +55,6 @@ Index: dpkg-1.17.1/src/script.c } /** +-- +2.1.4 +
meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch new file +31 -0
@@ -0,0 +1,31 @@ +From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 26 Aug 2015 16:27:45 +0300 +Subject: [PATCH 4/5] The lutimes function doesn't work properly for all + systems. + +Signed-off-by: Constantin Musca <[email protected]> + +Upstream-Status: Inappropriate [embedded specific] +--- + src/archives.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/archives.c b/src/archives.c +index bff5f14..b711013 100644 +--- a/src/archives.c ++++ b/src/archives.c +@@ -449,8 +449,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) + + if (te->type == TAR_FILETYPE_SYMLINK) { + #ifdef HAVE_LUTIMES +- if (lutimes(path, tv) && errno != ENOSYS) ++/* if (lutimes(path, tv) && errno != ENOSYS) + ohshite(_("error setting timestamps of '%.255s'"), path); ++*/ + #endif + } else { + if (utimes(path, tv)) +-- +2.1.4 +
meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch renamed from meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch +15 -11
@@ -1,7 +1,10 @@ -From e94474d805377d67c8b09664a602f20969e12b8a Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Thu, 23 Jan 2014 04:17:23 -0500 -Subject: [PATCH] dpkg-compiler.m4: remove -Wvla +From 0ad7bba80d5b9035089ff2b2f77a774b5b201915 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 26 Aug 2015 16:28:59 +0300 +Subject: [PATCH 5/5] dpkg-compiler.m4: remove -Wvla +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Remove the -Wvla flag from the set of compiler warning flags, since gcc on old host systems such as CentOS 5.8 doesn't support it, and it
@@ -13,20 +16,21 @@ Signed-off-by: Donn Seeley <[email protected]> Signed-off-by: Robert Yang <[email protected]> Signed-off-by: Aníbal Limón <[email protected]> --- - m4/dpkg-compiler.m4 | 1 - + m4/dpkg-compiler.m4 | 1 - 1 file changed, 1 deletion(-) diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 -index 53f67c6..6e66a43 100644 +index 682857c..23ed7d0 100644 --- a/m4/dpkg-compiler.m4 +++ b/m4/dpkg-compiler.m4 -@@ -49,7 +49,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ - DPKG_CHECK_COMPILER_FLAG([-Wformat-security]) - DPKG_CHECK_COMPILER_FLAG([-Wpointer-arith]) +@@ -52,7 +52,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ DPKG_CHECK_COMPILER_FLAG([-Wlogical-op]) + DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses]) + DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool]) - DPKG_CHECK_COMPILER_FLAG([-Wvla]) DPKG_CHECK_COMPILER_FLAG([-Winit-self]) DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings]) DPKG_CHECK_COMPILER_FLAG([-Wcast-align]) ---- -1.17.21 +-- +2.1.4 +
meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch deleted +0 -34
@@ -1,34 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff -ruN dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 dpkg-1.15.8.5/m4/dpkg-funcs.m4 ---- dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 2010-10-08 12:27:15.082131611 +0800 -+++ dpkg-1.15.8.5/m4/dpkg-funcs.m4 2010-10-08 13:56:50.074284346 +0800 -@@ -27,7 +27,7 @@ - # ----------------------- - # Define HAVE_C99_SNPRINTF if we have C99 snprintf family semantics - AC_DEFUN([DPKG_FUNC_C99_SNPRINTF], --[AC_CACHE_CHECK([for C99 snprintf functions], [dpkg_cv_c99_snprintf], -+[AC_CACHE_CHECK([for C99 snprintf functions], [ac_cv_func_snprintf_c99], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <stdarg.h> - #include <stdio.h> -@@ -58,14 +58,14 @@ - return 0; - } - ]])], -- [dpkg_cv_c99_snprintf=yes], -- [dpkg_cv_c99_snprintf=no], -- [dpkg_cv_c99_snprintf=no])]) --AS_IF([test "x$dpkg_cv_c99_snprintf" = "xyes"], -+ [ac_cv_func_snprintf_c99=yes], -+ [ac_cv_func_snprintf_c99=no], -+ [ac_cv_func_snprintf_c99=no])]) -+AS_IF([test "x$ac_cv_func_snprintf_c99" = "xyes"], - [AC_DEFINE([HAVE_C99_SNPRINTF], 1, - [Define to 1 if the 'snprintf' family is C99 conformant])], - ) --AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$dpkg_cv_c99_snprintf" = "xyes"]) -+AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$ac_cv_func_snprintf_c99" = "xyes"]) - ])# DPKG_FUNC_C99_SNPRINTF - - # DPKG_MMAP
meta/recipes-devtools/dpkg/dpkg/check_version.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Adapt to linux-wrs kernel version, which has character '_' inside. -Remove the first-char-digit-check (as the 1.15.8.5 version does). - -Signed-off-by: Dongxiao Xu <[email protected]> -Signed-off-by: Constantin Musca <[email protected]> - -Upstream-Status: Inappropriate [embedded specific] - -Index: dpkg-1.16.8/lib/dpkg/parsehelp.c -=================================================================== ---- dpkg-1.16.8.orig/lib/dpkg/parsehelp.c -+++ dpkg-1.16.8/lib/dpkg/parsehelp.c -@@ -258,14 +258,12 @@ parseversion(struct dpkg_version *rversi - - /* XXX: Would be faster to use something like cisversion and cisrevision. */ - ptr = rversion->version; -- if (*ptr && !cisdigit(*ptr++)) -- return dpkg_put_warn(err, _("version number does not start with digit")); - for (; *ptr; ptr++) { -- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) -+ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) - return dpkg_put_warn(err, _("invalid character in version number")); - } - for (ptr = rversion->revision; *ptr; ptr++) { -- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".+~", *ptr) == NULL) -+ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) - return dpkg_put_warn(err, _("invalid character in revision number")); - }
meta/recipes-devtools/dpkg/dpkg/fix-timestamps.patch deleted +0 -21
@@ -1,21 +0,0 @@ -The lutimes function doesn't work properly for all systems. - -Signed-off-by: Constantin Musca <[email protected]> - -Upstream-Status: Inappropriate [embedded specific] - -Index: dpkg-1.16.8/src/archives.c -=================================================================== ---- dpkg-1.16.8.orig/src/archives.c -+++ dpkg-1.16.8/src/archives.c -@@ -440,8 +440,10 @@ tarobject_set_mtime(struct tar_entry *te - - if (te->type == tar_filetype_symlink) { - #ifdef HAVE_LUTIMES -+/* - if (lutimes(path, tv) && errno != ENOSYS) - ohshite(_("error setting timestamps of `%.255s'"), path); -+*/ - #endif - } else { - if (utimes(path, tv))
meta/recipes-devtools/dpkg/dpkg/tarfix.patch deleted +0 -45
45 lines not on this page · raw message
meta/recipes-devtools/dpkg/dpkg_1.18.2.bb renamed from meta/recipes-devtools/dpkg/dpkg_1.17.25.bb +6 -8
@@ -2,20 +2,18 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI += "file://noman.patch \ - file://check_snprintf.patch \ - file://check_version.patch \ - file://preinst.patch \ - file://fix-timestamps.patch \ file://remove-tar-no-timestamp.patch \ file://fix-abs-redefine.patch \ file://arch_pm.patch \ file://dpkg-configure.service \ file://glibc2.5-sync_file_range.patch \ - file://no-vla-warning.patch \ file://add_armeb_triplet_entry.patch \ - file://tarfix.patch \ + file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ + file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ + file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ + file://0005-dpkg-compiler.m4-remove-Wvla.patch \ " -SRC_URI[md5sum] = "e48fcfdb2162e77d72c2a83432d537ca" -SRC_URI[sha256sum] = "07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa" +SRC_URI[md5sum] = "63b9d869081ec49adeef6c5ff62d6576" +SRC_URI[sha256sum] = "11484f2a73d027d696e720a60380db71978bb5c06cd88fe30c291e069ac457a4"
Signature · 1 line
2.1.4
PATCH 3/8 dropbear: update to 2015.68
In reply to Alexander KanavinLICENSE checksum has changed because the copyright year was changed from 2014 to 2015 in it:
https://github.com/mkj/dropbear/commit/19e1afbd1ca6d306166ce74bcd6c6889f8d196f3
--- meta/recipes-core/dropbear/dropbear.inc | 2 +- meta/recipes-core/dropbear/dropbear_2015.67.bb | 4 ---- meta/recipes-core/dropbear/dropbear_2015.68.bb | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/dropbear/dropbear_2015.67.bb create mode 100644 meta/recipes-core/dropbear/dropbear_2015.68.bb
meta/recipes-core/dropbear/dropbear.inc +1 -1
@@ -5,7 +5,7 @@ SECTION = "console/network" # some files are from other projects and have others license terms: # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3a1b9604afd1648b28b0c6f1709e9f4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01" DEPENDS = "zlib" RPROVIDES_${PN} = "ssh sshd"
meta/recipes-core/dropbear/dropbear_2015.67.bb deleted +0 -4
@@ -1,4 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "e967e320344cd4bfebe321e3ab8514d6" -SRC_URI[sha256sum] = "7e690594645dfde5787065c78a5d2e4d15e288babfa06e140197ce05f698c8e5"
meta/recipes-core/dropbear/dropbear_2015.68.bb new file +4 -0
@@ -0,0 +1,4 @@ +require dropbear.inc + +SRC_URI[md5sum] = "7664ac10f7cc2301c530eb80c756fc5d" +SRC_URI[sha256sum] = "55ea7c1e904ffe4b1cdbe1addca8291a2533d7d285fd22ac33608e9502a62446"
Signature · 1 line
2.1.4
PATCH 4/8 libnotify: don't inherit unnecessary distro_features_check
In reply to Alexander Kanavin--- meta/recipes-gnome/libnotify/libnotify_0.7.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/libnotify/libnotify_0.7.6.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "dbus gtk+3 dbus-glib" -inherit gnomebase distro_features_check gtk-doc +inherit gnomebase gtk-doc SRC_URI[archive.md5sum] = "a4997019d08f46f3bf57b78e6f795a59" SRC_URI[archive.sha256sum] = "0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837"
Signature · 1 line
2.1.4
PATCH 5/8 e2fsprogs: explain why there is no update for now
In reply to Alexander Kanavin--- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb +1 -0
@@ -1,5 +1,6 @@ require e2fsprogs.inc +RECIPE_NO_UPDATE_REASON = "Updating backported patches to 1.42.13 is too much pain. Let's wait until 1.43 is released." SRC_URI += "file://acinclude.m4 \ file://remove.ldconfig.call.patch \
Signature · 1 line
2.1.4
PATCH 6/8 package_regex.inc: updates to improve upstream tracking
In reply to Alexander Kanavin--- meta/conf/distro/include/package_regex.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
meta/conf/distro/include/package_regex.inc +6 -2
@@ -43,6 +43,7 @@ REGEX_pn-iputils="iputils-(?P<pver>s\d+).tar" REGEX_pn-nettle = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" REGEX_pn-cairo = "cairo-(?P<pver>\d+(\.\d+)+)\.tar" +REGEX_pn-cmake = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" # Exclude NC versions which lack AES encryption REGEX_pn-db = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
@@ -199,6 +200,9 @@ GITTAGREGEX_pn-sgmlspl = "(?P<pver>(\d+(\.\d+)+))" # Exclude x.99.x versions GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)" +# Blacklist a bogus tag +GITTAGREGEX_pn-file = "FILE(?P<pver>(?!6_23).+)" + # GNOME related. # # GNOME2_STABLE picks stable releases in the 2.x series (so not 2.90 onwards,
@@ -206,8 +210,8 @@ GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)" # # GNOME_STABLE picks the latest stable release. -GNOME2_STABLE = "(?P<pver>2\.([0-8]*[02468])+\.\d+)" -GNOME_STABLE = "(?P<pver>\d+\.(\d*[02468])+\.\d+)" +GNOME2_STABLE = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)" +GNOME_STABLE = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" REGEX_pn-glib-2.0 = "${GNOME_STABLE}" REGEX_pn-atk = "${GNOME_STABLE}"
Signature · 1 line
2.1.4
PATCH 7/8 ccache: update to 3.2.3
In reply to Alexander KanavinThe LICENSE checksum has changed because of updated copyright years.
SRC_URI has been changed to git, because upstream tarball is broken (includes configure.ac but not .m4 files it depends on).
--- meta/recipes-devtools/ccache/ccache.inc | 4 +++- meta/recipes-devtools/ccache/ccache_3.1.11.bb | 7 ------- meta/recipes-devtools/ccache/ccache_3.2.3.bb | 6 ++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-devtools/ccache/ccache_3.1.11.bb create mode 100644 meta/recipes-devtools/ccache/ccache_3.2.3.bb
meta/recipes-devtools/ccache/ccache.inc +3 -1
@@ -9,7 +9,9 @@ LICENSE = "GPLv3+" DEPENDS = "zlib" -SRC_URI = "http://samba.org/ftp/ccache/ccache-${PV}.tar.xz" +SRC_URI = "git://git.samba.org/ccache.git" + +S = "${WORKDIR}/git" inherit autotools
meta/recipes-devtools/ccache/ccache_3.1.11.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=80e92ec45d4fca91f127864fb9e5d932" - -SRC_URI[md5sum] = "0f6df80c8941d9020a1fd5df5ad57dd7" -SRC_URI[sha256sum] = "60e9f3f1e60f528cfce910f3224bcc698029320f6ab77ec09a7b46bda2bc678e"
meta/recipes-devtools/ccache/ccache_3.2.3.bb new file +6 -0
@@ -0,0 +1,6 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3c337e7664559a789d9f7a93e5283c1" + +SRCREV = "4cad46e8ee0053144bb00919f0dadd20c1f87013"
Signature · 1 line
2.1.4
PATCH 8/8 cmake: update to 3.3.1
In reply to Alexander KanavinShare tarball checksums between cmake and cmake-native via cmake.inc.
---
.../cmake/{cmake-native_3.2.2.bb => cmake-native_3.3.1.bb} | 3 ---
meta/recipes-devtools/cmake/cmake.inc | 3 +++
meta/recipes-devtools/cmake/{cmake_3.2.2.bb => cmake_3.3.1.bb} | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.2.2.bb => cmake-native_3.3.1.bb} (72%)
rename meta/recipes-devtools/cmake/{cmake_3.2.2.bb => cmake_3.3.1.bb} (92%)meta/recipes-devtools/cmake/cmake-native_3.3.1.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.2.2.bb +0 -3
@@ -8,9 +8,6 @@ SRC_URI += "\ file://cmlibarchive-disable-ext2fs.patch \ " -SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" -SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" - # Disable ccmake since we don't depend on ncurses CMAKE_EXTRACONF = "\ -DBUILD_CursesDialog=0 \
meta/recipes-devtools/cmake/cmake.inc +3 -0
@@ -16,6 +16,9 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz file://qt4-fail-silent.patch \ " +SRC_URI[md5sum] = "52638576f4e1e621fed6c3410d3a1b12" +SRC_URI[sha256sum] = "cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6" + inherit autotools # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable
meta/recipes-devtools/cmake/cmake_3.3.1.bb renamed from meta/recipes-devtools/cmake/cmake_3.2.2.bb +0 -3
@@ -8,9 +8,6 @@ SRC_URI_append_class-nativesdk = " \ file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh" -SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" -SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" - # Strip ${prefix} from ${docdir}, set result into docdir_stripped python () { prefix=d.getVar("prefix", True)
Signature · 1 line
2.1.4
Re: [PATCH 2/8] dpkg: update to 1.18.2
In reply to Alexander KanavinQuoted 6 lines · Alexander Kanavin
check_snprintf.patch has been dropped, because it seems to fix a problem that doesn't anymore exist, and doesn't have any description of what the problem was and how was it fixed.
it is redundant. should be fine
Re: [PATCH 7/8] ccache: update to 3.2.3
In reply to Alexander KanavinQuoted 5 lines · Alexander Kanavin
The LICENSE checksum has changed because of updated copyright years.
SRC_URIhas been changed to git, because upstream tarball is broken (includes configure.ac but not .m4 files it depends on).
Quoted 8 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/ccache/ccache.inc | 4 +++- meta/recipes-devtools/ccache/ccache_3.1.11.bb | 7 ------- meta/recipes-devtools/ccache/ccache_3.2.3.bb | 6 ++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-devtools/ccache/ccache_3.1.11.bb create mode 100644 meta/recipes-devtools/ccache/ccache_3.2.3.bb
I suspect this resulted in:
Cheers,
Richard
Re: [PATCH 7/8] ccache: update to 3.2.3
Quoted 5 lines
I suspect this resulted in:
The issue is caused by this construct in ccache's Makefile:
extra_libs = -lz
ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
$(CC) $(all_cflags) -o $@ $(ccache_objs) $(all_ldflags)
$(extra_libs) $(LIBS)
Yet, what is really strange, on my machine 'make' does not see such definition and use of extra_libs as a problem and the build succeeds fine.
Does the autobuilder run a different make than I do?
ak@kanavin-desktop:~/development/poky/build$ make -v GNU Make 4.0 Built for x86_64-pc-linux-gnu ...
Alex
Re: [PATCH 7/8] ccache: update to 3.2.3
Quoted 18 lines
Quoted 5 lines
I suspect this resulted in:
The issue is caused by this construct in ccache's
Makefile:
extra_libs= -lzccache$(EXEEXT): $(ccache_objs) $(extra_libs)
$(CC) $(all_cflags) -o $@ $(ccache_objs) $(all_ldflags)$(extra_libs) $(LIBS)
Yet, what is really strange, on my machine 'make' does not see such definition and use of
extra_libsas a problem and the build succeeds fine.
Quoted 6 lines
Does the autobuilder run a different make than I do?
ak@kanavin-desktop:~/development/poky/build$ make -v GNU Make 4.0 Built for x86_64-pc-linux-gnu ...
Nevermind, I should've dug a bit deeper:
https://git.samba.org/?p=ccache.git;a=commit;h=f74c76107933046309861680b741adc67ac2a34e
I'll resend with this patch included.
Alex