Patch review Oct 4
cover Patch review Oct 4
Next dunfell patch review.
Please have comments back by Tuesday evening.
The following changes since commit 144077083457ccb75700777d5e6b1da9aaff01aa:
iwd: Upgrade to 1.9 (2020-09-19 11:22:44 -0700)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/dunfell-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nut
Andreas Müller (1):
gnome-settings-daemon: Remove wrong RDEPEND
Hongxu Jia (1):
python3-pykwalify: fix missing comma
Khem Raj (1):
ssmtp: Use update alternatives for conflicts with esmtp
Martin Jansa (2):
netkit-rsh: inherit update-alternatives
ssmtp: adjust u-a
Mingli Yu (2):
smartmontools: Remove obsolete setting regarding the Standard Output
strongswan: Remove obsolete setting regarding the Standard Output
Pierre-Jean Texier (1):
haveged: upgrade 1.9.9 -> 1.9.13
Robert Yang (1):
crda: rdepends on wireless-regdb-static
.../gnome-settings-daemon_3.34.2.bb | 2 --
.../recipes-connectivity/crda/crda_3.18.bb | 2 +-
.../netkit-rsh/netkit-rsh_0.17.bb | 2 +-
.../recipes-support/ssmtp/ssmtp_2.64.bb | 9 ++++-
...setting-regarding-the-Standard-Outpu.patch | 34 +++++++++++++++++++
.../strongswan/strongswan_5.8.4.bb | 1 +
.../{haveged_1.9.9.bb => haveged_1.9.13.bb} | 2 +-
.../smartmontools/files/smartd.service | 1 -
.../0001-rule.py-fix-missing-comma.patch | 34 +++++++++++++++++++
.../python/python3-pykwalify_1.7.0.bb | 2 ++
10 files changed, 82 insertions(+), 7 deletions(-)
create mode 100644 meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
rename meta-oe/recipes-extended/haveged/{haveged_1.9.9.bb => haveged_1.9.13.bb} (97%)
create mode 100644 meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patchSignature · 1 line
2.17.1
PATCH 1/9 haveged: upgrade 1.9.9 -> 1.9.13
From: Pierre-Jean Texier <[email protected]>
This includes the following changes:
1.9.10:
- fix ordering cycle with private tmp
1.9.11:
- Fixed wrong version string in v1.9.10
1.9.12:
- Fix a memory leak in havege_destroy
1.9.13:
- Added support for --version
- Updated systemd SystemCallFilter settings
---
.../haveged/{haveged_1.9.9.bb => haveged_1.9.13.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/haveged/{haveged_1.9.9.bb => haveged_1.9.13.bb} (97%)meta-oe/recipes-extended/haveged/haveged_1.9.13.bb renamed from meta-oe/recipes-extended/haveged/haveged_1.9.9.bb +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # v1.9.9 -SRCREV = "6da706c8026b629d9bb7ebebc32239305a03da8e" +SRCREV = "1283a65c541c4a83e152024a63faf7b267b9b1cd" SRC_URI = "git://github.com/jirka-h/haveged.git \ " S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 2/9 netkit-rsh: inherit update-alternatives
In reply to akusterFrom: Martin Jansa <[email protected]>
* fixes:
netkit-rsh-0.17-r0 do_package_qa: QA Issue: netkit-rsh: recipe defines ALTERNATIVE_netkit-rsh-client but doesn't inherit update-alternatives. This might fail during do_rootfs later! [missing-update-alternatives] netkit-rsh-0.17-r0 do_package_qa: QA Issue: netkit-rsh: recipe defines ALTERNATIVE_netkit-rsh-server but doesn't inherit update-alternatives. This might fail during do_rootfs later! [missing-update-alternatives]
--- meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +1 -1
@@ -31,7 +31,7 @@ PAM_SRC_URI = "file://rexec.pam \ " SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" -inherit pkgconfig +inherit pkgconfig update-alternatives CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations" LDFLAGS += " -L${STAGING_LIBDIR} -lutil -lcrypt"
Signature · 1 line
2.17.1
PATCH 3/9 ssmtp: Use update alternatives for conflicts with esmtp
In reply to akusterFrom: Khem Raj <[email protected]>
--- .../recipes-support/ssmtp/ssmtp_2.64.bb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +14 -1
@@ -12,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f" SRC_URI[sha256sum] = "22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36" -inherit autotools +inherit autotools update-alternatives PACKAGECONFIG ?= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
@@ -33,3 +33,16 @@ do_install_append () { ln -s ssmtp ${D}${sbindir}/newaliases ln -s ssmtp ${D}${sbindir}/mailq } + +ALTERNATIVE_PRIORITY_${PN} = "100" + +ALTERNATIVE_${PN} = "mailq newalias sendmail" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_LINK_NAME[newalias] = "${sbindir}/newalias" +ALTERNATIVE_LINK_NAME[mailq] = "${sbindir}/mailq" + +ALTERNATIVE_PRIORITY_${PN}-doc = "100" +ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" +ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" +ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1"
Signature · 1 line
2.17.1
PATCH 4/9 ssmtp: adjust u-a
In reply to akusterFrom: Martin Jansa <[email protected]>
* it's newaliases not newalias in sbindir
* drop u-a for man pages, because only ssmtp.8 was created which shouldn't conflict with esmpt
In my build I don't have mailq, sendmail, newaliases as man pages, but binaries in sbindir (and the sbinbinary is called newaliases, not newalias)
tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/ tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share/man tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share/man/man8 tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share/man/man8/ssmtp.8 tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/mailq tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/sendmail tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/newaliases tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/ssmtp tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/etc tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/etc/ssmtp tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/etc/ssmtp/revaliases
this added u-a is causing following warnings:
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/share/man/man1/mailq.1 or /usr/share/man/man1/mailq.1.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/share/man/man1/newaliases.1 or /usr/share/man/man1/newaliases.1.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/share/man/man1/sendmail.1 or /usr/share/man/man1/sendmail.1.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/sbin/newalias or /usr/sbin/newalias.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/share/man/man1/mailq.1: /usr/share/man/man1/mailq.1.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/share/man/man1/newaliases.1: /usr/share/man/man1/newaliases.1.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/share/man/man1/sendmail.1: /usr/share/man/man1/sendmail.1.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/sbin/newalias: /usr/sbin/newalias.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target: /usr/share/man/man1/mailq.1 == /usr/share/man/man1/mailq.1
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target: /usr/share/man/man1/newaliases.1 == /usr/share/man/man1/newaliases.1
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target: /usr/share/man/man1/sendmail.1 == /usr/share/man/man1/sendmail.1
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target: /usr/sbin/newalias == /usr/sbin/newalias
--- meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +2 -8
@@ -36,13 +36,7 @@ do_install_append () { ALTERNATIVE_PRIORITY_${PN} = "100" -ALTERNATIVE_${PN} = "mailq newalias sendmail" +ALTERNATIVE_${PN} = "mailq newaliases sendmail" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" -ALTERNATIVE_LINK_NAME[newalias] = "${sbindir}/newalias" +ALTERNATIVE_LINK_NAME[newaliases] = "${sbindir}/newaliases" ALTERNATIVE_LINK_NAME[mailq] = "${sbindir}/mailq" - -ALTERNATIVE_PRIORITY_${PN}-doc = "100" -ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" -ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" -ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" -ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1"
Signature · 1 line
2.17.1
PATCH 5/9 gnome-settings-daemon: Remove wrong RDEPEND
In reply to akusterFrom: Andreas Müller <[email protected]>
* Since variable was misspelled it was a no-op
* There is no gdbus package (gdbus is in glib-2.0-utils)
* Did not find any pointer in the source that gdbus has to be installed on target
--- .../gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb | 2 -- 1 file changed, 2 deletions(-)
meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb +0 -2
@@ -54,5 +54,3 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ ${libdir}/gnome-settings-daemon-3.0/libgsd.so \ " - -RDEPEND_${PN} += "gdbus"
Signature · 1 line
2.17.1
PATCH 6/9 smartmontools: Remove obsolete setting regarding the Standard Output
In reply to akusterFrom: Mingli Yu <[email protected]>
The Standard output type "syslog" is obsolete, causing a warning since systemd version 246 [1].
Please consider using "journal" or "journal+console"
[1] https://github.com/systemd/systemd/blob/master/NEWS#L202
--- meta-oe/recipes-extended/smartmontools/files/smartd.service | 1 - 1 file changed, 1 deletion(-)
meta-oe/recipes-extended/smartmontools/files/smartd.service +0 -1
@@ -6,7 +6,6 @@ After=syslog.target EnvironmentFile=-@SYSCONFDIR@/smartmontools ExecStart=@SBINDIR@/smartd -n $smart_opts ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID -StandardOutput=syslog [Install] WantedBy=multi-user.target
Signature · 1 line
2.17.1
PATCH 7/9 strongswan: Remove obsolete setting regarding the Standard Output
In reply to akusterFrom: Mingli Yu <[email protected]>
The Standard output type "syslog" is obsolete, causing a warning since systemd version 246 [1].
Please consider using "journal" or "journal+console"
[1] https://github.com/systemd/systemd/blob/master/NEWS#L202
--- ...setting-regarding-the-Standard-Outpu.patch | 34 +++++++++++++++++++ .../strongswan/strongswan_5.8.4.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 7b1e376d7d22244feab466e9889ba77561117357 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +Date: Wed, 23 Sep 2020 16:20:22 +0800 +Subject: [PATCH] Remove obsolete setting regarding the Standard Output + +The Standard output type "syslog" is obsolete, causing a warning since systemd +version 246 [1]. + +Please consider using "journal" or "journal+console" + +[1] https://github.com/systemd/systemd/blob/master/NEWS#L202 + +Upstream-Status: Submitted [https://github.com/strongswan/strongswan/pull/181] + +Signed-off-by: Mingli Yu <[email protected]> +--- + init/systemd-starter/strongswan-starter.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/init/systemd-starter/strongswan-starter.service.in b/init/systemd-starter/strongswan-starter.service.in +index 474284a19..6a0672352 100644 +--- a/init/systemd-starter/strongswan-starter.service.in ++++ b/init/systemd-starter/strongswan-starter.service.in +@@ -4,7 +4,6 @@ After=syslog.target network-online.target + + [Service] + ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork +-StandardOutput=syslog + Restart=on-abnormal + + [Install] +-- +2.17.1 +
meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb +1 -0
@@ -10,6 +10,7 @@ DEPENDS = "gmp openssl flex-native flex bison-native" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://fix-funtion-parameter.patch \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ + file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \ " SRC_URI[md5sum] = "0634e7f40591bd3f6770e583c3f27d29"
Signature · 1 line
2.17.1
PATCH 8/9 crda: rdepends on wireless-regdb-static
In reply to akusterFrom: Robert Yang <[email protected]>
The wireless-regdb has been moved to oe-core. According the commit message:
wireless-regdb-static should be used with kernel >= 4.15. wireless-regdb can be used with older kernels and is mostly irrelevant here, but keeping it in meta-networking would create needless recipe duplication.
it should replace runtime dependency wireless-regdb with wireless-regdb-static.
--- meta-networking/recipes-connectivity/crda/crda_3.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/crda/crda_3.18.bb +1 -1
@@ -35,4 +35,4 @@ do_install() { oe_runmake SBINDIR=${sbindir}/ install } -RDEPENDS_${PN} = "udev wireless-regdb" +RDEPENDS_${PN} = "udev wireless-regdb-static"
Signature · 1 line
2.17.1
PATCH 9/9 python3-pykwalify: fix missing comma
In reply to akusterFrom: Hongxu Jia <[email protected]>
...
|/usr/lib/python3.8/site-packages/pykwalify/rule.py:343: SyntaxWarning:
'tuple' object is not callable; perhaps you missed a comma?
...
--- .../0001-rule.py-fix-missing-comma.patch | 34 +++++++++++++++++++ .../python/python3-pykwalify_1.7.0.bb | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch
meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch new file +34 -0
@@ -0,0 +1,34 @@ +From f96b76efb810d7d559254d0ec58de628e09f525a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= <[email protected]> +Date: Mon, 13 Jan 2020 08:42:05 -0800 +Subject: [PATCH] rule.py: fix missing comma +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +A line in the defined_keywords list is missing a comma. Add it. + +Signed-off-by: Martí Bolívar <[email protected]> + +Upstream-Status: Backport [https://github.com/Grokzen/pykwalify.git] +Signed-off-by: Hongxu Jia <[email protected]> +--- + pykwalify/rule.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pykwalify/rule.py b/pykwalify/rule.py +index 7ac2c9e..f044b69 100644 +--- a/pykwalify/rule.py ++++ b/pykwalify/rule.py +@@ -340,7 +340,7 @@ class Rule(object): + ('matching', 'matching'), + ('matching_rule', 'matching_rule'), + ('name', 'name'), +- ('nullable', 'nullable') ++ ('nullable', 'nullable'), + ('parent', 'parent'), + ('pattern', 'pattern'), + ('pattern_regexp', 'pattern_regexp'), +-- +2.18.2 +
meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb +2 -0
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a72ea5159364a2cd7f45c6dcbee37872" SRC_URI[md5sum] = "58357f1d0f77de976e73dbd3660af75b" SRC_URI[sha256sum] = "7e8b39c5a3a10bc176682b3bd9a7422c39ca247482df198b402e8015defcceb2" +SRC_URI += "file://0001-rule.py-fix-missing-comma.patch" + PYPI_PACKAGE = "pykwalify" inherit setuptools3 pypi unset _PYTHON_SYSCONFIGDATA_NAME
Signature · 1 line
2.17.1