mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
mkosi: Copy built packages to output directory
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:
4
mkosi.images/system/mkosi.clean
Executable file
4
mkosi.images/system/mkosi.clean
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
rm -f "$OUTPUTDIR"/*.{rpm,deb,pkg.tar}
|
||||
@@ -50,6 +50,8 @@ env --chdir="pkg/$PKG_SUBDIR" \
|
||||
_systemd_UPSTREAM=1 \
|
||||
_systemd_QUIET=1 \
|
||||
BUILDDIR="$PWD/pkg/$PKG_SUBDIR" \
|
||||
PKGDEST="$PACKAGEDIR" \
|
||||
PKGDEST="$OUTPUTDIR" \
|
||||
PKGEXT=".pkg.tar" \
|
||||
MESON_EXTRA_CONFIGURE_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
|
||||
|
||||
cp "$OUTPUTDIR"/*.pkg.tar "$PACKAGEDIR"
|
||||
|
||||
@@ -24,7 +24,7 @@ rpmbuild \
|
||||
$( ((WITH_DOCS)) || echo "--without docs") \
|
||||
--define "_topdir /var/tmp" \
|
||||
--define "_sourcedir pkg/$PKG_SUBDIR" \
|
||||
--define "_rpmdir $PACKAGEDIR" \
|
||||
--define "_rpmdir $OUTPUTDIR" \
|
||||
${BUILDDIR:+--define} \
|
||||
${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \
|
||||
--define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
|
||||
@@ -46,3 +46,5 @@ rpmbuild \
|
||||
--define "__script_requires %{nil}" \
|
||||
--undefine _lto_cflags \
|
||||
"pkg/$PKG_SUBDIR/systemd.spec"
|
||||
|
||||
cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
|
||||
|
||||
@@ -86,4 +86,5 @@ if ! build; then
|
||||
build
|
||||
fi
|
||||
|
||||
mv ../*.deb "$PACKAGEDIR"
|
||||
cp ../*.deb "$PACKAGEDIR"
|
||||
cp ../*.deb "$OUTPUTDIR"
|
||||
|
||||
@@ -29,7 +29,7 @@ build() {
|
||||
$( ((WITH_TESTS)) || echo --nocheck) \
|
||||
--define "_topdir /var/tmp" \
|
||||
--define "_sourcedir pkg/$PKG_SUBDIR" \
|
||||
--define "_rpmdir $PACKAGEDIR" \
|
||||
--define "_rpmdir $OUTPUTDIR" \
|
||||
${BUILDDIR:+--define} \
|
||||
${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \
|
||||
--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"
|
||||
build --noprep --nocheck
|
||||
fi
|
||||
|
||||
cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
|
||||
|
||||
Reference in New Issue
Block a user