From a379192b59e023cba2456cd987aa5dc578b68639 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 3 Jan 2025 23:08:40 +0100 Subject: [PATCH] cleanup --- .github/workflows/main-openwrt.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main-openwrt.yml b/.github/workflows/main-openwrt.yml index 31f67c2..2233430 100644 --- a/.github/workflows/main-openwrt.yml +++ b/.github/workflows/main-openwrt.yml @@ -21,6 +21,8 @@ jobs: sudo apt-get -y install rsync - name: Get the SDK run: | + # in December 2024/January 2025, https://downloads.openwrt.org/snapshots/targets/mxs/generic/openwrt-sdk-mxs-generic_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + # (master snapshot) worked too, but I prefer a more stable target. The resulting binary was 8 kbytes smaller on master at the time. wget --progress=dot:giga https://downloads.openwrt.org/releases/24.10.0-rc4/targets/mxs/generic/openwrt-sdk-24.10.0-rc4-mxs-generic_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst tar xf openwrt-sdk-*.tar.zst rm -f openwrt-sdk-*.tar.zst @@ -29,19 +31,16 @@ jobs: run: | cd ../sdk mkdir -p ../package/voorkant - # these two copies want to be symlinks but then they fail in github actions. Works in act though! - cp "${GITHUB_WORKSPACE}"/openwrt-package/voorkant/Makefile ../package/voorkant/ + # I used symlinks in an earlier iteration, which failed because the package dir was inside. Might be an interesting optimisation, please test in GH Actions -and- act if you try symlinks here. + cp "${GITHUB_WORKSPACE}"/openwrt-package/voorkant/Makefile ../package/voorkant/ # I guess this could be a recursive copy instead, in case we add files/ at some point cp -fpR "${GITHUB_WORKSPACE}" ../package/voorkant/src ( echo "src-link voorkant ${GITHUB_WORKSPACE}/../package" ; cat feeds.conf.default ) > feeds.conf - name: Update packages feed run: | cd "../sdk" - scripts/feeds update packages scripts/feeds update base - echo before scripts/feeds update voorkant - echo after cd feeds/packages && patch -p1 < ${GITHUB_WORKSPACE}/openwrt-package/libcurl-websockets.patch - name: Build package run: |