From 02a313e149d6cda816a88bc7f9842f9d6b0a0d6c Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Sun, 24 Oct 2021 12:18:00 +0800 Subject: refactor: Add arch directory for packages Signed-off-by: KunoiSayami --- build_all.sh | 10 ++++++---- packages/.gitignore | 5 ----- packages/aarch64/.gitignore | 5 +++++ packages/x86_64/.gitignore | 5 +++++ 4 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 packages/.gitignore create mode 100644 packages/aarch64/.gitignore create mode 100644 packages/x86_64/.gitignore diff --git a/build_all.sh b/build_all.sh index c309a11..4325596 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,14 +1,15 @@ #!/bin/bash -PKGDEST="${PWD}/packages" +ARCH=$(uname -m) +PKGDEST="${PWD}/packages/$ARCH" SRCDEST="${PWD}/build" -REPO_DEST="${PWD}/packages/kunoisayami.db.tar.xz" -REPO_PENDING="${PWD}/packages/PENDING" +REPO_DEST="${PWD}/packages/$ARCH/kunoisayami.db.tar.xz" +REPO_PENDING="${PWD}/packages/$ARCH/PENDING" touch "$REPO_PENDING" pushd kunoisayami for folder in */ ; do PACKAGE_NAME=$(printf $folder | sed 's/.$//') pushd "$folder" - SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST makepkg --clean --sign + SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST makepkg --clean --sign --key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 if [ $? == 0 ]; then echo "$PACKAGE_NAME" >> "$REPO_PENDING" fi @@ -20,6 +21,7 @@ while read PACKAGE_NAME; do LATEST=$(ls -t "$PKGDEST/$PACKAGE_NAME"* | grep -v ".sig" | head -n 1 | cut -d' ' -f1) repo-add "$REPO_DEST" "$LATEST" -s -v -R done < "$REPO_PENDING" +echo $(date +%s) > "$PKGDEST/LASTBUILD" unset PACKAGE_NAME unset PKGDEST unset SRCDEST diff --git a/packages/.gitignore b/packages/.gitignore deleted file mode 100644 index 2f81c25..0000000 --- a/packages/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.pkg* -*.tar* -*.sig -*.db -*.files diff --git a/packages/aarch64/.gitignore b/packages/aarch64/.gitignore new file mode 100644 index 0000000..2f81c25 --- /dev/null +++ b/packages/aarch64/.gitignore @@ -0,0 +1,5 @@ +*.pkg* +*.tar* +*.sig +*.db +*.files diff --git a/packages/x86_64/.gitignore b/packages/x86_64/.gitignore new file mode 100644 index 0000000..2f81c25 --- /dev/null +++ b/packages/x86_64/.gitignore @@ -0,0 +1,5 @@ +*.pkg* +*.tar* +*.sig +*.db +*.files -- cgit v1.3.1