X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mkosi.build;h=114e617c8586e57d8a200d7a0f7ab63584af8c71;hb=67bee56fd5574f7d1f03d382867dfd79feb0c908;hp=131eb9fd906093fcec701944884b499364bde12d;hpb=b454cfb05c46312054ad736a841e70211905016b;p=thirdparty%2Fsystemd.git diff --git a/mkosi.build b/mkosi.build index 131eb9fd906..114e617c858 100755 --- a/mkosi.build +++ b/mkosi.build @@ -1,23 +1,6 @@ #!/bin/sh set -ex -# This file is part of systemd. -# -# Copyright 2016 Lennart Poettering -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see . - # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi). # Simply invoke "mkosi" in the project directory to build an OS image. @@ -97,7 +80,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then fi ninja -C "$BUILDDIR" all -[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test || ( RET="$?" ; cat "$BUILDDIR"/meson-logs/testlog.txt ; exit "$RET" ) +[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test ninja -C "$BUILDDIR" install mkdir -p "$DESTDIR"/etc @@ -107,3 +90,8 @@ cat > "$DESTDIR"/etc/issue <