Ritesh Raj Sarraf authored 1 year ago and Walter Lozano committed 1 year ago

Merge remote-tracking branch 'origin/apertis/v2024dev2' into proposed-updates/debian/bookworm/9af2cfc5

* origin/apertis/v2024dev2: (57 commits)
  Release systemd version 247.3-7+apertis2
  Enable tests on MR
  Refresh the automatically detected licensing information
  Release systemd version 247.3-7+apertis1
  Move debian/patches/meson*.patch to debian/patches/apertis/
  Release systemd version 247.3-6+apertis4
  meson: do not fail if rsync is not installed with meson 0.57.2
  meson.build: change operator combining bools from + to and
  Fix issue with journald and /var at shutdown
  Remove '-execdir +' usage for compatibility with rust-findutils
  Fix compilation on kernel 5.14+
  Refresh the automatically detected licensing information
  Release systemd version 247.3-6+apertis1
  Release systemd version 247.3-1apertis5
  Fix access to run/systemd/notify for systemd-logind in apparmor rule
  Release systemd version 247.3-1apertis4
  Fix the path to bootable binaries in efi entry
  Refresh patch for UEFI entries generator
  85-initrd: fix the args number
  Fix kernel-install call from update-initramfs
  ...

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

In order to test newer version before they land in the main branches
enable running tests on MR.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

These patches are specific to Apertis because a new version of meson
has been backported to Apertis.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>

Fixes: https://github.com/mesonbuild/meson/issues/8641

Backport fix from,
https://github.com/systemd/systemd/commit/7c5fd25119a495009ea62f79e5daec34cc464628



Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>

upstream meson stopped allowing combining boolean with the plus
operator, and now requires using the logical and operator

reference:
https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c

Fixes: https://github.com/systemd/systemd/issues/20632

Backport fix from,
https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f



Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>

https://phabricator.apertis.org/T7904



Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

https://phabricator.apertis.org/T8219



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

https://phabricator.apertis.org/T8162



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>

Merge remote-tracking branch 'origin/apertis/v2022dev3' into proposed-updates/debian/bullseye/8d2817af

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>

Systemd-logind fails to start in SDK, preventing other subsystem like
PipeWire or WirePlumber to start, with error:
- kernel: audit: type=1400 audit(1623416689.776:50): apparmor="DENIED"
  operation="sendmsg" info="Failed name lookup - disconnected path"
  error=-13 profile="/lib/systemd/systemd-logind" name="run/systemd/notify"
  pid=393 comm="systemd-logind" requested_mask="w" denied_mask="w" fsuid=0
  ouid=0

From https://lists.ubuntu.com/archives/apparmor/2018-July/011718.html about
`attach_disconnected` flag, this error occurs for:
> a fd that was opened outside of the namespace and "passed in".
> The "passed in" could be via some fd passing scheme, process inheritance
> - file open at exec, process inheritance - file open at clone newns,
> unshare, setns, or file open at pivot_root/chroot with the fd outside of
> the new root.

AppArmor's default behavior is to reject new accesses to disconnected paths
reporting back the pathname without a leading `/`. Unfortunately this can
break some applications, if a profile must allow for mediation of
disconnected paths then the profile flag `attach_disconnected` can be used.
This prepend a leading `/` to the reported name, however this may not
result in the original name of the file as AppArmor can only attach the
file to root, not to its original location.

See https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_2.5#path-name-lookup-and-mediation-of



Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

`stat` doesn't work well due `coreutils-gplv2`
created by Debos returning "?" instead of mount point.
Fall back to the provided directory, since we have separate
partition for "/boot/efi".
This change allow to use correct paths for kernel and initrd
for entry generation.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Update names for entry directories variables and fix options count.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

`kernel-install` pass 5 args to modules anyway, so empty argument
do not allow to install the initrd file into boot entry directory.
Since we do not pass the initrd name via options module
`90-loaderentry.install` also skip the initrd copying and setup.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Fix parameters assignment in `kernel-install` while calling
from `update-initramfs` or any package update except kernel.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Commit [cf73f650890](https://github.com/systemd/systemd/commit/cf73f650890

)
provides script `00-entry-directory.install` which creates the entry
directory only if `$BOOT/$MACHINE_ID` folder exists.
This part was moved out of `kernel-install` script and may introduce
the problem during upgrade since before Apertis v2022dev2 we do kernel
install with `$MACHINE_ID` generated in a build time. Later we remove
`/etc/machine-id` file allowing to generate an unique machine ID during
first boot, so there will be no directory `$BOOT/$MACHINE_ID` with a new
ID preventing from new entry generation during kernel upgrade in runtime.
Hence remove the part checking the `$BOOT/$MACHINE_ID` existence and
allow to create the proper entry in any case, returning the previous
`kernel-install` behaviour.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Remove negotiation from `-z` to test for non-emptiness instead of
previously added version reversing those tests logic.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

- Use [ not [[ and -n to test for non-emptiness

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Fixed syntax of kernel-install script introduced during
the merge with newer version from bullseye.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Signed-off-by: Apertis CI <devel@lists.apertis.org>

To follow the Apertis guidelines, which chooses OpenSSL as TLS stack, switch
systemd to be build against it.

In the same line drop systemd-journal-remote and its dependency
libmicrohttpd-dev since it can only be built against GnuTLS but has no value
for Apertis.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Signed-off-by: Sjoerd simons <sjoerd@collabora.com>

- Drop patches from upstream
- Refresh remainder

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Debian's systemd has split-usr enabled as both Debian and in principle Apertis
support both a split and a merged-usr setup. This mostly adds search paths to
system (e.g. to look at both `/bin/` and `/usr/bin`) however it also means that
if `/usr` is a mountpoint system will try to unmount it.  Unfortunately this causes
issues at shutdown for systems with a merged-usr layout as basic libraries (e.g. libc)
are located in `/usr` making it impossible to unmount.

For Apertis we don't support `/usr` being a seperate partition, the only time
`/usr` is on a mountpoint is when using ostree images (where it is a bind mount
and which use a merged-usr layout). So also add `/usr` to the list of paths that
are considered unmountable even with split-usr support enabled in systemd.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>