Release 'cp -a' occurencies with 'cp -a --no-preserve=ownership' to prevent file owners from being passed from build platform to target
This commit is contained in:
parent
191cf6394d
commit
24e04b642a
@ -154,14 +154,14 @@ rm -rf $MOUNTDIR/tmp/kde-root
|
|||||||
|
|
||||||
# copy static files for target
|
# copy static files for target
|
||||||
[ -e $TARGETDIR/root ] &&
|
[ -e $TARGETDIR/root ] &&
|
||||||
cp -a $TARGETDIR/root/* $MOUNTDIR/
|
cp -a --no-preserve=ownership $TARGETDIR/root/* $MOUNTDIR/
|
||||||
|
|
||||||
# copy static files for specific platform
|
# copy static files for specific platform
|
||||||
[ -e $TARGETDIR/platforms/$PLATFORM/root -a "`ls $TARGETDIR/platforms/$PLATFORM/root/* 2>/dev/null`" ] &&
|
[ -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
|
# copy localized static files for specific platform
|
||||||
[ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
|
[ "$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
|
produce_media
|
||||||
|
@ -76,18 +76,18 @@ _EOF
|
|||||||
mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest
|
mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest
|
||||||
|
|
||||||
# copy /boot directory to final root
|
# 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
|
# copy syslinux addons to final root /boot dir
|
||||||
cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/
|
cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/
|
||||||
|
|
||||||
# copy static files for specific platform
|
# copy static files for specific platform
|
||||||
[ -e $TARGETDIR/platforms/$PLATFORM/root ] &&
|
[ -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
|
# copy localized static files for specific platform
|
||||||
[ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
|
[ "$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
|
## add buildinfo
|
||||||
#buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
|
#buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
|
||||||
|
@ -112,11 +112,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/
|
|||||||
|
|
||||||
# copy static files for specific platform
|
# copy static files for specific platform
|
||||||
[ -e $TARGETDIR/platforms/$PLATFORM/root ] &&
|
[ -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
|
# copy localized static files for specific platform
|
||||||
[ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
|
[ "$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
|
# add buildinfo
|
||||||
buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
|
buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
|
||||||
|
@ -112,11 +112,11 @@ cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/
|
|||||||
|
|
||||||
# copy static files for specific platform
|
# copy static files for specific platform
|
||||||
[ -e $TARGETDIR/platforms/$PLATFORM/root ] &&
|
[ -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
|
# copy localized static files for specific platform
|
||||||
[ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
|
[ "$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
|
# add buildinfo
|
||||||
buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
|
buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
|
||||||
|
Loading…
Reference in New Issue
Block a user