diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 80221da..e2319a4 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -71,13 +71,7 @@ jobs: - name: Update feeds and packages run: | cd ~/lede - rm -rf ./tmp && rm -rf ./feeds && rm -rf ./pacakges/feeds - if [ -d 'feeds' ]; then - pushd feeds/packages; git restore .; popd - pushd feeds/luci; git restore .; popd - pushd feeds/routing; git restore .; popd - pushd feeds/telephony; git restore .; popd - fi + rm -rf tmp feeds pacakges/feeds ./scripts/feeds update -a ./scripts/feeds install -a . $GITHUB_WORKSPACE/scripts/merge_packages.sh diff --git a/scripts/patches.sh b/scripts/patches.sh index d167854..937c130 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -107,7 +107,7 @@ if [[ $DEVICE == 'r6s' || $DEVICE == 'r6c' ]]; then mv *.patch target/linux/generic/pending-6.1/ sed -i "s/ucidef_set_interfaces_lan_wan 'eth0 eth1' 'eth2'/ucidef_set_interfaces_lan_wan 'eth1 eth0' 'eth2'/" target/linux/rockchip/armv8/base-files/etc/board.d/02_network sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm/' target/linux/rockchip/Makefile - git diff + git diff --summary fi # add r1s support to Lean's repo