Skip to contentSkip to conversation

systemd: Upgrade 243.2 -> 243.4-latest

PATCH Superseded Alex Kiernan 3 participants 7 messages Jan 27, 2020 – Feb 3, 2020 exec and binfmt

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemd: Upgrade 243.2 -> 243.4-latest

Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g.

systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting.

Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly").

Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0").

Commits from v243-stable:

70e8c1978a9a seccomp: real syscall numbers are >= 0
a0a1977d9a5d seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d597 network: set ipv6 mtu after link-up or device mtu change
b59d88cc62a4 man: fix typo in net-naming-scheme man page
c5e5ac095821 man: fix typos (#14304)
9a2f26564d5a ipv4ll: do not reset conflict counter on restart
bc9e1ebfdd3b Fix typo (duplicate "or")
c6cb71b7e741 network: if /sys is rw, then udev should be around
67dcdfd95629 nspawn: do not fail if udev is not running
a7938a1bc6d3 Create parent directories when creating systemd-private subdirs 53aa44f8738a network: do not return error but return UINT64_MAX if speed meter is disabled 65abf126744f core: swap priority can be negative
b1cf452ff5f6 systemctl: enhance message about kexec missing kernel
07a0e5b42523 man: use mkswap@ instead of makeswap@
57dc017c6bac journald: don't ask for the machine ID if we don't need it
ac392a57c08c journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc8237 journald: remove unused field
471073f1b52b journalctl: return EOPNOTSUPP if pcre is not enabled
002ededb61a0 man: drop reference to machined, add one for journald instead
fd3bd4be3bff pid1: make TimeoutAbortSec settable for transient units
eb2ef4d6643e pid1: fix setting of DefaultTimeoutAbortSec
1d75e29b2378 shared/ask-password-api: modify keyctl break value
a16b1ee7e565 cryptsetup: reduce the chance that we will be OOM killed
4836fb010ae8 core: write out correct field name when creating transient service units 3e2c547f6d3c udevd: don't use monitor after manager_exit()
d42f7d45a8e2 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8fd man/systemd.link: Add missing verb *be*
a67a3ae04b89 man: document all pager variables for systemctl and systemd
3a8fce3f38b6 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b682 core/service: downgrade "scheduling restart" message to debug
733e7f19d3cf travis: add missing closing quote sign
0d7b7817fc34 systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b31 pam_systemd: prolong method call timeout when allocating session e51d9bf9e5ac man: add entry about SpeedMeter=
aa1fc791c7a1 udev: silence warning about PROGRAM+= or IMPORT+= rules
b9a619bb6738 udevadm: ignore EROFS and return earlier
1ec5b9f80cb5 basic: add vmware hypervisor detection from device-tree
7fa7080248aa umount: be happy if /proc/swaps doesn't exist
71ccd774bb33 shutdown: make logging more useful if NULL swap/mount table files are specified 38453c6d42e4 man: share description of $SYSTEMD_COLORS in other tools
b50ca0152681 core: do not propagate polkit error to caller
99b72a66ca55 ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled 288edd686911 man: mention $RUNTIME_DIRECTORY & friends in environment list
37aeadd433d3 cryptsetup-generator: guess whether the keyfile argument is two items or one a87e8fdc72d7 verify: fix segmentation fault
3aea728cd2d2 timedated: it might be that tzinfo files are just not installed cc103c72abc1 timedated: handle UTC specially, when generating /etc/localtime f5a4caa5418b time-util: treat /etc/localtime missing as UTC
2139d58652bb bpf: fix off-by-one in class whitelisting
cb7693595db9 bpf: fix device type filter
56e1ba304b00 core: constify bpf program arrays
b06b7ace92c1 run: propagate return code/status from the child
5db454b8031c udevd: fix crash when workers time out after exit is signal caught b774282a855e udev: ignore error caused by device disconnection
8d88a2ecd7ce udev: fix error code in the log message
c41484a2f3d7 udev: ignore ENOENT when chmod_and_chown() device node
f218b65b3246 udev: do not append newline when write attributes
ce4d17ddbc16 time-util: uniquify timezone list, in case UTC is listed in timezone1970.tab, too 28f0b34c57bc time-util: always accept UTC as valid timezone
8b888d236007 seccomp: add all *time64 syscalls
53d8feeb2334 libblkid: open device in nonblock mode.
b9478046b03d man: describe ordering in case of Conflicts=
fa3e5bd2bbb4 man: put description of Wants= above Requires=
bdebd2c325fc meson: remove strange dep that causes meson to enter infinite loop 26bc77d8e5af man: fix option typo in pam_systemd man page
9c12127e3d2e man: save pull-raw example file without underscores
4c106cbcf1af man: small grammatical/word choice fixes to crypttab man page
03cc374fca74 shared/format-table: disable ellipsization when piped
0a5497d3fa4b sd-device-enumerator: do not return error when a device is removed 7b0d0331d051 bootctl: create leading dirs when "bootctl random-seed" is called if needed 5aab35aac9db core, job: fix breakage of ordering dependencies by systemctl reload command cd86ae937305 journalctl: allow running vacuum on remote journals, too
fc0451bc0a3f allow an empty DefaultInstance= in configuration files
587266c24aae man/systemd.net-naming-scheme: fix typo
e0e63f0f9bb9 nspawn: respect quiet on capabilities warning
37e50c05b564 nspawn: mangle slice name
4fefc493541e mkosi: Find hostname command on Arch Linux
c430e8affba4 Fix mkosi on Arch Linux
1765b8d803dd Update to Fedora31
0b9a2a9a9868 sd-boot: Silence compiler warning when building with -O2
24e02f8d49b6 sd-boot: Don't loudly complain if RNG protocol isn't available
14e377ef3519 sd-boot: Only disable optimization on debug builds
a39008ddecb9 meson: correct man page deps
4c1dcc06fa30 sd-event: don't invalidate source type on disconnect
fb89ee34cedc analyze: fix minor memleak
a449299bc087 analyze: sort list of unknown syscalls kernel implements
51ea58a04b18 seccomp: add new Linux 5.3 syscalls to syscall filter lists
819695c8b027 resolved: check for IP in certificate when using DoT with GnuTLS 37f817e21097 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS 32056809baa2 coverity: replace python with jq
d2b4d7ee17de network-generator: Add missing help for --root
f1b18c206208 modules-load: do not fail service if modules are not present
606de6626714 pid1: order .automount units after local-fs-pre.target
1366b81f2bc5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() 84d5cd699e25 shared/install: fix error codes returned by install_context_apply() 417779c58a86 man: alias names can't be used with enable command
00af6c447f25 resolved: set stream type during DnsStream creation
66dd9d7d25fd sd-device: allow sd_device_get_devtype to be called with NULL arg and do not assert 048f9da1a4b3 Remove unused plymouth_running() function
34fa67bbe732 machine-id-setup: avoid unexpected aborting
24c99fa2ef3d test-socket-util: avoid writing past the defined buffer
ce82233f99b3 test: drop duplicated 's'
75a0e7209114 nspawn: fix handling of --console=help
f41a282875fc Revert "sysusers: properly mark generated accounts as locked"
fc2dceac6172 Remove unprintable non-ASCII char from special glyph ASCII fallback table dedf5b511e6f logind: fix emission of PropertiesChanged for users
6e3cfe2e58f5 logind: fix emission of PropertiesChanged on seats
a9152084d7e9 resolved: fix connection failures with TLS 1.3 and GnuTLS
961879ed9ddb udev: tag any display devices as master-of-seat when nomodeset is used 8aa7bafa1295 systemd-fsck: fix systemd-fsck/fsck pipe bad closure
19590e289ace ceph is a network filesystem
339606ad9e99 portabled: allow to detach an image with a unit in linked-runtime state bd9692734ac5 network: ndisc: do not drop all prefixes when a prefix matches a blacklist 5e6d4f8b79e0 systemctl: fix memleak caused by wrong cleanup func
47d0e23d26af udev: fix memleak caused by wrong cleanup function
a6fb0542c5ef parse_hwdb: fix compatibility with pyparsing 2.4.*
cb1d892f1780 parse_hwdb: process files in order
ef677436aa20 test: Pass personality test even when i686 userland runs on x86_64 kernel 3f6398c450b8 docs: fix inadvertent change in uid range
25bb377a73e7 cgroup: fix typo in BPF firewall support warning message
6d97aca0d503 fix build with compilers with default stack-protector enabled
fbad077cec34 nspawn: surrender controlling terminal to PID2 when using the PID1 stub 0553c3c66889 pid1: fix DefaultTasksMax initialization
f406a691a722 src/core/automount: use DirectoryMode when calling mkdir -p
20438f96c326 udevadm trigger: do not propagate EACCES and ENODEV
6480630bc397 hwdb: Correct WWWW Pattern In Documentation Comment
9d8e889810b5 nspawn: consistenly fail if parsing the environment fails
40e169b30423 nspawn: default to unified hierarchy if --as-pid2 is used
b5df1037a0c0 cgroup: Mark memory protections as explicitly set in transient units f14e3e02cca7 cgroup: Respect DefaultMemoryMin when setting memory.min
ea248e53bf76 cgroup: Check ancestor memory min for unified memory config
de1d25a506db cgroup: docs: memory.high doc fixups
2ab45f38d8c4 cgroup: docs: Mention unbounded protection for memory.{low,min} 19a43dc38a13 Consider smb3 as remote filesystem
5c0224c7bf3c Handle d_type == DT_UNKNOWN correctly
8282bc61df10 util-lib: Don't propagate EACCES from find_binary PATH lookup to caller 9d0ae987a634 network: drop noisy log message
f67f0e4ec45a Updated log message when the timesync happens for the first time (#13624) e151bf467494 units: make systemd-binfmt.service easier to work with no autofs 2b8e574d8242 Corect man page reference in systemd-nologin.conf comments
a0577353f191 man: Add a missing space in machinectl(1)
693e98398869 log: Add missing "%" in "%m" log format strings
ea7151b8c435 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist b90549290e33 man: fix typo

---

 ...md-boot_243.2.bb => systemd-boot_243.4.bb} |   0
 meta/recipes-core/systemd/systemd.inc         |   4 +-
 ...tall-dependency-links-at-install-tim.patch |  30 ++--
 ...prehensive-protection-against-libsec.patch | 152 ------------------
 ...ider-symlink-on-filesystems-like-NFS.patch |  42 -----
 .../{systemd_243.2.bb => systemd_243.4.bb}    |   2 -
 6 files changed, 18 insertions(+), 212 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_243.2.bb => systemd-boot_243.4.bb} (100%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch
 rename meta/recipes-core/systemd/{systemd_243.2.bb => systemd_243.4.bb} (99%)
meta/recipes-core/systemd/systemd-boot_243.4.bb renamed from meta/recipes-core/systemd/systemd-boot_243.2.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_243.2.bb
rename to meta/recipes-core/systemd/systemd-boot_243.4.bb
meta/recipes-core/systemd/systemd.inc +3 -1
index 18f17d28ac53..2fca6dca64b7 100644
@@ -14,8 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9"
+SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083"
 SRCBRANCH = "v243-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
 
+PV = "243.4+git${SRCPV}"
+
 S = "${WORKDIR}/git"
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +15 -15
index 73e65ff79859..ea37680221f2 100644
@@ -24,10 +24,10 @@ Signed-off-by: Scott Murray <[email protected]>
  units/systemd-binfmt.service.in         | 4 ++++
  3 files changed, 9 insertions(+), 4 deletions(-)
 
-diff --git a/units/meson.build b/units/meson.build
-index e1ee9f86c3..6bb7771b36 100644
---- a/units/meson.build
-+++ b/units/meson.build
+Index: systemd-stable/units/meson.build
+===================================================================
+--- systemd-stable.orig/units/meson.build
++++ systemd-stable/units/meson.build
 @@ -46,8 +46,7 @@ units = [
          ['poweroff.target',                     '',
           'runlevel0.target'],
@@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644
          ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
          ['systemd-boot-check-no-failures.service', ''],
          ['systemd-boot-system-token.service',    'ENABLE_EFI',
-diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
-index 30a6bc9918..4231f3b70f 100644
---- a/units/proc-sys-fs-binfmt_misc.automount
-+++ b/units/proc-sys-fs-binfmt_misc.automount
+Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
+===================================================================
+--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
 @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
  
  [Automount]
@@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644
 +
 +[Install]
 +WantedBy=sysinit.target
-diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index e940c7c9ad..6be7f5cc9b 100644
---- a/units/systemd-binfmt.service.in
-+++ b/units/systemd-binfmt.service.in
-@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
+Index: systemd-stable/units/systemd-binfmt.service.in
+===================================================================
+--- systemd-stable.orig/units/systemd-binfmt.service.in
++++ systemd-stable/units/systemd-binfmt.service.in
+@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc
  Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
  DefaultDependencies=no
  Conflicts=shutdown.target
 +Wants=proc-sys-fs-binfmt_misc.automount
  After=proc-sys-fs-binfmt_misc.automount
+ After=proc-sys-fs-binfmt_misc.mount
  Before=sysinit.target shutdown.target
- ConditionPathIsReadWrite=/proc/sys/
-@@ -28,3 +29,6 @@ Type=oneshot
+@@ -29,3 +30,6 @@ Type=oneshot
  RemainAfterExit=yes
  ExecStart=@rootlibexecdir@/systemd-binfmt
  TimeoutSec=90s
meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch deleted +0 -152

152 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch deleted +0 -42

42 lines not on this page · raw message

meta/recipes-core/systemd/systemd_243.4.bb renamed from meta/recipes-core/systemd/systemd_243.2.bb +0 -2
similarity index 99%
rename from meta/recipes-core/systemd/systemd_243.2.bb
rename to meta/recipes-core/systemd/systemd_243.4.bb
index e31fac8c5617..5020165d0c9f 100644
@@ -22,8 +22,6 @@ SRC_URI += "file://touchscreen.rules \
            file://0003-implment-systemd-sysv-install-for-OE.patch \
            file://0004-rules-whitelist-hd-devices.patch \
            file://0005-rules-watch-metadata-changes-in-ide-devices.patch \
-           file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \
-           file://0001-seccomp-more-comprehensive-protection-against-libsec.patch \
            file://99-default.preset \
            "
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 5 lines · Alex Kiernan

Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g.

systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting.

Quoted 7 lines

Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly").

Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0").

Unfortunately something in this causes:

https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412
https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545

I've been blaming Trevor's patches until now but its this one (sorry Trevor!).

Cheers,

Richard

#2 lore raw
Quoted 12 lines · Richard Purdie
Quoted 10 lines · Alex Kiernan

Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g.

systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting.

Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly").

Quoted 9 lines
Quoted 2 lines

Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0").

Unfortunately something in this causes:

https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412
https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545

That's disappointing...

Quoted 3 lines

I've been blaming Trevor's patches until now but its this one (sorry Trevor!).

I'll start bisecting it out, though this looks like a likely candidate:

commit 53d8feeb2334c396dcfa7106c78ce1791fb5d0c4

Author: Michal Suchanek <[email protected]>
Date:   Mon Nov 4 21:23:15 2019 +0100

libblkid: open device in nonblock mode.

When autoclose is set (kernel default but many distributions reverse the setting) opening a CD-rom device causes the tray to close.

The function of blkid is to report the current state of the device and not to change it. Hence it should use O_NONBLOCK when opening the device to avoid closing a CD-rom tray.

blkid is used liberally in scripts so it can potentially interfere with the user operating the CD-rom hardware.

Signature · 1 line
Alex Kiernan
#3 lore raw

Hi Richard

Quoted 18 lines · Alex Kiernan
Quoted 15 lines · Richard Purdie
Quoted 12 lines · Alex Kiernan

Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g.

systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting.

Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly").

Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0").

Quoted 9 lines
Quoted 6 lines

Unfortunately something in this causes:

https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412
https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545

That's disappointing...

I'm failing to reproduce this - am I right in thinking the error I should be looking for is this one:

[ 3.997360] ide-cd: hdc: tray open
[ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700

or some variation on it?

I've got testimage running across a number of the images I think are the ones that are being run and I can't get any of them to fail.

I did notice that a couple of the failures were on CentOS, I'm running on an Ubuntu box - I'm assuming that shouldn't make any difference?

--
Alex Kiernan

#4 lore raw
Quoted 35 lines · Alex Kiernan

Hi Richard

Quoted 18 lines · Alex Kiernan
Quoted 15 lines · Richard Purdie
Quoted 12 lines · Alex Kiernan

Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g.

systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting.

Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly").

Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0").

Quoted 9 lines
Quoted 6 lines

Unfortunately something in this causes:

https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412
https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545

That's disappointing...

I'm failing to reproduce this - am I right in thinking the error I should be looking for is this one:

Quoted 8 lines
[ 3.997360] ide-cd: hdc: tray open
[ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700

or some variation on it?

I've got testimage running across a number of the images I think are the ones that are being run and I can't get any of them to fail.

Scratch that... it looks like one of the local changes is necessary to cause this - I'd foolishly reused an external source tree rather than just letting devtool deal with it.

Signature · 1 line
Alex Kiernan
#5 lore raw

Since move to 243 latest needs further work, how about moving straight to 244?

Alex

Quoted 58 lines · Alex Kiernan
Quoted 37 lines · Alex Kiernan

Hi Richard

Quoted 19 lines · Alex Kiernan
Quoted 15 lines · Richard Purdie
Quoted 14 lines · Alex Kiernan

Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g.

systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting.

Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly").

Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0").

Quoted 9 lines
Quoted 6 lines

Unfortunately something in this causes:

https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412
https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545

That's disappointing...

I'm failing to reproduce this - am I right in thinking the error I should be looking for is this one:

Quoted 8 lines
[ 3.997360] ide-cd: hdc: tray open
[ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700

or some variation on it?

I've got testimage running across a number of the images I think are the ones that are being run and I can't get any of them to fail.

Scratch that... it looks like one of the local changes is necessary to cause this - I'd foolishly reused an external source tree rather than just letting devtool deal with it.

Signature · 6 lines
Alex Kiernan
-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
#6 lore raw
Quoted 5 lines · Alexander Kanavin

Since move to 243 latest needs further work, how about moving straight to 244?

Alex

Having realised it was local to OE-Core, it was easy to find the problem.

The upstream change that I guessed at before is what's caused the behaviour change:

commit 53d8feeb2334c396dcfa7106c78ce1791fb5d0c4

Author: Michal Suchanek <[email protected]>
Date:   Mon Nov 4 21:23:15 2019 +0100

libblkid: open device in nonblock mode.

When autoclose is set (kernel default but many distributions reverse the setting) opening a CD-rom device causes the tray to close.

The function of blkid is to report the current state of the device and not to change it. Hence it should use O_NONBLOCK when opening the device to avoid closing a CD-rom tray.

blkid is used liberally in scripts so it can potentially interfere with the user operating the CD-rom hardware.

Which causes a blizzard of "ide-cd: hdc: tray open" when you have our local changes:

commit 90dcf2574daca8e7bf35074c46a2729a82acfe8b (HEAD -> devtool, tag:
devtool-patched, devtool-no-overrides)

Author: Chen Qi <[email protected]>
Date:   Thu Feb 21 16:38:38 2019 +0800

rules: watch metadata changes in ide devices

Formatting IDE storage does not trigger "change" uevents. As a result clients using udev API don't get any updates afterwards and get outdated information about the device.
...
root@qemux86-64:~# mkfs.ext4 -F /dev/hda1
Creating filesystem with 262144 4k blocks and 65536 inodes Filesystem UUID: 98791eb2-2bf3-47ad-b4d8-4cf7e914eee2

root@qemux86-64:~# ls /dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2
ls: cannot access
'/dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2': No such file or directory
...
Include hd* in a match for watch option assignment.

Upstream-Status: Denied

qemu by default emulates IDE and the linux-yocto kernel(s) use CONFIG_IDE instead of the more modern libsata, so disks appear as /dev/hd*. A similar patch rejected by upstream because CONFIG_IDE is deprecated.

[rebased for systemd 241]
[rebased for systemd 243]

%% original patch: 0005-rules-watch-metadata-changes-in-ide-devices.patch

commit 2c49075af99308c25fbfd17ce4f28243cba3e4ec

Author: Chen Qi <[email protected]>
Date:   Thu Feb 21 16:28:21 2019 +0800

rules: whitelist hd* devices

qemu by default emulates IDE and the linux-yocto kernel(s) use CONFIG_IDE instead of the more modern libsata, so disks appear as /dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated.

Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276]

[rebased for systemd 241]
[rebased for systemd 243]

%% original patch: 0004-rules-whitelist-hd-devices.patch

Short of dropping the the local changes, which (from reading the commit messages) seem to be mostly there to fix up issues with qemu, I'm not sure what else to do. I can't see upstream wanting to change the commit they merged as they already rejected these ones.

Reading backwards we seem to have been carrying these two local changes since:

commit 5702a19f1c91f9d091a15ad30e73f946c5f9fd31

Author: Patrick Ohly <[email protected]>
Date:   Mon Sep 21 16:30:10 2015 +0200

systemd: apply persistent storage udev rules also for /dev/hd*

This fixes booting with initramfs and root=UUID on machines with IDE disks, like "runqemu hdddirect", and kernels which still use the deprecated CONFIG_IDE.

v2: Rebased against current master-next.

(From OE-Core rev: 3d27dfb7e78b8e17b76fcc1d8f8e2b29ca26b0df)

Quoted 58 lines
Quoted 58 lines · Alex Kiernan
Quoted 37 lines · Alex Kiernan

Hi Richard

Quoted 19 lines · Alex Kiernan
Quoted 15 lines · Richard Purdie
Quoted 14 lines · Alex Kiernan

Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g.

systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting.

Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly").

Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0").

Quoted 9 lines
Quoted 6 lines

Unfortunately something in this causes:

https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412
https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545

That's disappointing...

I'm failing to reproduce this - am I right in thinking the error I should be looking for is this one:

Quoted 8 lines
[ 3.997360] ide-cd: hdc: tray open
[ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700

or some variation on it?

I've got testimage running across a number of the images I think are the ones that are being run and I can't get any of them to fail.

Scratch that... it looks like one of the local changes is necessary to cause this - I'd foolishly reused an external source tree rather than just letting devtool deal with it.

--
Alex Kiernan
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line
Alex Kiernan