[OE-Core][PATCH 1/7] systemd: Move musl patches to SRC_URI_MUSL

[OE-Core][PATCH 1/7] systemd: Move musl patches to SRC_URI_MUSL

[Alex Kiernan]

Supplemental musl patches for v246 were erroneously added to SRC_URI,
move them to SRC_URI_MUSL.

Fixes: 470c58ba4586 ("systemd: Upgrade v245.6 -> v246")
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 meta/recipes-core/systemd/systemd_246.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_246.bb b/meta/recipes-core/systemd/systemd_246.bb
index a463aab1e302..11e3cd29665b 100644
--- a/meta/recipes-core/systemd/systemd_246.bb
+++ b/meta/recipes-core/systemd/systemd_246.bb
@@ -20,9 +20,6 @@ SRC_URI += "file://touchscreen.rules \
            file://99-default.preset \
            file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
            file://0003-implment-systemd-sysv-install-for-OE.patch \
-           file://0021-Handle-missing-LOCK_EX.patch \
-           file://0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \
-           file://0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch \
            "
 
 # patches needed by musl
@@ -45,6 +42,9 @@ SRC_URI_MUSL = "\
                file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \
                file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \
                file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \
+               file://0021-Handle-missing-LOCK_EX.patch \
+               file://0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \
+               file://0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch \
                file://0024-test-json.c-define-M_PIl.patch \
                file://0001-do-not-disable-buffer-in-writing-files.patch \
                file://0002-src-login-brightness.c-include-sys-wait.h.patch \
-- 
2.17.1

[OE-Core][PATCH 2/7] systemd: Fix path to modules-load.d et al

[Alex Kiernan]

Following 4a56315a990b ("path: use ROOTPREFIX properly"), the paths to
sysusers.d, sysctl.d binfmt.d and modules-load.d changed to /lib when
building without usrmerge, which aoppears to be an inadvertent ABI
change. Undo this change and track upstream:

  https://github.com/systemd/systemd/issues/16773

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 ...0001-Use-PREFIX-ROOTPREFIX-correctly.patch | 81 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_246.bb      |  1 +
 2 files changed, 82 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch

diff --git a/meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch b/meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch
new file mode 100644
index 000000000000..c61941df9181
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-Use-PREFIX-ROOTPREFIX-correctly.patch
@@ -0,0 +1,81 @@
+From 2868e3b72d4ac02860e380d70c9af0d61a985790 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Sun, 16 Aug 2020 16:07:12 +0000
+Subject: [PATCH] Use PREFIX/ROOTPREFIX correctly
+
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+Upstream-status: Pending [https://github.com/systemd/systemd/issues/16773]
+---
+ meson.build                      | 1 +
+ src/core/systemd.pc.in           | 8 ++++----
+ src/libsystemd/sd-path/sd-path.c | 8 ++++----
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index dbbddb68e232..18618dba0623 100644
+--- a/meson.build
++++ b/meson.build
+@@ -226,6 +226,7 @@ conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH',               join_paths(rootlib
+ conf.set_quoted('SYSTEMCTL_BINARY_PATH',                      join_paths(rootbindir, 'systemctl'))
+ conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
+ conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH',           join_paths(bindir, 'systemd-stdio-bridge'))
++conf.set_quoted('PREFIX',                                     prefixdir)
+ conf.set_quoted('ROOTPREFIX',                                 rootprefixdir)
+ conf.set_quoted('RANDOM_SEED_DIR',                            randomseeddir)
+ conf.set_quoted('RANDOM_SEED',                                join_paths(randomseeddir, 'random-seed'))
+diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
+index 8424837824b5..410a126317ad 100644
+--- a/src/core/systemd.pc.in
++++ b/src/core/systemd.pc.in
+@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir}
+ tmpfiles_dir=${prefix}/lib/tmpfiles.d
+ tmpfilesdir=${tmpfiles_dir}
+ 
+-sysusers_dir=${rootprefix}/lib/sysusers.d
++sysusers_dir=${prefix}/lib/sysusers.d
+ sysusersdir=${sysusers_dir}
+ 
+-sysctl_dir=${rootprefix}/lib/sysctl.d
++sysctl_dir=${prefix}/lib/sysctl.d
+ sysctldir=${sysctl_dir}
+ 
+-binfmt_dir=${rootprefix}/lib/binfmt.d
++binfmt_dir=${prefix}/lib/binfmt.d
+ binfmtdir=${binfmt_dir}
+ 
+-modules_load_dir=${rootprefix}/lib/modules-load.d
++modules_load_dir=${prefix}/lib/modules-load.d
+ modulesloaddir=${modules_load_dir}
+ 
+ catalog_dir=${prefix}/lib/systemd/catalog
+diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
+index 736795d1d797..3572916dc073 100644
+--- a/src/libsystemd/sd-path/sd-path.c
++++ b/src/libsystemd/sd-path/sd-path.c
+@@ -371,19 +371,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
+                 return 0;
+ 
+         case SD_PATH_SYSUSERS:
+-                *ret = ROOTPREFIX "/lib/sysusers.d";
++                *ret = PREFIX "/lib/sysusers.d";
+                 return 0;
+ 
+         case SD_PATH_SYSCTL:
+-                *ret = ROOTPREFIX "/lib/sysctl.d";
++                *ret = PREFIX "/lib/sysctl.d";
+                 return 0;
+ 
+         case SD_PATH_BINFMT:
+-                *ret = ROOTPREFIX "/lib/binfmt.d";
++                *ret = PREFIX "/lib/binfmt.d";
+                 return 0;
+ 
+         case SD_PATH_MODULES_LOAD:
+-                *ret = ROOTPREFIX "/lib/modules-load.d";
++                *ret = PREFIX "/lib/modules-load.d";
+                 return 0;
+ 
+         case SD_PATH_CATALOG:
+-- 
+2.17.1
+
diff --git a/meta/recipes-core/systemd/systemd_246.bb b/meta/recipes-core/systemd/systemd_246.bb
index 11e3cd29665b..704a36e75d6d 100644
--- a/meta/recipes-core/systemd/systemd_246.bb
+++ b/meta/recipes-core/systemd/systemd_246.bb
@@ -20,6 +20,7 @@ SRC_URI += "file://touchscreen.rules \
            file://99-default.preset \
            file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
            file://0003-implment-systemd-sysv-install-for-OE.patch \
+           file://0001-Use-PREFIX-ROOTPREFIX-correctly.patch \
            "
 
 # patches needed by musl
-- 
2.17.1

[OE-Core][PATCH 3/7] nfs-utils: Drop StandardError=syslog from systemd unit

[Alex Kiernan]

With systemd v246 the syslog target now generates a warning (and has
been deprecated for some time). Drop the target and allow the default to
take effect.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
index 6481377d8099..5c845b7e82f0 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -17,7 +17,6 @@ ExecStop=@SBINDIR@/rpc.nfsd 0
 ExecStopPost=@SBINDIR@/exportfs -au
 ExecStopPost=@SBINDIR@/exportfs -f
 ExecReload=@SBINDIR@/exportfs -r
-StandardError=syslog
 RemainAfterExit=yes
 
 [Install]
-- 
2.17.1

[OE-Core][PATCH 4/7] openssh: Drop StandardError=syslog from systemd unit

[Alex Kiernan]

With systemd v246 the syslog target now generates a warning (and has
been deprecated for some time). Drop the target and allow the default to
take effect.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 meta/recipes-connectivity/openssh/openssh/sshd@.service | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh/sshd@.service b/meta/recipes-connectivity/openssh/openssh/sshd@.service
index 422450c7a190..9d9965e6245f 100644
--- a/meta/recipes-connectivity/openssh/openssh/sshd@.service
+++ b/meta/recipes-connectivity/openssh/openssh/sshd@.service
@@ -7,5 +7,4 @@ Environment="SSHD_OPTS="
 EnvironmentFile=-/etc/default/ssh
 ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS
 StandardInput=socket
-StandardError=syslog
 KillMode=process
-- 
2.17.1

[OE-Core][PATCH 5/7] volatile-binds: Drop StandardOutput=syslog from systemd unit

[Alex Kiernan]

With systemd v246 the syslog target now generates a warning (and has
been deprecated for some time). Drop the target and allow the default to
take effect.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 meta/recipes-core/volatile-binds/files/volatile-binds.service.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-core/volatile-binds/files/volatile-binds.service.in b/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
index b23355a7140b..e2ad39f258c5 100644
--- a/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
+++ b/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
@@ -10,7 +10,6 @@ ConditionPathIsReadWrite=!@where@
 [Service]
 Type=oneshot
 RemainAfterExit=Yes
-StandardOutput=syslog
 TimeoutSec=0
 ExecStart=/sbin/mount-copybind @what@ @where@
 ExecStop=/bin/umount @where@
-- 
2.17.1

