Upgrade gawk, sysstat, dbus, dbus-test, dbus-glib and sudo
v2 cover Upgrade gawk, sysstat, dbus, dbus-test, dbus-glib and sudo
Changes in V2:
* Remove retrospection related codes in dbus recipe
* Remove the meaningless session.conf installation in dbus recipe
The following changes since commit 5479654eeaaa0f81bfff54ca49369c87f1658705:
rm_work: Stop appending _setscene to do_image_complete_setscene stamps (2018-05-11 07:49:38 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/PU20180511
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU20180511
Chen Qi (6):
gawk: upgrade to 4.2.1
sysstat: upgrade to 11.7.3
dbus: upgrade to 1.12.8
dbus-test: upgrade to 1.12.8
dbus-glib: upgrade to 0.110
sudo: upgrade to 1.8.23
meta/recipes-core/dbus/dbus-glib.inc | 4 +---
meta/recipes-core/dbus/dbus-glib_0.108.bb | 4 ----
meta/recipes-core/dbus/dbus-glib_0.110.bb | 4 ++++
.../dbus/{dbus-test_1.12.2.bb => dbus-test_1.12.8.bb} | 4 ++--
meta/recipes-core/dbus/{dbus_1.12.2.bb => dbus_1.12.8.bb} | 12 ++----------
meta/recipes-extended/gawk/{gawk_4.2.0.bb => gawk_4.2.1.bb} | 4 ++--
meta/recipes-extended/sudo/sudo.inc | 5 +++--
.../recipes-extended/sudo/{sudo_1.8.22.bb => sudo_1.8.23.bb} | 8 ++++----
.../sysstat/{sysstat_11.7.1.bb => sysstat_11.7.3.bb} | 4 ++--
9 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.108.bb
create mode 100644 meta/recipes-core/dbus/dbus-glib_0.110.bb
rename meta/recipes-core/dbus/{dbus-test_1.12.2.bb => dbus-test_1.12.8.bb} (95%)
rename meta/recipes-core/dbus/{dbus_1.12.2.bb => dbus_1.12.8.bb} (92%)
rename meta/recipes-extended/gawk/{gawk_4.2.0.bb => gawk_4.2.1.bb} (89%)
rename meta/recipes-extended/sudo/{sudo_1.8.22.bb => sudo_1.8.23.bb} (81%)
rename meta/recipes-extended/sysstat/{sysstat_11.7.1.bb => sysstat_11.7.3.bb} (53%)Signature · 1 line
1.9.1
PATCH v2 1/6 gawk: upgrade to 4.2.1
---
meta/recipes-extended/gawk/{gawk_4.2.0.bb => gawk_4.2.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/gawk/{gawk_4.2.0.bb => gawk_4.2.1.bb} (89%)meta/recipes-extended/gawk/gawk_4.2.1.bb renamed from meta/recipes-extended/gawk/gawk_4.2.0.bb +2 -2
@@ -19,8 +19,8 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "0b598c31bc703d66082bd958d4189980" -SRC_URI[sha256sum] = "c88046c6e8396ee548bcb941e16def809b7b55b60a1044b5dd254094f347c7d9" +SRC_URI[md5sum] = "0256724a0af50cb83ac92f833488673d" +SRC_URI[sha256sum] = "2b23d51503b2df9a41aa6fddc6002ad7ebf2a386ac19dc1b6be0dd48b0acf6db" inherit autotools gettext texinfo update-alternatives
Signature · 1 line
1.9.1
PATCH v2 2/6 sysstat: upgrade to 11.7.3
In reply to Chen Qi---
.../recipes-extended/sysstat/{sysstat_11.7.1.bb => sysstat_11.7.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/sysstat/{sysstat_11.7.1.bb => sysstat_11.7.3.bb} (53%)meta/recipes-extended/sysstat/sysstat_11.7.3.bb renamed from meta/recipes-extended/sysstat/sysstat_11.7.1.bb +2 -2
@@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-Include-needed-headers-explicitly.patch" -SRC_URI[md5sum] = "bdcda7c9048c7c22fb1f30f75285d13d" -SRC_URI[sha256sum] = "303a595b1af0330b183a0f1febfccf89f183b9575ae0562b91fdb876f3ef1feb" +SRC_URI[md5sum] = "c40cefdc7649c7554ecf1d56bf485d09" +SRC_URI[sha256sum] = "8ea4ffcce8dae68a1cbb6acaa131ae7e3e6c5765134e670aa9baa38c1bcc66ea"
Signature · 1 line
1.9.1
PATCH v2 3/6 dbus: upgrade to 1.12.8
In reply to Chen QiRemove instrospection related tweaks as dbus-glib no longer needs this xml file.
Remove the installation of session.conf. This file is installed into recipe-sysroot-native directory, which makes no sense.
---
meta/recipes-core/dbus/{dbus_1.12.2.bb => dbus_1.12.8.bb} | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
rename meta/recipes-core/dbus/{dbus_1.12.2.bb => dbus_1.12.8.bb} (92%)meta/recipes-core/dbus/dbus_1.12.8.bb renamed from meta/recipes-core/dbus/dbus_1.12.2.bb +2 -10
@@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" -SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88" +SRC_URI[md5sum] = "2764bf150e5aa8005b7bc0d6c388756a" +SRC_URI[sha256sum] = "e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3" inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
@@ -153,14 +153,6 @@ do_install() { do_install_class-native() { autotools_do_install - # for dbus-glib-native introspection generation - install -d ${D}${STAGING_DATADIR_NATIVE}/dbus/ - # N.B. is below install actually required? - install -m 0644 bus/session.conf ${D}${STAGING_DATADIR_NATIVE}/dbus/session.conf - - # dbus-glib-native and dbus-glib need this xml file - ./bus/dbus-daemon --introspect > ${D}${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml - # dbus-launch has no X support so lets not install it in case the host # has a more featured and useful version rm -f ${D}${bindir}/dbus-launch
Signature · 1 line
1.9.1
PATCH v2 4/6 dbus-test: upgrade to 1.12.8
In reply to Chen Qi---
meta/recipes-core/dbus/{dbus-test_1.12.2.bb => dbus-test_1.12.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.12.2.bb => dbus-test_1.12.8.bb} (95%)meta/recipes-core/dbus/dbus-test_1.12.8.bb renamed from meta/recipes-core/dbus/dbus-test_1.12.2.bb +2 -2
@@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" -SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88" +SRC_URI[md5sum] = "2764bf150e5aa8005b7bc0d6c388756a" +SRC_URI[sha256sum] = "e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
Signature · 1 line
1.9.1
PATCH v2 5/6 dbus-glib: upgrade to 0.110
In reply to Chen QiThe obsolete '--with-introspect-xml' option is removed.
--- meta/recipes-core/dbus/dbus-glib.inc | 4 +--- meta/recipes-core/dbus/dbus-glib_0.108.bb | 4 ---- meta/recipes-core/dbus/dbus-glib_0.110.bb | 4 ++++ 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.108.bb create mode 100644 meta/recipes-core/dbus/dbus-glib_0.110.bb
meta/recipes-core/dbus/dbus-glib.inc +1 -3
@@ -22,9 +22,7 @@ inherit autotools pkgconfig gettext bash-completion gtk-doc PACKAGECONFIG ??= "" PACKAGECONFIG[tests] = "--enable-tests,,," -EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \ - --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" -EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" +EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" PACKAGES += "${PN}-tests"
meta/recipes-core/dbus/dbus-glib_0.108.bb deleted +0 -4
@@ -1,4 +0,0 @@ -require dbus-glib.inc - -SRC_URI[md5sum] = "a66a613705870752ca9786e0359aea97" -SRC_URI[sha256sum] = "9f340c7e2352e9cdf113893ca77ca9075d9f8d5e81476bf2bf361099383c602c"
meta/recipes-core/dbus/dbus-glib_0.110.bb new file +4 -0
@@ -0,0 +1,4 @@ +require dbus-glib.inc + +SRC_URI[md5sum] = "d7cebf1d69445cbd28b4983392145192" +SRC_URI[sha256sum] = "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825"
Signature · 1 line
1.9.1
PATCH v2 6/6 sudo: upgrade to 1.8.23
In reply to Chen QiUpgrade sudo to 1.8.23.
The license checksum changes but the actual license does not.
The /var/run/sudo directory has changed to /run/sudo, change do_install_append according to avoid error.
---
meta/recipes-extended/sudo/sudo.inc | 5 +++--
meta/recipes-extended/sudo/{sudo_1.8.22.bb => sudo_1.8.23.bb} | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.22.bb => sudo_1.8.23.bb} (81%)meta/recipes-extended/sudo/sudo.inc +3 -2
@@ -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=7765a3d787cb4fed3ccc3c9cee030af9 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=cc4bf2366b059c9598e3947f885931ec \ file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=805782a8466975716f8376b2be9aedde \ file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9 \ file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ 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" + file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a \ + " inherit autotools
meta/recipes-extended/sudo/sudo_1.8.23.bb renamed from meta/recipes-extended/sudo/sudo_1.8.22.bb +4 -4
@@ -7,8 +7,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "24abdea48db4c5abcd410167c801cc8c" -SRC_URI[sha256sum] = "7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02" +SRC_URI[md5sum] = "ea444d747feb1decfebdffd0b38b0739" +SRC_URI[sha256sum] = "d863d29b6fc87bc784a3223350e2b28a2ff2c4738f0fb8f1c92bb38c3017e679" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
@@ -27,8 +27,8 @@ do_install_append () { chmod 4111 ${D}${bindir}/sudo chmod 0440 ${D}${sysconfdir}/sudoers - # Explicitly remove the ${localstatedir}/run directory to avoid QA error - rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo + # Explicitly remove the /run directory to avoid QA error + rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo } FILES_${PN} += "${libdir}/tmpfiles.d"
Signature · 1 line
1.9.1