summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson2022-02-12 09:11:44 +0100
committer Willy Sudiarto Raharjo2022-02-13 03:17:47 +0100
commit6ca56fcf12262e08183481a006a9c700a86a541d (patch)
treec494b83e9fa39a3e0f76a2587dd89ec67631b7aa
parent86a72bd3948bbef6623ffc24ad131069fc8d81c8 (diff)
downloadslackbuilds-6ca56fcf12262e08183481a006a9c700a86a541d.tar.gz
system/lsb-release: Stop writing to $CWD, make noarch.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/lsb-release/lsb-release.SlackBuild46
-rw-r--r--system/lsb-release/lsb-release.etc4
-rw-r--r--system/lsb-release/lsb-release.slk2
3 files changed, 11 insertions, 41 deletions
diff --git a/system/lsb-release/lsb-release.SlackBuild b/system/lsb-release/lsb-release.SlackBuild
index 7199d4ade1..3add9e69c0 100644
--- a/system/lsb-release/lsb-release.SlackBuild
+++ b/system/lsb-release/lsb-release.SlackBuild
@@ -22,6 +22,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220212 bkw: Modified by SlackBuilds.org:
+# - stop writing to $CWD. *nothing* should *ever* do this.
+# - make this a noarch package since there's no compiled code.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=lsb-release
@@ -30,17 +34,8 @@ BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
+ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -50,20 +45,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
set -e
rm -rf $PKG
@@ -73,28 +54,21 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -x *
+chmod +x help2man lsb_release
make
make install prefix=$PKG/usr
# create lsb config file and install it into the $PKG directory
DIST_VER=`cut -d " " -f 2 /etc/slackware-version`
-sed "s/current/$DIST_VER/" $CWD/$PRGNAM.slk > $CWD/$PRGNAM.etc
mkdir -p $PKG/etc
-cp $CWD/$PRGNAM.etc $PKG/etc/$PRGNAM
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+sed "s/current/$DIST_VER/" $CWD/$PRGNAM.slk > $PKG/etc/$PRGNAM
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/lsb-release/lsb-release.etc b/system/lsb-release/lsb-release.etc
deleted file mode 100644
index a5da09854e..0000000000
--- a/system/lsb-release/lsb-release.etc
+++ /dev/null
@@ -1,4 +0,0 @@
-LSB_VERSION=1.4
-DISTRIB_ID=slackware
-DISTRIB_RELEASE=14.2
-DISTRIB_DESCRIPTION="Slackware Linux "
diff --git a/system/lsb-release/lsb-release.slk b/system/lsb-release/lsb-release.slk
index 34511b30c7..3a84c8d6bd 100644
--- a/system/lsb-release/lsb-release.slk
+++ b/system/lsb-release/lsb-release.slk
@@ -1,4 +1,4 @@
LSB_VERSION=1.4
DISTRIB_ID=slackware
DISTRIB_RELEASE=current
-DISTRIB_DESCRIPTION="Slackware Linux "
+DISTRIB_DESCRIPTION="Slackware Linux"