summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-09-27 15:36:53 +0000
committer Eric Hameleers <alien@slackware.com>2014-09-27 15:36:53 +0000
commitff27359678b0c6c1aa04f277a8f45dc3cfd17414 (patch)
treef5f855905fc482233769d9ac0254fdcd8e36c05e
parent6da879a7b343a4f1d5ab814321a475ac59cc45e5 (diff)
downloadmultilib-ff27359678b0c6c1aa04f277a8f45dc3cfd17414.tar.gz
multilib-ff27359678b0c6c1aa04f277a8f45dc3cfd17414.tar.xz
Ensure that root owns the files in install/
-rwxr-xr-x14.1/glibc/glibc-multilib.SlackBuild14
1 files changed, 7 insertions, 7 deletions
diff --git a/14.1/glibc/glibc-multilib.SlackBuild b/14.1/glibc/glibc-multilib.SlackBuild
index e819e36..7e9d043 100755
--- a/14.1/glibc/glibc-multilib.SlackBuild
+++ b/14.1/glibc/glibc-multilib.SlackBuild
@@ -493,7 +493,7 @@ if [ "x$LIBDIRSUFFIX" = "x64" ]; then
( cd usr/lib ; strip -g *.a )
fi
mkdir install
-cp -a $CWD/slack-desc.glibc-profile install/slack-desc
+cat $CWD/slack-desc.glibc-profile > install/slack-desc
/sbin/makepkg -l y -c n $TMP/glibc-profile-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz
# THIS IS NO LONGER PACKAGED (or is it? might be better to let it be made, and then ship it or not...)
@@ -508,7 +508,7 @@ if [ "x$LIBDIRSUFFIX" = "x64" ]; then
mv $PKG/usr/lib/debug usr/lib
fi
mkdir install
-cp -a $CWD/slack-desc.glibc-debug install/slack-desc
+cat $CWD/slack-desc.glibc-debug > install/slack-desc
/sbin/makepkg -l y -c n $TMP/glibc-debug-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz
## INSTEAD, NUKE THESE LIBS
#rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug
@@ -528,7 +528,7 @@ mkdir -p usr/share
cp -a $PKG/usr/share/i18n usr/share
cp -a $PKG/usr/share/locale usr/share
mkdir install
-cp -a $CWD/slack-desc.glibc-i18n install/slack-desc
+cat $CWD/slack-desc.glibc-i18n > install/slack-desc
/sbin/makepkg -l y -c n $TMP/glibc-i18n-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz
# glibc-solibs:
@@ -574,8 +574,8 @@ mv sbin/ldconfig .
rm sbin/*
mv ldconfig sbin
mkdir install
-cp -a $CWD/slack-desc.glibc-solibs install/slack-desc
-cp -a $CWD/doinst.sh-glibc-solibs install/doinst.sh
+cat $CWD/slack-desc.glibc-solibs > install/slack-desc
+cat $CWD/doinst.sh-glibc-solibs > install/doinst.sh
fix_doinst
# Ditch links:
find . -type l -exec rm {} \;
@@ -593,8 +593,8 @@ chmod 755 etc/profile.d/*
# Ditch links (these are in doinst.sh-glibc):
find . -type l -exec rm {} \;
mkdir install
-cp -a $CWD/slack-desc.glibc install/slack-desc
-cp -a $CWD/doinst.sh-glibc install/doinst.sh
+cat $CWD/slack-desc.glibc > install/slack-desc
+cat $CWD/doinst.sh-glibc > install/doinst.sh
fix_doinst
( cd lib${LIBDIRSUFFIX}
mkdir incoming