apk: repositories

fantastic-packages · Dec 5, 2024 · bfe5fd6 · bfe5fd6
1 parent 4e64a97
commit bfe5fd6
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/.github/workflows/buildimage.yml b/.github/workflows/buildimage.yml
@@ -166,19 +166,21 @@ jobs:
           # core feed
           sed -i "/\/targets\/${{ inputs.board }}\/${{ inputs.subtarget}}\/packages/{ \
             s|$MIRROR_URL/releases/$OP_VERSION|file://$GITHUB_WORKSPACE| \
-          }" repositories.conf
+          }" repositories
           # SNAPSHOT
           if [ -n "$SNAPSHOTS" ]; then
-            sed -i "/\/targets\/${{ inputs.board }}\/${{ inputs.subtarget}}\/kmods/d" repositories.conf
-            sed -i "s|releases/$OP_VERSION|snapshots|" repositories.conf
+            sed -i "/\/targets\/${{ inputs.board }}\/${{ inputs.subtarget}}\/kmods/d" repositories
+            sed -i "s|releases/$OP_VERSION|snapshots|" repositories
           fi
+          # local packages
+          [ -f "packages/packages.adb" ] || sed -i '/^packages\/packages.adb/d' repositories
           # fantastic feeds
-          n=$[ $(sed -n '/This is the local package repository/=' repositories.conf) -1 ]
-          sed -i "${n}i\
-          src/gz fantasticpackages_packages https://github.com/$GITHUB_REPOSITORY_OWNER/packages/raw/gh-pages/releases/$BRANCH/packages/$ARCH_PACKAGES/packages\n\
-          src/gz fantasticpackages_luci https://github.com/$GITHUB_REPOSITORY_OWNER/packages/raw/gh-pages/releases/$BRANCH/packages/$ARCH_PACKAGES/luci\n\
-          src/gz fantasticpackages_special https://github.com/$GITHUB_REPOSITORY_OWNER/packages/raw/gh-pages/releases/$BRANCH/packages/$ARCH_PACKAGES/special" \
-          repositories.conf
+          n=$(sed -n '$=' repositories)
+          sed -i "${n}a\
+          https://github.com/$GITHUB_REPOSITORY_OWNER/packages/raw/gh-pages/releases/$BRANCH/packages/$ARCH_PACKAGES/packages/packages.adb\n\
+          https://github.com/$GITHUB_REPOSITORY_OWNER/packages/raw/gh-pages/releases/$BRANCH/packages/$ARCH_PACKAGES/luci/packages.adb\n\
+          https://github.com/$GITHUB_REPOSITORY_OWNER/packages/raw/gh-pages/releases/$BRANCH/packages/$ARCH_PACKAGES/special/packages.adb" \
+          repositories
           # ROOTFS_SIZE
           sed -i "s|\(\bCONFIG_TARGET_ROOTFS_PARTSIZE\)=.*|\1=$ROOTFS_SIZE|" .config
           #
@@ -229,8 +231,8 @@ jobs:
           ls -R keys/
           endgroup
           #
-          group "repositories.conf"
-          cat repositories.conf
+          group "repositories"
+          cat repositories
           endgroup
           #
           group "make image"