mirror of
https://github.com/systemd/systemd
synced 2024-10-07 08:40:44 +00:00
Merge pull request #25999 from DaanDeMeyer/mkosi
ci: Update mkosi action to latest commit
This commit is contained in:
commit
7ea3f4ff60
18
.github/workflows/mkosi.yml
vendored
18
.github/workflows/mkosi.yml
vendored
|
@ -72,24 +72,14 @@ jobs:
|
|||
release: rawhide
|
||||
- distro: opensuse
|
||||
release: tumbleweed
|
||||
- distro: centos_epel
|
||||
- distro: centos
|
||||
release: 9-stream
|
||||
- distro: centos_epel
|
||||
- distro: centos
|
||||
release: 8-stream
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
|
||||
- uses: systemd/mkosi@c9772ec920f1cd03181ba14e6fe2c3d35ccb4f92
|
||||
|
||||
# FIXME: temporary workaround for a file conflict between systemd (C9S) and
|
||||
# systemd-boot (EPEL9). Drop this once systemd in C9S is updated to v252
|
||||
# (should be done by the end of 2022).
|
||||
- name: Fix C9S/EPEL9
|
||||
if: ${{ matrix.release == '9-stream' }}
|
||||
run: sudo sed -i '/add_packages/s/systemd-boot/systemd/g' /usr/local/lib/python3.10/dist-packages/mkosi/__init__.py
|
||||
|
||||
- name: Install
|
||||
run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2
|
||||
- uses: systemd/mkosi@ab2aff830096e681da1950a7d29f277caa89516c
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
|
@ -106,7 +96,7 @@ jobs:
|
|||
EOF
|
||||
|
||||
- name: Build ${{ matrix.distro }}
|
||||
run: sudo mkosi build
|
||||
run: sudo mkosi --idmap no
|
||||
|
||||
- name: Show ${{ matrix.distro }} image summary
|
||||
run: sudo mkosi summary
|
||||
|
|
|
@ -83,7 +83,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
|
|||
rootprefix=/${rootprefix#/}
|
||||
fi
|
||||
|
||||
meson "$BUILDDIR" \
|
||||
meson setup "$BUILDDIR" \
|
||||
-D "sysvinit-path=$sysvinit_path" \
|
||||
-D "rootprefix=$rootprefix" \
|
||||
-D man=false \
|
||||
|
|
|
@ -4,11 +4,8 @@
|
|||
# Symlink this file to mkosi.default in the project root directory and invoke "mkosi" to build an OS image.
|
||||
|
||||
[Distribution]
|
||||
Distribution=centos_epel
|
||||
|
||||
[Output]
|
||||
Format=gpt_xfs
|
||||
HostonlyInitrd=no
|
||||
Distribution=centos
|
||||
Repositories=epel
|
||||
|
||||
[Content]
|
||||
Packages=
|
|
@ -198,15 +198,6 @@ efi_cflags = [
|
|||
]
|
||||
)
|
||||
|
||||
# Our code size has increased enough to possibly create overlapping PE sections
|
||||
# at sd-stub runtime, which will often enough prevent the image from booting.
|
||||
# This only happens because the usual instructions for assembling a unified
|
||||
# kernel image contain hardcoded addresses for section VMAs added in. Until a
|
||||
# proper solution is in place, we can at least compile with as least -O1 to
|
||||
# reduce the likelihood of this happening.
|
||||
# https://github.com/systemd/systemd/issues/24202
|
||||
efi_cflags += '-O1'
|
||||
|
||||
efi_cflags += cc.get_supported_arguments({
|
||||
'ia32': ['-mno-sse', '-mno-mmx'],
|
||||
'x86_64': ['-mno-red-zone', '-mno-sse', '-mno-mmx'],
|
||||
|
|
Loading…
Reference in a new issue