From c2c330dd9689883a08a61d4981f59bb1cee57db2 Mon Sep 17 00:00:00 2001
From: Coelacanthus <CoelacanthusHex@gmail.com>
Date: Sun, 24 Oct 2021 17:29:45 +0800
Subject: refactor: using specified makepkg.conf to obtain a fixed compilation
 configuration

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>
---
 build_all.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build_all.sh')

diff --git a/build_all.sh b/build_all.sh
index 4325596..15d7c92 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -2,6 +2,7 @@
 ARCH=$(uname -m)
 PKGDEST="${PWD}/packages/$ARCH"
 SRCDEST="${PWD}/build"
+CONFDEST="${PWD}/makepkg.conf"
 REPO_DEST="${PWD}/packages/$ARCH/kunoisayami.db.tar.xz"
 REPO_PENDING="${PWD}/packages/$ARCH/PENDING"
 touch "$REPO_PENDING"
@@ -9,7 +10,7 @@ pushd kunoisayami
 for folder in */ ; do
     PACKAGE_NAME=$(printf $folder | sed 's/.$//')
     pushd "$folder"
-    SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST makepkg --clean --sign --key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9
+    SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF=$CONFDEST makepkg --clean --sign --key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9
     if [ $? == 0 ]; then
         echo "$PACKAGE_NAME" >> "$REPO_PENDING"
     fi
@@ -25,6 +26,7 @@ echo $(date +%s) > "$PKGDEST/LASTBUILD"
 unset PACKAGE_NAME
 unset PKGDEST
 unset SRCDEST
+unset CONFDEST
 unset REPO_DEST
 rm -rf "$REPO_PENDING"
 unset REPO_PENDING
-- 
cgit v1.3.1


From 31674b7581a3638667db705e6deb81608ca3ba76 Mon Sep 17 00:00:00 2001
From: Coelacanthus <CoelacanthusHex@gmail.com>
Date: Sun, 24 Oct 2021 17:57:49 +0800
Subject: refactor(makepkg): move sign, ACKAGER and GPGKEY to makepkg.conf

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>
---
 build_all.sh | 2 +-
 makepkg.conf | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'build_all.sh')

diff --git a/build_all.sh b/build_all.sh
index 15d7c92..7f22e11 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -10,7 +10,7 @@ pushd kunoisayami
 for folder in */ ; do
     PACKAGE_NAME=$(printf $folder | sed 's/.$//')
     pushd "$folder"
-    SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF=$CONFDEST makepkg --clean --sign --key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9
+    SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF=$CONFDEST makepkg --clean
     if [ $? == 0 ]; then
         echo "$PACKAGE_NAME" >> "$REPO_PENDING"
     fi
diff --git a/makepkg.conf b/makepkg.conf
index 5f886c5..92af8df 100644
--- a/makepkg.conf
+++ b/makepkg.conf
@@ -64,7 +64,7 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 #-- check:    Run the check() function if present in the PKGBUILD
 #-- sign:     Generate PGP signature file
 #
-BUILDENV=(!distcc color !ccache check !sign)
+BUILDENV=(!distcc color !ccache check sign)
 #
 #-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
 #-- specify a space-delimited list of hosts running in the DistCC cluster.
@@ -125,9 +125,9 @@ DBGSRCDIR="/usr/src/debug"
 #-- Log files: specify a fixed directory where all log files will be placed
 #LOGDEST=/home/makepkglogs
 #-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john@doe.com>"
+PACKAGER="KunoiSayami <i@leanhe.dev>"
 #-- Specify a key to use for package signing
-#GPGKEY=""
+GPGKEY="4A0F0C8BC709ACA4341767FB243975C8DB9656B9"
 
 #########################################################################
 # COMPRESSION DEFAULTS
-- 
cgit v1.3.1