summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2021-09-28 11:16:43 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-09-28 23:09:11 +0900
commit64782655e19d40d4c3cdedba4cb15ed5fd2e01d2 (patch)
tree406bf9ef838d84898ea5afc4b37288831ca8ca08
parent8c35c10d20ff7b369bfff3fbbb92a43ca2fd5938 (diff)
downloadsystemd-64782655e19d40d4c3cdedba4cb15ed5fd2e01d2.tar.gz
mkosi: Remove build script umask workaround
A fix for this landed in meson 3 years ago so the workaround in the build script can now be removed (https://github.com/mesonbuild/meson/pull/3225).
-rwxr-xr-xmkosi.build10
1 files changed, 0 insertions, 10 deletions
diff --git a/mkosi.build b/mkosi.build
index e73cf554ca..1ed6815bf9 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -4,16 +4,6 @@ set -e
# 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.
-if ! mountpoint -q "$SRCDIR"; then
- chmod -R u+w,go-w,a+rX .
- umask 022
-fi
-
# On Fedora "ld" is (unfortunately — if you ask me) managed via
# "alternatives". Since we'd like to support building images in environments
# with only /usr/ around (e.g. mkosi's UsrOnly=1 option), we have the problem