1
0
mirror of https://github.com/systemd/systemd.git synced 2025-02-02 13:47:27 +03:00

15 Commits

Author SHA1 Message Date
Daan De Meyer
a1cdcbc9b9 mkosi: Drop _fixperms workaround
This was added to deal with a bug in the rpm 4.20 rc in Rawhide
but since that's been fixed, let's drop the workaround.

(cherry picked from commit 517e8922101557fccf4a7f8fc922e5102e787ec7)
2024-09-10 14:56:05 +02:00
Daan De Meyer
91a2152628 mkosi: Fix debian/not-installed build logic
- Expand globs
- Filter out directories
- Append to the list of packaged files, not the list of installed files

Fixes the issue in https://github.com/systemd/systemd/pull/32363

(cherry picked from commit 0409213cbc1f939b6f2f72deabc4c92a7fe30523)
2024-08-15 14:04:41 +01:00
Daan De Meyer
4ba2973515 mkosi: Prevent busybox from getting pulled into opensuse images
OpenSUSE's busybox has a bunch of Provides for basic tools that cause
it to get pulled into images unless the corresponding tool is explicitly
installed so let's add explicit tools to make sure we don't get busybox.

(cherry picked from commit 857e4528f5fe556bbe98e32ffcde8932d0d80f83)
2024-08-15 14:04:41 +01:00
Luca Boccassi
16de138427 mkosi: update debian commit reference
* c004a150e7 Configure default DNS servers for upstream CI builds
* a27b1516c9 autopkgtest: set Release= in mkosi.local.conf to distinguish testing vs unstable
* dddce818b2 autopkgtest: add allow-stderr to timedated test
* 2a7b111506 Install valrinkctl zsh completion file
* 862497a139 d/t/control: add Depends: lib{systemd,udev}-dev for upstream
* cb78791b85 d/t/upstream: ensure correct ubuntu codename is used
* fe7445b94d d/t/boot-and-services: fix a couple python sytax warnings
* 2a875917cc d/t/boot-and-services: skip test_tmp_cleanup if tmp.mount is overridden
* 6fe81acbc9 Install zsh completion for run0
2024-07-24 14:26:49 +02:00
Daan De Meyer
e05f93b5c4 mkosi: update arch commit reference
* 1d577a6268 refresh the keys
* 12383ba712 make libarchive a regular optional dependency...
* f51d5e04bf ignore rc releases in nvchecker
* 0b096a2baa add nvchecker
* 5f0ced863c upgpkg: 256.2-1: new upstream release

(cherry picked from commit 4ecd6c3552aff72a40924560d7dfe2557b6e7c8e)
2024-07-22 14:27:30 +02:00
Daan De Meyer
c9d39eea98 mkosi: update fedora commit reference
* 00babccdea Simplify BFQ scheduler enablement
* ef8ddb130b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* 5b4a5461d6 Fix changelog
* a8c5c736f6 Only apply shorter shutdown timer changes on Fedora
*   f4e284cd7a Merge #150 `Deal with systemd-timesyncd backport in EPEL`
|\
| * 9378a0733a Deal with systemd-timesyncd backport in EPEL
* | 12d1f05029 Don't claim /sbin/installkernel if building for CentOS Stream 9
|/
* 79828f2753 spec: use "positive" conditions in conditionals
* c5d3af1638 Add build dependency on rsync on CentOS Stream 9
* 8d080fb5cb Backport udma buffer access patch
* 6084453807 Add support for building from a specific branch
* cb9d631ca0 Update PR patch metadata
* 3889da947e In standalone subpackages, suggest coreutils-single
* b7800e3e66 Drop versions from Conflicts for standalone packages

(cherry picked from commit 1d8f16df903a5567e2359bac3b8ca0caf937d333)
2024-07-22 14:27:30 +02:00
Daan De Meyer
dbeed95d76 mkosi: Use the Fedora Rawhide spec for CentOS
These are now practically identical, with the only differences between
the two having no effect on the rpm builds we do with mkosi, so let's
cut out the middle man and just use the Fedora Rawhide spec for CentOS
as well.

