X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mkosi.build;h=16ac2e9d0d6952949b1be240962d94167666df77;hb=09d0b46ab61bebafe5bdc1be95ee153dfb13d6bc;hp=872841eb63e39e0b2386c46c9c22558646666713;hpb=ce5cbd8679605f3c9220d09c3a184e77bde15e2e;p=thirdparty%2Fsystemd.git

diff --git a/mkosi.build b/mkosi.build
index 872841eb63e..16ac2e9d0d6 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -1,35 +1,101 @@
-#!/bin/sh -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 <http://www.gnu.org/licenses/>.
+#!/bin/sh
+set -ex
 
 # 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.
 
-./autogen.sh c
-make -j `nproc`
+# Reset the permissions of the tree. Since Meson keeps the permissions
+# all the way to the installed files, reset them to one of 0644 or 0755
+# so the files keep those permissions, otherwise details of what umask
+# was set at the time the git tree was cloned will leak all the way
+# through. Also set umask explicitly during the build.
+chmod -R u+w,go-w,a+rX .
+umask 022
+
+# If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
+# as out-of-tree build dir. Otherwise, let's make up our own builddir.
+[ -z "$BUILDDIR" ] && BUILDDIR=build
+
+# Meson uses Python 3 and requires a locale with an UTF-8 character map.
+# Not running under UTF-8 makes the `ninja test` step break with a CodecError.
+# So let's ensure we're running under UTF-8.
+#
+# If our current locale already is UTF-8, then we don't need to do anything:
+if [ "$(locale charmap)" != "UTF-8" ] ; then
+        # Try using C.UTF-8 locale, if available. This locale is not shipped
+        # by upstream glibc, so it's not available in all distros.
+        # (In particular, it's not available in Arch Linux.)
+        export LC_CTYPE=C.UTF-8
+        if [ "$(locale charmap)" != "UTF-8" ] ; then
+                # Finally, try something like en_US.UTF-8, which should be
+                # available in Arch Linux, but is not present in Debian's
+                # minimal image in our mkosi config.
+                export LC_CTYPE=en_US.UTF-8
+                if [ "$(locale charmap)" != "UTF-8" ] ; then
+                        # If nothing works, fail early.
+                        echo "*** Could not find a valid locale that supports UTF-8. ***" >&2
+                        exit 1
+                fi
+        fi
+fi
+
+if [ ! -f "$BUILDDIR"/build.ninja ] ; then
+        sysvinit_path=`realpath /etc/init.d`
+
+        nobody_user=`id -u -n 65534 2> /dev/null`
+        if [ "$nobody_user" != "" ] ; then
+                # Validate that we can translate forth and back
+                if [ "`id -u $nobody_user`" != 65534 ] ; then
+                        nobody_user=""
+                fi
+        fi
+        if [ "$nobody_user" = "" ] ; then
+                if id -u nobody 2> /dev/null ; then
+                        # The "nobody" user is defined already for something else, pick the Fedora name
+                        nobody_user=nfsnobody
+                else
+                        # The "nobody" user name is free, use it
+                        nobody_user=nobody
+                fi
+        fi
+
+        nobody_group=`id -g -n 65534 2> /dev/null`
+        if [ "$nobody_group" != "" ] ; then
+                # Validate that we can translate forth and back
+                if [ "`id -g $nobody_group`" != 65534 ] ; then
+                        nobody_group=""
+                fi
+        fi
+        if [ "$nobody_group" = "" ] ; then
+                if id -u nobody 2> /dev/null ; then
+                        # The "nobody" group is defined already for something else, pick the Fedora name
+                        nobody_group=nfsnobody
+                else
+                        # The "nobody" group name is free, use it
+                        nobody_group=nobody
+                fi
+        fi
 
-make check
-make install
+        meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D default-hierarchy=unified -D man=false -D "nobody-user=$nobody_user" -D "nobody-group=$nobody_group"
+fi
 
-mkdir -p $DESTDIR/etc
+ninja -C "$BUILDDIR" all
+[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test
+ninja -C "$BUILDDIR" install
 
-cat > $DESTDIR/etc/issue <<EOF
+mkdir -p "$DESTDIR"/etc
+
+cat > "$DESTDIR"/etc/issue <<EOF
 \S (built from systemd tree)
 Kernel \r on an \m (\l)
 
 EOF
+
+# Manually update the boot loader from the one we just built
+mkdir -p "$DESTDIR"/boot/efi/EFI/systemd "$DESTDIR"/boot/efi/EFI/BOOT
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/boot/efi/EFI/systemd/systemd-bootx64.efi
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/boot/efi/EFI/BOOT/bootx64.efi
+
+mkdir -p "$DESTDIR"/efi/EFI/systemd "$DESTDIR"/efi/EFI/BOOT
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/efi/EFI/systemd/systemd-bootx64.efi
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/efi/EFI/BOOT/bootx64.efi