Slackware/repo
1
0
Fork 0
Code Releases Wiki Activity

Use PKG_CONFIG_ARCHIVE not BUILD_CONFIG_ARCHIVE, and save to /data/slackware.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2022-09-16 22:57:41 +01:00
commit 736488f9ea
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/buildconf
View file

@ -8,3 +8,6 @@ unset CCACHE
# Override default package store location. # Override default package store location.
PKG_STORE='/data/slackware/repo/$DIST_OS_ID-$DIST_OS_VERSION_ID' PKG_STORE='/data/slackware/repo/$DIST_OS_ID-$DIST_OS_VERSION_ID'
# Put config backups from the packages here.
PKG_CONFIG_ARCHIVE="/data/slackware/repo/config-archive"

17
templates/template.SlackBuild
View file

@ -48,6 +48,9 @@ cd "$(cd "${BASH_SOURCE[0]%/*}"; pwd -P)"
# shellcheck disable=SC2016 # shellcheck disable=SC2016
[[ -z "$PKG_STORE" ]] && PKG_STORE='/tmp/pkg-store/$DIST_OS_ID-$DIST_OS_VERSION_ID' [[ -z "$PKG_STORE" ]] && PKG_STORE='/tmp/pkg-store/$DIST_OS_ID-$DIST_OS_VERSION_ID'
# Package configuration archive path.
[[ -z "$PKG_CONFIG_ARCHIVE" ]] && PKG_CONFIG_ARCHIVE="/tmp/pkg-config-archive"
# Parse command line options. # Parse command line options.
while (( $# > 0 )); do while (( $# > 0 )); do
if [[ "$1" =~ ^-(-)?f(orce)?$ ]]; then if [[ "$1" =~ ^-(-)?f(orce)?$ ]]; then
@ -93,7 +96,6 @@ unset DIST_OS_VERSION_CODENAME
# Build environment. # Build environment.
BUILD_WORKDIR="${BUILD_WORKDIR:-/tmp/pkg-build}" BUILD_WORKDIR="${BUILD_WORKDIR:-/tmp/pkg-build}"
BUILD_ROOT="$BUILD_WORKDIR/pkg-$PKG_NAME" BUILD_ROOT="$BUILD_WORKDIR/pkg-$PKG_NAME"
BUILD_CONFIG_ARCHIVE="${BUILD_CONFIG_ARCHIVE:-/tmp/pkg-config-archive}"
BUILD_PREFIX="${BUILD_PREFIX:-/opt}" BUILD_PREFIX="${BUILD_PREFIX:-/opt}"
BUILD_ALTCC="${BUILD_ALTCC:-}" BUILD_ALTCC="${BUILD_ALTCC:-}"
BUILD_ALTCXX="${BUILD_ALTCXX:-}" BUILD_ALTCXX="${BUILD_ALTCXX:-}"
@ -144,8 +146,8 @@ case "${BUILD_ARCH:=$(uname -m)}" in
;; ;;
esac esac
# Now all possible changes to variables in PKG_STORE are complete, expand out the embedded variables. # Now all possible changes to variables in PKG_STORE and PKG_CONFIG_ARCHIVE are complete, expand out the embedded variables.
eval "$(declare -p PKG_STORE | sed -re 's/\\\$/$/g')" eval "$(declare -p PKG_STORE PKG_CONFIG_ARCHIVE | sed -re 's/\\\$/$/g')"
# Sanity. # Sanity.
SRC_DIR="$(pwd)" SRC_DIR="$(pwd)"
@ -230,10 +232,11 @@ done
# Move the package configuration files into the archive. # Move the package configuration files into the archive.
[[ -e "$BUILD_ROOT/etc/$PKG_NAME" ]] && { [[ -e "$BUILD_ROOT/etc/$PKG_NAME" ]] && {
(( ${BUILD_KEEPCONFIGS:-0} == 0 )) && { (( ${BUILD_KEEPCONFIGS:-0} == 0 )) && {
rm -rf "$BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION" rm -rf "$PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}"
mkdir -p -m 755 "$BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION/etc/$PKG_NAME" || \ mkdir -p -m 755 "$PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}/etc/$PKG_NAME" || \
die "Failed to create directory: $BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION/etc/$PKG_NAME" die "Failed to create directory: $PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}/etc/$PKG_NAME"
mv "$BUILD_ROOT/etc/$PKG_NAME"/* "$BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION/etc/$PKG_NAME" || die "Failed to move configuration files to archive" mv "$BUILD_ROOT/etc/$PKG_NAME"/* "$PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}/etc/$PKG_NAME" || \
die "Failed to move configuration files to archive"
} }
} }