From 7fb839e3cc09db2d56d5744b1bd1fb2a09d83fd0 Mon Sep 17 00:00:00 2001 From: Coelacanthus Date: Sun, 24 Oct 2021 21:08:00 +0800 Subject: feat: support multiarch (#3) --- pkgbuild.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgbuild.sh') diff --git a/pkgbuild.sh b/pkgbuild.sh index 29d9f01..5d99157 100755 --- a/pkgbuild.sh +++ b/pkgbuild.sh @@ -5,10 +5,16 @@ ARCH=$(uname -m) PKGBUILD_DIRECTORY_BASE="repo" PKGDEST="${PWD}/packages/$ARCH" SRCDEST="${PWD}/build" +CONFDEST="${PWD}/makepkg.d/makepkg.$ARCH.conf" REPO_DEST="${PWD}/packages/$ARCH/$REPO_BASE_NAME.db.tar.xz" REPO_PENDING="${PWD}/packages/$ARCH/PENDING" REPO_DIFF="${PWD}/packages/$ARCH/DIFF" +trap 'rm -f "$TMPCONF"' EXIT +TMPCONF=$(mktemp -t makepkg.$ARCH.conf.XXXXXXXXXX) || exit 1 +cat "${PWD}/makepkg.d/makepkg.base.conf" > "$TMPCONF" +cat "$CONFDEST" >> "$TMPCONF" + touch "$REPO_DIFF" touch "$REPO_PENDING" @@ -30,7 +36,7 @@ pushd $PKGBUILD_DIRECTORY_BASE || ( echo "Error, can't switch to pkgbuild direct while read PACKAGE_NAME ; do #PACKAGE_NAME=$(printf $folder | sed 's/.$//') pushd "$PACKAGE_NAME" || continue - SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF=$CONFDEST makepkg --clean + SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean if [ $? == 0 ]; then echo "$PACKAGE_NAME" >> "$REPO_PENDING" fi @@ -50,6 +56,7 @@ echo $(date +%s) > "$PKGDEST/LASTBUILD" unset PACKAGE_NAME unset PKGDEST unset SRCDEST +unset CONFDEST unset REPO_DEST rm -rf "$REPO_PENDING" rm -rf "$REPO_DIFF" -- cgit v1.3.1