From 842423b0cae20ceefbb2287d8a8911bd370ec760 Mon Sep 17 00:00:00 2001 From: "M.Dinslage" Date: Fri, 29 Apr 2022 13:15:35 +0100 Subject: [PATCH] system/openrazer-kernel: Fix PRINT_PACKAGE_NAME & docs dir. Signed-off-by: Dave Woodfall Signed-off-by: Willy Sudiarto Raharjo --- system/openrazer-kernel/openrazer-kernel.SlackBuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/system/openrazer-kernel/openrazer-kernel.SlackBuild b/system/openrazer-kernel/openrazer-kernel.SlackBuild index 87c3d3323a..e4b7f6d82c 100644 --- a/system/openrazer-kernel/openrazer-kernel.SlackBuild +++ b/system/openrazer-kernel/openrazer-kernel.SlackBuild @@ -26,13 +26,14 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=openrazer-kernel VERSION=${VERSION:-3.3.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=openrazer KERNEL=${KERNEL:-$(uname -r)} +PKGVER=${VERSION}_$(echo $KERNEL | tr - _) if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -46,7 +47,7 @@ fi # 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" + echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi @@ -54,7 +55,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -PKGVER=${VERSION}_$(echo $KERNEL | tr - _) if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -98,11 +98,11 @@ rm -r $PKG/usr/src 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 -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER cp -a \ LICENSE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + $PKG/usr/doc/$PRGNAM-$PKGVER +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc