From 6ef7b42ad547c61cd04458230098f192b0cc3c33 Mon Sep 17 00:00:00 2001 From: Marcel Saegebarth Date: Fri, 10 Mar 2017 13:32:43 +0100 Subject: [PATCH 1/2] Moved sqg functions to /usr/libexec. Signed-off-by: Marcel Saegebarth --- src/usr/{share => libexec}/sbopkg/sqg/functions | 4 ++-- src/usr/{share => libexec}/sbopkg/sqg/sqg-build-queuefile | 2 +- src/usr/sbin/sqg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/usr/{share => libexec}/sbopkg/sqg/functions (97%) rename src/usr/{share => libexec}/sbopkg/sqg/sqg-build-queuefile (93%) diff --git a/src/usr/share/sbopkg/sqg/functions b/src/usr/libexec/sbopkg/sqg/functions similarity index 97% rename from src/usr/share/sbopkg/sqg/functions rename to src/usr/libexec/sbopkg/sqg/functions index 19d2bc1..b5b81d6 100644 --- a/src/usr/share/sbopkg/sqg/functions +++ b/src/usr/libexec/sbopkg/sqg/functions @@ -169,11 +169,11 @@ execute_build () { if [ $? -eq 1 ]; then printf '%s\n' "${PKGSNEW[@]}" | \ parallel --eta --will-cite --jobs $JOBS \ - /usr/share/sbopkg/sqg/sqg-build-queuefile \ + /usr/libexec/sbopkg/sqg/sqg-build-queuefile \ "$REPO_DIR" "$QUEUEDIR" {} "$SKIP_EMPTY" $VERBOSE else for PKG in "${PKGSNEW[@]}"; do - /usr/share/sbopkg/sqg/sqg-build-queuefile \ + /usr/libexec/sbopkg/sqg/sqg-build-queuefile \ "$REPO_DIR" "$QUEUEDIR" "$PKG" "$SKIP_EMPTY" $VERBOSE done fi diff --git a/src/usr/share/sbopkg/sqg/sqg-build-queuefile b/src/usr/libexec/sbopkg/sqg/sqg-build-queuefile similarity index 93% rename from src/usr/share/sbopkg/sqg/sqg-build-queuefile rename to src/usr/libexec/sbopkg/sqg/sqg-build-queuefile index 1934f39..97cc4c7 100755 --- a/src/usr/share/sbopkg/sqg/sqg-build-queuefile +++ b/src/usr/libexec/sbopkg/sqg/sqg-build-queuefile @@ -1,7 +1,7 @@ #!/bin/sh # source all sqg functions -. /usr/share/sbopkg/sqg/functions +. /usr/libexec/sbopkg/sqg/functions REPO_DIR="$1" QUEUEDIR="$2" diff --git a/src/usr/sbin/sqg b/src/usr/sbin/sqg index 8377144..91c1bc6 100755 --- a/src/usr/sbin/sqg +++ b/src/usr/sbin/sqg @@ -48,7 +48,7 @@ REPO_BRANCH=${REPO_BRANCH:-$(cat /etc/slackware-version | awk '{print $2}')} ### NO CHANGES SHOULD BE NECESSARY BELOW THIS LINE ### # source all sqg functions -. /usr/share/sbopkg/sqg/functions +. /usr/libexec/sbopkg/sqg/functions SCRIPT=${0##*/} From 55a4979070812fd33f1c06ca310ede2e4283d112 Mon Sep 17 00:00:00 2001 From: Marcel Saegebarth Date: Fri, 10 Mar 2017 13:45:08 +0100 Subject: [PATCH 2/2] sqg: Added /usr/libexec to sbopkg.SlackBuild. Signed-off-by: Marcel Saegebarth --- tools/sbopkg.SlackBuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/sbopkg.SlackBuild b/tools/sbopkg.SlackBuild index 95d7868..6117e28 100644 --- a/tools/sbopkg.SlackBuild +++ b/tools/sbopkg.SlackBuild @@ -42,6 +42,9 @@ mv $PKG/etc/sbopkg/sbopkg.conf $PKG/etc/sbopkg/sbopkg.conf.new mkdir -p $PKG/usr/sbin cp usr/sbin/* $PKG/usr/sbin +mkdir -p $PKG/usr/libexec/$PRGNAM +cp -ar usr/libexec/$PRGNAM/* $PKG/usr/libexec/$PRGNAM + mkdir -p $PKG/usr/man cp -a usr/man/* $PKG/usr/man find $PKG/usr/man -type f -exec gzip -9 {} \;