[OE-Core][PATCH 6/7] systemd: Upgrade v246 -> v246.1

[Alex Kiernan]

Commits:

  972391ac396f fix typo in systemctl help
  443aacfcda39 man: clarify that LogNamespace= is for system services only
  5aec8fe54e47 _sd-common.h: avoid parsing errors with Coverity
  f9ad4ea2ca06 analyze: fix 'cat-config systemd/zram-generator.conf'
  dda6fec1dfc7 man: describe that changing Storage= does not move existing data
  2bbd33e476ac core: reset bus error before reuse
  b81504a3c76b nspawn: Fix incorrect usage of putenv
  cb263973acf8 man: fix typo in systemd.service
  73b432e7ef21 network: fix DHCPv6 Prefix Delegation example after option rename

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 .../systemd/{systemd-boot_246.bb => systemd-boot_246.1.bb}      | 0
 .../systemd/{systemd-conf_246.bb => systemd-conf_246.1.bb}      | 0
 meta/recipes-core/systemd/systemd.inc                           | 2 +-
 meta/recipes-core/systemd/{systemd_246.bb => systemd_246.1.bb}  | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/systemd/{systemd-boot_246.bb => systemd-boot_246.1.bb} (100%)
 rename meta/recipes-core/systemd/{systemd-conf_246.bb => systemd-conf_246.1.bb} (100%)
 rename meta/recipes-core/systemd/{systemd_246.bb => systemd_246.1.bb} (100%)

diff --git a/meta/recipes-core/systemd/systemd-boot_246.bb b/meta/recipes-core/systemd/systemd-boot_246.1.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_246.bb
rename to meta/recipes-core/systemd/systemd-boot_246.1.bb
diff --git a/meta/recipes-core/systemd/systemd-conf_246.bb b/meta/recipes-core/systemd/systemd-conf_246.1.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-conf_246.bb
rename to meta/recipes-core/systemd/systemd-conf_246.1.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 8ce78efbbde4..25f80ff237a2 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "5c68ad14af6c89261f31f0abb4850fb1c99e8cfd"
+SRCREV = "7fb880ddf101b871f68aae0d86db652e2c13c5db"
 SRCBRANCH = "v246-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
 
diff --git a/meta/recipes-core/systemd/systemd_246.bb b/meta/recipes-core/systemd/systemd_246.1.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd_246.bb
rename to meta/recipes-core/systemd/systemd_246.1.bb
-- 
2.17.1

[OE-Core][PATCH 7/7] systemd: Upgrade v246.1 -> v246.2

[Alex Kiernan]

Commits:

  946e4c43bb4a tools/make-man-index: fix purpose text that contains tags
  dae0586e9193 test-fs-util: skip encrypted path test if we get EACCES
  0d026c9b0d2f Newer Glibc use faccessat2 to implement faccessat
  fde6520d468f namespace: fix minor memory leak
  208ba581f44f man: fix incorrectly placed full stop
  6c81d578289b man: fix typo
  53a8d2588e72 bless-boot: add missing verb to --help
  4cfa0ac4fdc4 user-record: deal with invalid GECOS fields gracefully
  ae5234ef4838 user-util: add mangle_gecos() call for turning strings into fields suitable as GECOS fields

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 meta/recipes-core/systemd/systemd.inc                           | 2 +-
 .../recipes-core/systemd/{systemd_246.1.bb => systemd_246.2.bb} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/systemd/{systemd_246.1.bb => systemd_246.2.bb} (100%)

diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 25f80ff237a2..b0d4fe403329 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "7fb880ddf101b871f68aae0d86db652e2c13c5db"
+SRCREV = "91b37e6f0982e1e64c63017000248d7441a83a2e"
 SRCBRANCH = "v246-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
 
diff --git a/meta/recipes-core/systemd/systemd_246.1.bb b/meta/recipes-core/systemd/systemd_246.2.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd_246.1.bb
rename to meta/recipes-core/systemd/systemd_246.2.bb
-- 
2.17.1

✗ patchtest: failure for "systemd: Move musl patches to ..." and 6 more

[Patchwork]

== Series Details ==

Series: "systemd: Move musl patches to ..." and 6 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/25697/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Upstream-Status is in incorrect format [test_upstream_status_presence_format] 
  Suggested fix    Fix Upstream-Status format in 0001-Use-PREFIX-ROOTPREFIX-correctly.patch
  Current          Upstream-status: Pending [https://github.com/systemd/systemd/issues/16773]
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe