.gitmodules

@@ -22,6 +22,12 @@
 [submodule "packages/yay"]
 	path = packages/yay
 	url = https://aur.archlinux.org/yay.git
+[submodule "packages/brother-mfc-1810"]
+	path = packages/brother-mfc-1810
+	url = https://aur.archlinux.org/brother-mfc-1810.git
+[submodule "packages/brscan4"]
+	path = packages/brscan4
+	url = https://aur.archlinux.org/brscan4.git
 [submodule "packages/cecdaemon-git"]
 	path = packages/cecdaemon-git
 	url = https://aur.archlinux.org/cecdaemon-git.git
@@ -79,6 +85,9 @@
 [submodule "packages/mitogen"]
 	path = packages/mitogen
 	url = https://aur.archlinux.org/mitogen.git
+[submodule "packages/mozwire"]
+	path = packages/mozwire
+	url = https://aur.archlinux.org/mozwire.git
 [submodule "packages/nbtexplorer"]
 	path = packages/nbtexplorer
 	url = https://aur.archlinux.org/nbtexplorer.git
@@ -160,12 +169,3 @@
 [submodule "packages/hibiscus"]
 	path = packages/hibiscus
 	url = https://aur.archlinux.org/hibiscus.git
-[submodule "packages/brother-mfc-1810"]
-	path = packages/brother-mfc-1810
-	url = https://aur.archlinux.org/brother-mfc-1810.git
-[submodule "packages/mozwire"]
-	path = packages/mozwire
-	url = https://aur.archlinux.org/mozwire.git
-[submodule "packages/brscan4"]
-	path = packages/brscan4
-	url = https://aur.archlinux.org/brscan4.git

add_aur.sh

@@ -5,4 +5,3 @@ if [ -d "packages/${pkg}" ] ; then
     exit 1
 fi
 git submodule add "https://aur.archlinux.org/${pkg}.git" "packages/${pkg}"
-./build_pkg.sh "$pkg"

build_pkg.sh

@@ -1,5 +1,4 @@
 #!/bin/zsh
-set -e
 pkg="$1"
 container=$(echo -n "makepkg-${pkg}" | sed 's;c++;cxx;g')
 if [ -z "${pkg}" ] ; then
@@ -7,8 +6,7 @@ if [ -z "${pkg}" ] ; then
     exit 1
 fi
 echo "Starte container ${container}"
-rm -f "packages/${pkg}/"*.pkg.tar.* || true
-podman run --detach --quiet --rm -v /etc/pacman.d/mirrorlist:/etc/pacman.d/mirrorlist -v $PWD:/src -v pkg_cache:/var/cache/pacman/pkg -w "/src/packages/$pkg" --userns keep-id --name "${container}" docker.io/archlinux:base-devel /src/wait.sh >/dev/null
+podman run --detach --quiet --rm -v /etc/pacman.d/mirrorlist:/etc/pacman.d/mirrorlist -v $PWD:/src -v pkg_cache:/var/cache/pacman/pkg -w "/src/packages/$pkg" --userns keep-id --name "${container}" docker.io/archlinux:base-devel /src/wait.sh >/dev/null || exit 1
 cleanup() {
     podman stop "${container}" >/dev/null
 }
@@ -16,5 +14,5 @@ cleanup() {
 trap cleanup INT TERM ZERR EXIT
 podman exec -ti -w "/src/packages/$pkg" -u 0 "${container}" /src/install_deps.sh
 
-podman exec -t -w "/src/packages/$pkg" "${container}" makepkg -C --skippgpcheck --nocheck
+podman exec -t -w "/src/packages/$pkg" "${container}" makepkg -C --skippgpcheck
 forgejo-uploader packete arch aur "packages/${pkg}/"*.pkg.tar.*

packages/brother-mfc-1810

@@ -1 +0,0 @@
-Subproject commit 41b68d28c651992771ad09cfc0c9bf9ce7b71728

packages/brscan4

@@ -1 +0,0 @@
-Subproject commit 20609b97f919666071b9aafa21f8d82fac71d0ce

packages/koreader-bin

@@ -1 +1 @@
-Subproject commit d180dbf34ff9caf2c1e0cdf205ca5392ece0e720
+Subproject commit 72318a4aef9e39221794c5a24d142106670fb836

packages/mozwire

@@ -1 +0,0 @@
-Subproject commit 698f88899883da937d422459df1c0bde64b94b4c

packages/vscodium-bin

@@ -1 +1 @@
-Subproject commit 587383ae4332c970d5c5da1b455c7eead4d1cecd
+Subproject commit 64e6bf44759ec30d6a4288cf7ba69aabc8de6983