X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mkosi.build;h=b7b8c50a2b7425c90875c859063526129a74ce1d;hb=43231f00c2b9508c37d4cbbb2e49e9b99b096792;hp=0e644d54cb34f27ab9a8901289763954b84ec7d4;hpb=c81a2569143455880f0177c918a477c1b1207fe5;p=thirdparty%2Fsystemd.git

diff --git a/mkosi.build b/mkosi.build
index 0e644d54cb3..b7b8c50a2b7 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -1,31 +1,43 @@
 #!/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 <http://www.gnu.org/licenses/>.
-
 # 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.
 
+# 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
 
-export LC_CTYPE=en_US.UTF-8
+# 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`
@@ -68,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