dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 14:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34267 from DaanDeMeyer/script

Browse Source 
mkosi: Install util-linux-script on Rawhide
This commit is contained in:
Yu Watanabe
2024-09-06 10:43:04 +09:00
committed by GitHub
parent 5a11437e2e 31e7a37480
commit 03ec7311f1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide.conf Normal file
View File

@@ -0,0 +1,7 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Release=rawhide
[Content]
Packages=util-linux-script

6
mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot
View File

@@ -53,12 +53,6 @@ if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
fi
# Hack to work around https://github.com/rpm-software-management/rpm/issues/3216.
# TODO: Remove when rpm 4.20 gets into Rawhide.
mkdir -p "/var/tmp/BUILD/systemd-${VERSION/\~/_}-build"
mkdir -p "/var/tmp/BUILD/systemd-${VERSION/\~/_}-build/SPECPARTS"
ln -s /work/src "/var/tmp/BUILD/systemd-${VERSION/\~/_}-build/systemd-$VERSION"
IFS=
# TODO: Replace meson_build and meson_install overrides with "--undefine __meson_verbose" once
# https://github.com/mesonbuild/meson/pull/12835 is available.