From 24e04b642aa183c1e30d196e9f4524268feb422b Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 19 Mar 2012 11:59:35 +0100
Subject: [PATCH] Release 'cp -a' occurencies with 'cp -a
 --no-preserve=ownership' to prevent file owners from being passed from build
 platform to target

---
 makedist.inc.sh               | 6 +++---
 platforms/bootusb/post.inc.sh | 6 +++---
 platforms/livecd/post.inc.sh  | 4 ++--
 platforms/livedvd/post.inc.sh | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index b2b5469..233b048 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -154,14 +154,14 @@ rm -rf $MOUNTDIR/tmp/kde-root
 
 # copy static files for target
 [ -e $TARGETDIR/root ] && 
-   cp -a $TARGETDIR/root/* $MOUNTDIR/
+   cp -a --no-preserve=ownership $TARGETDIR/root/* $MOUNTDIR/
 
 # copy static files for specific platform
 [ -e $TARGETDIR/platforms/$PLATFORM/root -a "`ls $TARGETDIR/platforms/$PLATFORM/root/* 2>/dev/null`" ] &&
-   cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR/
 
 # copy localized static files for specific platform
 [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
-   cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/
 
 produce_media
diff --git a/platforms/bootusb/post.inc.sh b/platforms/bootusb/post.inc.sh
index 0b1c286..de06574 100644
--- a/platforms/bootusb/post.inc.sh
+++ b/platforms/bootusb/post.inc.sh
@@ -76,18 +76,18 @@ _EOF
 mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest
 
 # copy /boot directory to final root
-cp -a $MOUNTDIR/boot $MOUNTDIR2
+cp -a --no-preserve=ownership $MOUNTDIR/boot $MOUNTDIR2
 
 # copy syslinux addons to final root /boot dir
 cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/
 
 # copy static files for specific platform
 [ -e $TARGETDIR/platforms/$PLATFORM/root ] &&
-   cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/
 
 # copy localized static files for specific platform
 [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
-   cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/
 
 ## add buildinfo
 #buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh
index cb8ba54..a1d749f 100644
--- a/platforms/livecd/post.inc.sh
+++ b/platforms/livecd/post.inc.sh
@@ -112,11 +112,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/
 
 # copy static files for specific platform
 [ -e $TARGETDIR/platforms/$PLATFORM/root ] && 
-   cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/
 
 # copy localized static files for specific platform
 [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
-   cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/
 
 # add buildinfo
 buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh
index cb8ba54..a1d749f 100644
--- a/platforms/livedvd/post.inc.sh
+++ b/platforms/livedvd/post.inc.sh
@@ -112,11 +112,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/
 
 # copy static files for specific platform
 [ -e $TARGETDIR/platforms/$PLATFORM/root ] && 
-   cp -a $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR2/
 
 # copy localized static files for specific platform
 [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
-   cp -a $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/
+   cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR2/
 
 # add buildinfo
 buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"