summaryrefslogtreecommitdiffstats
path: root/current
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-09-27 15:34:23 +0000
committer Eric Hameleers <alien@slackware.com>2014-09-27 15:34:23 +0000
commit6da879a7b343a4f1d5ab814321a475ac59cc45e5 (patch)
tree0ca0b90a743bb4204163a59798f31f57882b5435 /current
parent382c498696fe92bd4e32a397be95123550c19f9c (diff)
downloadmultilib-6da879a7b343a4f1d5ab814321a475ac59cc45e5.tar.gz
multilib-6da879a7b343a4f1d5ab814321a475ac59cc45e5.tar.xz
Ensure that install/ files are owned by root
Diffstat (limited to 'current')
-rwxr-xr-xcurrent/glibc/glibc-multilib.SlackBuild14
1 files changed, 7 insertions, 7 deletions
diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild
index 1b0929b..9957a10 100755
--- a/current/glibc/glibc-multilib.SlackBuild
+++ b/current/glibc/glibc-multilib.SlackBuild
@@ -466,7 +466,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...)
@@ -481,7 +481,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
@@ -501,7 +501,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:
@@ -547,8 +547,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
sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
# Ditch links:
@@ -567,8 +567,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
sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
( cd lib${LIBDIRSUFFIX}