From 41e3966df31528ba0da20535d603764365596c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 22 Nov 2018 13:24:10 +0100 Subject: turris4x: replace compile_fw with compile_pkgs and use autopkg --- templates/turris4x.run | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/turris4x.run b/templates/turris4x.run index 571a369..f430095 100755 --- a/templates/turris4x.run +++ b/templates/turris4x.run @@ -30,7 +30,7 @@ DL_MIRROR="$TWORKSPACE/openwrt-dl-mirror" CCACHE_HOST_DIR="$TWORKSPACE/ccache-host" CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" EOF - ../turris-build/compile_fw -t "$BOARD" -p "$BRANCH" repo_prepare + ../turris-build/compile_pkgs -t "$BOARD" -p "$BRANCH" repo_prepare autopkg $make toolchain/compile target/compile package/usign/host/compile ) tar -czf openwrt.tar.gz openwrt @@ -45,9 +45,6 @@ echo "src-git personal git@cynerd.cz:openwrt-personal-pkgs" >> feeds.conf ./scripts/feeds list -r personal | awk '{print $1}' | xargs ./scripts/feeds uninstall # Remove any package provided by personal feed ./scripts/feeds install -p personal -d y -f -a -# TODO drop this and replace it with autopkg deployment using compile_fw -cp ./feeds/personal/autopkg-*.mk include/ - echo_stage "Compile packages from personal feed" find package/feeds/personal -mindepth 1 -maxdepth 1 -printf 'package/%P/compile\0' | \ xargs --null $make -- cgit v1.2.3