From 7bf61728cad34104eaf5b3930f16bd3e440eba89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 27 Aug 2018 14:58:09 +0200 Subject: turris4x: generate index and sign --- templates/turris4x.run | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/turris4x.run b/templates/turris4x.run index 109a27e..e2df6dc 100755 --- a/templates/turris4x.run +++ b/templates/turris4x.run @@ -3,6 +3,8 @@ set -e . utils +MAKE="make -j4 IS_TTY=1 BUILD_LOG=1" + echo_stage "Get packages" git_fetch "https://git.cynerd.cz/openwrt-personal-pkgs" pkgs @@ -26,14 +28,13 @@ echo "src-git personal file://$WORKSPACE/pkgs" >> feeds.conf ./scripts/feeds install -p personal -d y -f -a echo_stage "Compile tools" -make -j4 IS_TTY=1 BUILD_LOG=1 tools/compile toolchain/compile +$MAKE tools/compile toolchain/compile package/usign/host/compile echo_stage "Compile packages from our feed" -make -j4 IS_TTY=1 BUILD_LOG=1 $(./scripts/feeds list -r personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ') +$MAKE $(./scripts/feeds list -r personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ') -# TODO is there Packages index? Where the hack it is? -#echo_stage "Sign" -#./staging_dir/host/bin/usign -S -s ~/openwrt-repo.key -m "bin/packages/$ARCH/personal/Packages" +echo_stage "Generate index and sign" +KEY=~/openwrt-repo.key $MAKE package/index echo_stage "Deploy" ssh upload rm -rf "deploy-turris4x-$BOARD" -- cgit v1.2.3