From 36f6b3d51d5b256d9924e09209186cb9cf8f4fa5 Mon Sep 17 00:00:00 2001 From: a-gave Date: Mon, 25 Mar 2024 17:42:15 +0100 Subject: [PATCH] ci: multi-arch-build: use a different output path update packages/lime-system/files/etc/uci-defaults/92_add-lime-repos and README.md accordingly --- .github/workflows/multi-arch-build.yml | 2 +- README.md | 7 ++++--- .../lime-system/files/etc/uci-defaults/92_add-lime-repos | 9 ++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/multi-arch-build.yml b/.github/workflows/multi-arch-build.yml index ba80dff2c..241027325 100644 --- a/.github/workflows/multi-arch-build.yml +++ b/.github/workflows/multi-arch-build.yml @@ -83,5 +83,5 @@ jobs: deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} external_repository: libremesh/lime-feed publish_dir: bin/packages/${{ matrix.arch }}/libremesh/ - destination_dir: ${{ env.DEST_DIR }}/packages/${{ matrix.arch }} + destination_dir: arch_packages/${{ env.DEST_DIR }}/${{ matrix.arch }} diff --git a/README.md b/README.md index 0bf104224..ed81bad67 100644 --- a/README.md +++ b/README.md @@ -65,12 +65,12 @@ Within the container, add the `lime-packages` feeds: ```shell echo "src/gz libremesh https://feed.libremesh.org/master" >> repositories.conf -echo "src/gz libremesh_arch_packages https://feed.libremesh.org/master/packages/mips_24kc" >> repositories.conf +echo "src/gz libremesh_arch_packages https://feed.libremesh.org/arch_packages/master/mips_24kc" >> repositories.conf echo "untrusted comment: signed by libremesh.org key a71b3c8285abd28b" > keys/a71b3c8285abd28b echo "RWSnGzyChavSiyQ+vLk3x7F0NqcLa4kKyXCdriThMhO78ldHgxGljM/8" >> keys/a71b3c8285abd28b ``` -If your device is not part of ath79-generic replace `mips_24kc` with the architecture of the selected <target>-<subtarget>. +If your device is not part of ath79-generic replace `mips_24kc` with the architecture of the selected <target>/<subtarget>. Ideally add your own `lime-community` files within the container in the folder `./files/etc/config/`. To find possible options consult the @@ -95,10 +95,11 @@ Go to . Find your device. Click on the f ```shell echo "src/gz libremesh https://feed.libremesh.org/master" >> repositories.conf -echo "src/gz libremesh_arch_packages https://feed.libremesh.org/master/packages/mips_24kc" >> repositories.conf +echo "src/gz libremesh_arch_packages https://feed.libremesh.org/arch_packages/master/mips_24kc" >> repositories.conf echo "untrusted comment: signed by libremesh.org key a71b3c8285abd28b" > keys/a71b3c8285abd28b echo "RWSnGzyChavSiyQ+vLk3x7F0NqcLa4kKyXCdriThMhO78ldHgxGljM/8" >> keys/a71b3c8285abd28b ``` +If your device is not part of ath79-generic replace `mips_24kc` with the architecture of the selected <target>/<subtarget>. Create an image with ```shell diff --git a/packages/lime-system/files/etc/uci-defaults/92_add-lime-repos b/packages/lime-system/files/etc/uci-defaults/92_add-lime-repos index 484c89f14..e638186f2 100755 --- a/packages/lime-system/files/etc/uci-defaults/92_add-lime-repos +++ b/packages/lime-system/files/etc/uci-defaults/92_add-lime-repos @@ -12,14 +12,14 @@ feeds_file="/etc/opkg/limefeeds.conf" exit 0 } -arch_packages="$(cat /etc/os-release | grep OPENWRT_ARCH | sed 's/OPENWRT_ARCH=\"\(.*\)\"/\1/')" +arch_packages="$(grep OPENWRT_ARCH /etc/os-release | sed 's/OPENWRT_ARCH=\"\(.*\)\"/\1/')" [ "$LIME_CODENAME" == "development" ] && { packages_url="http://feed.libremesh.org/master"; - arch_packages_url="http://feed.libremesh.org/master/packages/$arch_packages"; + arch_packages_url="http://feed.libremesh.org/arch_packages/master/$arch_packages"; } || { packages_url="http://feed.libremesh.org/$LIME_RELEASE" - arch_packages_url="http://feed.libremesh.org/$LIME_RELEASE/packages/$arch_packages"; + arch_packages_url="http://feed.libremesh.org/arch_packages/$LIME_RELEASE/$arch_packages"; } profiles_url="http://feed.libremesh.org/profiles" @@ -33,3 +33,6 @@ echo "src/gz libremesh_arch_packages $arch_packages_url" >> "$feeds_file" echo "src/gz profiles $profiles_url" >> "$feeds_file" echo "untrusted comment: signed by libremesh.org key $key_name" > "/etc/opkg/keys/$key_name" echo "$key_content" >> "/etc/opkg/keys/$key_name" + +# remove unused package repositories added by buildroot calculated from feeds.conf +sed -i '/src\/gz\(.*\)\(_profiles\|_libremesh\)\(.*\)/d' /etc/opkg/distfeeds.conf \ No newline at end of file