shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

mkosi: Copy built packages to output directory

Browse Source 
This allows the built packages to be inspected if needed, or installed
on the host system for anyone who's daring enough to do so.
This commit is contained in:
Daan De Meyer 2024-03-27 14:05:44 +01:00
parent e11fe427f8
commit 5524d2838c
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkosi.images/system/mkosi.clean Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -e
rm -f "$OUTPUTDIR"/*.{rpm,deb,pkg.tar}

4
mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
View File

@ -50,6 +50,8 @@ env --chdir="pkg/$PKG_SUBDIR" \
_systemd_UPSTREAM=1 \ _systemd_UPSTREAM=1 \
_systemd_QUIET=1 \ _systemd_QUIET=1 \
BUILDDIR="$PWD/pkg/$PKG_SUBDIR" \ BUILDDIR="$PWD/pkg/$PKG_SUBDIR" \
PKGDEST="$PACKAGEDIR" \ PKGDEST="$OUTPUTDIR" \
PKGEXT=".pkg.tar" \ PKGEXT=".pkg.tar" \
MESON_EXTRA_CONFIGURE_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}" MESON_EXTRA_CONFIGURE_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
cp "$OUTPUTDIR"/*.pkg.tar "$PACKAGEDIR"

4
mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
View File

@ -24,7 +24,7 @@ rpmbuild \
$( ((WITH_DOCS)) || echo "--without docs") \ $( ((WITH_DOCS)) || echo "--without docs") \
--define "_topdir /var/tmp" \ --define "_topdir /var/tmp" \
--define "_sourcedir pkg/$PKG_SUBDIR" \ --define "_sourcedir pkg/$PKG_SUBDIR" \
--define "_rpmdir $PACKAGEDIR" \ --define "_rpmdir $OUTPUTDIR" \
${BUILDDIR:+--define} \ ${BUILDDIR:+--define} \
${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \ ${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \
--define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \ --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
@ -46,3 +46,5 @@ rpmbuild \
--define "__script_requires %{nil}" \ --define "__script_requires %{nil}" \
--undefine _lto_cflags \ --undefine _lto_cflags \
"pkg/$PKG_SUBDIR/systemd.spec" "pkg/$PKG_SUBDIR/systemd.spec"
cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"

3
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
View File

@ -86,4 +86,5 @@ if ! build; then
build build
fi fi
mv ../*.deb "$PACKAGEDIR" cp ../*.deb "$PACKAGEDIR"
cp ../*.deb "$OUTPUTDIR"

4
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
View File

@ -29,7 +29,7 @@ build() {
$( ((WITH_TESTS)) || echo --nocheck) \ $( ((WITH_TESTS)) || echo --nocheck) \
--define "_topdir /var/tmp" \ --define "_topdir /var/tmp" \
--define "_sourcedir pkg/$PKG_SUBDIR" \ --define "_sourcedir pkg/$PKG_SUBDIR" \
--define "_rpmdir $PACKAGEDIR" \ --define "_rpmdir $OUTPUTDIR" \
${BUILDDIR:+--define} \ ${BUILDDIR:+--define} \
${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \ ${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \
--define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \ --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
@ -61,3 +61,5 @@ if ! build; then
cat /tmp/unpackaged-files >>"pkg/$PKG_SUBDIR/files.systemd" cat /tmp/unpackaged-files >>"pkg/$PKG_SUBDIR/files.systemd"
build --noprep --nocheck build --noprep --nocheck
fi fi
cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"