From a3b32ed68869e0960320513522c436fed01b3d61 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 2 Nov 2007 13:21:43 +0000 Subject: [PATCH] Stefan Fiedler: Build-Pkg, Build-Target: set ownership of $root ($build_root); otherwise if $base/build has a different ownership, files installed below $root would have wrong ownerships too. [2007092512192591580] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8715 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Build-Pkg | 3 ++- scripts/Build-Target | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index e8acc93b5..8b6ae8c6c 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -187,7 +187,8 @@ desktopfiles="$( echo ${base}/package/*/${pkg} )/*.desktop" export ROCK_PKG=$pkg export ROCK_XPKG=$xpkg -mkdir -p "$builddir"; chmod 700 "$builddir" +# Set permissions and ownership of $buildir; $base/build might have different ones. +mkdir -p "$builddir"; chmod 700 "$builddir" ; chown 0:0 "$builddir" if [ "$chroot" = 1 ] ; then diff --git a/scripts/Build-Target b/scripts/Build-Target index 65ae443f2..2d4ea9f2d 100755 --- a/scripts/Build-Target +++ b/scripts/Build-Target @@ -91,9 +91,12 @@ fi export ROCK_BUILD_TARGET=1 build_root="$base/build/$ROCKCFG_ID" +# Set permissions and ownership of $build_root; $base/build might have different ones. +mkdir -p "${build_root}" ; chmod 700 "${build_root}" ; chown 0:0 "${build_root}" + build_rock="$base/build/$ROCKCFG_ID/ROCK" build_logs="$build_rock/logs" ; mkdir -p "${build_logs}" -build_pkgs="$build_rock/pkgs" ; mkdir -p "${build_root}" +build_pkgs="$build_rock/pkgs" ; mkdir -p "${build_pkgs}" if [ "$ROCKCFG_PARANOIA_CHECK" = 1 ] ; then ./scripts/Check-System -paranoia || exit 1