mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
mkosi: Update to latest
We modify all our scripts to execute in the image instead of on the hosts. In the future we can adapt them to run on the host.
This commit is contained in:
parent
1f1efbbf55
commit
0f4259bcf2
2
.github/workflows/mkosi.yml
vendored
2
.github/workflows/mkosi.yml
vendored
|
@ -76,7 +76,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
|
||||
- uses: systemd/mkosi@c6dd95b6eae0386579071cbf44fd838ce28b7237
|
||||
- uses: systemd/mkosi@1c09cb53e5f3fdb35919d525e8c3e6132344ae98
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
|
|
|
@ -5,6 +5,10 @@ set -e
|
|||
# This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
|
||||
# Simply invoke "mkosi" in the project directory to build an OS image.
|
||||
|
||||
if [ "${container:-}" != "mkosi" ]; then
|
||||
exec mkosi-chroot "$SCRIPT" "$@"
|
||||
fi
|
||||
|
||||
# If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
|
||||
# as out-of-tree build dir. Otherwise, let's make up our own builddir.
|
||||
[ -z "$BUILDDIR" ] && BUILDDIR="$PWD"/build
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
set -e
|
||||
|
||||
if [ "${container:-}" != "mkosi" ]; then
|
||||
exec mkosi-chroot "$SCRIPT" "$@"
|
||||
fi
|
||||
|
||||
# OpenSUSE insists on blacklisting erofs by default because its supposedly a legacy filesystem.
|
||||
# See https://github.com/openSUSE/suse-module-tools/pull/71
|
||||
rm -f /usr/lib/modprobe.d/60-blacklist_fs-erofs.conf
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
set -e
|
||||
|
||||
if [ "${container:-}" != "mkosi" ]; then
|
||||
exec mkosi-chroot "$SCRIPT" "$@"
|
||||
fi
|
||||
|
||||
if [ -d "$SRCDIR"/mkosi.kernel/ ]; then
|
||||
SRCDIR="$SRCDIR/mkosi.kernel"
|
||||
BUILDDIR="$BUILDDIR/mkosi.kernel"
|
||||
|
|
|
@ -6,6 +6,10 @@ if [ "$1" = "build" ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
if [ "${container:-}" != "mkosi" ]; then
|
||||
exec mkosi-chroot "$SCRIPT" "$@"
|
||||
fi
|
||||
|
||||
if [ -n "$SANITIZERS" ]; then
|
||||
LD_PRELOAD=$(ldd /usr/lib/systemd/systemd | grep libasan.so | awk '{print $3}')
|
||||
|
||||
|
|
Loading…
Reference in a new issue