(cherry picked from commit ebbae3d6328725767e23afef8692596e03f9d3d1)
2024-07-22 14:27:30 +02:00
Daan De Meyer
6108f13fc0 mkosi: Switch back to PKG_SUBDIR instead of symlinks
Previously I thought it would make sense to allow running the build
scripts from within the VM/container to rebuild the packages. Instead
we ended up making it possible to rerun mkosi outside of the container/VM
to rebuild the packages, so let's switch back to $PKG_SUBDIR to tell the
build scripts where to look for the packaging sources.

(cherry picked from commit 762b23e86a8bd45879335af96006573a99884a71)
2024-07-22 14:27:30 +02:00
Daan De Meyer
baad1c0d0e mkosi: Skip sync script if NO_BUILD is enabled
If we're not doing a build, there's no point in syncing either so
lets skip it.

(cherry picked from commit bb8f6ac445b80f9621503bec7a22caa57bb10ee4)
2024-07-18 21:12:48 +02:00
Daan De Meyer
0b9df91ce2 mkosi: Disable unique debug source names
We use -fdebug-prefix-map= because debugedit doesn't work for us (for
a currently unknown reason since it's the most obtuse code I've ever
had the pleasure of reading). With all the unique macros enabled, the
destination directory we pass to -fdebug-prefix-map= includes the package
release. The release is either the timestamp of the current commit or
the current time if the working tree is dirty. This means it generally
changes every time we rerun the build script. However, meson only reads
compiler arguments the first time it is invoked or if --wipe is specified.
This means that on a rerun -fdebug-prefix-map= will be configured wrong
and the build will fail.

Let's prevent this from happening by disabling the unique debug source
names by overriding the --unique-debug-src-base option that is passed to
find-debuginfo.sh by rpm via the _find_debuginfo_opts macro.

(cherry picked from commit 88221219a3290ee20de27aa030c2b23f03d8238a)
2024-07-16 15:15:14 +02:00
Daan De Meyer
367ad876a6 mkosi: Use clang --print-runtime-dir
(cherry picked from commit 6e212a6db9fb04ebb5dd4f365e7cb3a9a9b59e2b)
2024-07-16 15:14:41 +02:00
Daan De Meyer
8b859fa29d mkosi: Extend arch build script comment about symlinks
(cherry picked from commit 54ab97e59dfa048dd563e2918b594db267efd698)
2024-07-16 15:14:35 +02:00
Daan De Meyer
3fc259ae25 mkosi: Add CI for CentOS Stream 10
We switch to the c10s-sig-hyperscale branch of the spec repository
as it will receive all the latest changes the earliest before they
end up in the c9s-sig-hyperscale branch.

(cherry picked from commit 8b32cc79ec028fa783072676346141821444b638)
2024-07-16 15:14:21 +02:00
Daan De Meyer
480f8fa839 mkosi: Make epel repositories optional for CentOS Stream 9
This allows us to add CI for CentOS Stream 10 as EPEL 10 doesn't
exist yet and won't exist for quite some time.

CentOS Stream 10 will be enabled later as soon as
https://issues.redhat.com/browse/RHEL-46604 is resolved.

(cherry picked from commit 0e4a7ab6d5601785e326851b3f1b6a3367ec98ec)
2024-07-16 15:14:05 +02:00
Daan De Meyer
76e14148f6 mkosi: Introduce build image
We want the exitrd image to be built with the latest systemd as well.
As the exitrd image is built as part of mkosi.images, and all subimages
are built before the main image, this implies the packages must be built
as a subimage in mkosi.images/ as well. So we introduce the build image and
move all logic related to building distribution packages there.

This also has the nice side effect of slimming down the main image as the
build dependencies are not installed into the main image anymore. It also
makes sure the packages are built in a "clean" chroot without any of the
other packages which we install in the main image available.

(cherry picked from commit 7205fc7dc31eb2be3075ee6ba23ebe84324aa5cb)
2024-07-16 15:13:42 +02:00