rebuild packages

[skip ci]

.github/workflows/packages.yml

@@ -82,7 +82,7 @@ jobs:
             cd ..
           fi
 
-          for repo_path in $(jq --raw-output 'keys | .[]' repo.json); do
+          for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do
             repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json)
             # Parse changed files and identify new packages and deleted packages.
             # Create lists of those packages that will be passed to upload job for
@@ -117,7 +117,7 @@ jobs:
           done
         else
           for pkg in ${{ github.event.inputs.packages }}; do
-            repo_paths=$(jq --raw-output 'keys | .[]' repo.json)
+            repo_paths=$(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json)
             found=false
             for repo_path in $repo_paths; do
               repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json)
@@ -136,7 +136,7 @@ jobs:
           done
         fi
 
-        for repo in $(jq --raw-output '.[].name' repo.json); do
+        for repo in $(jq --raw-output 'del(.pkg_format) | .[].name' repo.json); do
           # Fix so that lists do not contain duplicates
           if [ -f ./built_${repo}_packages.txt ]; then
             uniq ./built_${repo}_packages.txt > ./built_${repo}_packages.txt.tmp
@@ -166,7 +166,7 @@ jobs:
     - name: Lint packages
       run: |
         declare -a package_recipes
-        for repo_path in $(jq --raw-output 'keys | .[]' repo.json); do
+        for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do
           repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json)
           if [ -f ./built_${repo}_packages.txt ]; then
             package_recipes="$package_recipes $(cat ./built_${repo}_packages.txt | repo_path=${repo_path} awk '{print ENVIRON["repo_path"]"/"$1"/build.sh"}')"
@@ -180,7 +180,7 @@ jobs:
     - name: Build packages
       run: |
         declare -a packages
-        for repo_path in $(jq --raw-output 'keys | .[]' repo.json); do
+        for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do
           repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json)
 
           if [ -f ./built_${repo}_packages.txt ]; then
@@ -197,7 +197,7 @@ jobs:
       run: |
         test -d termux-packages/output && mv termux-packages/output/* ./output/
 
-        for repo in $(jq --raw-output '.[].name' repo.json); do
+        for repo in $(jq --raw-output 'del(.pkg_format) | .[].name' repo.json); do
           # Put package lists into directory with *.pkg.* files so they will be transferred to
           # upload job.
           test -f ./built_${repo}_packages.txt && mv ./built_${repo}_packages.txt ./pkgs/
@@ -265,7 +265,7 @@ jobs:
         }
         archive="pkgs-${{ matrix.arch }}-${{ github.sha }}/pkgs-${{ matrix.arch }}-${{ github.sha }}.tar"
         tar xf "$archive"
-        for repo in $(jq --raw-output '.[].name' repo.json); do
+        for repo in $(jq --raw-output 'del(.pkg_format) | .[].name' repo.json); do
           dp_file="deleted_${repo}_packages.txt"
           if [[ -f pkgs/$dp_file ]]; then
             path_dp_file=pkgs/${{ github.sha }}_${dp_file}

packages/flyctl/build.sh

@@ -26,3 +26,4 @@ termux_step_make() {
 termux_step_make_install() {
 	install -Dm700 -t "$TERMUX_PREFIX"/bin "$TERMUX_PKG_SRCDIR/bin/flyctl"
 }
+

packages/libnss/build.sh

@@ -97,3 +97,4 @@ termux_step_create_debscripts() {
 	echo "exit 0" >> postinst
 	chmod 0755 postinst
 }
+

packages/mu/build.sh

@@ -22,3 +22,4 @@ termux_step_create_debscripts() {
 		rm -f $TERMUX_PREFIX/share/emacs/site-lisp/mu4e/*.elc
 	EOF
 }
+

packages/vim-python/build.sh

@@ -106,3 +106,4 @@ termux_step_create_debscripts() {
 	fi
 	EOF
 }
+

packages/vim/build.sh

@@ -94,3 +94,4 @@ termux_step_create_debscripts() {
 	fi
 	EOF
 }
+

x11-packages/firefox/build.sh

@@ -84,3 +84,4 @@ termux_step_configure() {
 termux_step_post_make_install() {
 	install -Dm600 $TERMUX_PKG_BUILDER_DIR/firefox.desktop $TERMUX_PREFIX/share/applications/firefox.desktop
 }
+

x11-packages/vim-gtk/build.sh

@@ -72,3 +72,4 @@ termux_step_post_make_install() {
 	sed -i "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" $TERMUX_PREFIX/share/vim/vimrc
 	ln -sfr $TERMUX_PREFIX/bin/vim $TERMUX_PREFIX/bin/vi
 }
+