Verified Commit 53f8f666 authored by Michal Hrusecky's avatar Michal Hrusecky 🦎

compile_fw & updater-medkit.sh: Little cleanup

parent 77af007a
......@@ -155,12 +155,16 @@ if [ -n "$BUILD_ALL" ]; then
make package/curl/host/install package/libevent2/host/install package/lua/host/install
make package/updater-ng/host/install
# Generate medkit
if [ "$TARGET_BOARD" = "turris" ]; then
MED_ARCH=mpc85xx
else
MED_ARCH=mvebu-musl
fi
BASE_PATH="`pwd`"
MED_PATH="bin-nand/mvebu-musl/medkit"
MED_PATH="bin-nand/${MED_ARCH}/medkit"
MED_TAR="$TARGET_BOARD-medkit-$(date -d "$COMMIT_DATE" +%Y%m%d%H%M).tar.gz"
mkdir -p "$MED_PATH"
MED_BIN_SOURCE="bin-nand/mpc85xx"
[ "$TARGET_BOARD" = "turris" ] || MED_BIN_SOURCE="bin-nand/mvebu-musl"
MED_BIN_SOURCE="bin-nand/${MED_ARCH}"
fakeroot ./scripts/updater-medkit.sh --model "$TARGET_BOARD" $MED_ARGS $MED_BIN_SOURCE "$MED_PATH/$MED_TAR"
pushd "$MED_PATH"
ln -s "$MED_TAR" "$TARGET_BOARD"-medkit-latest.tar.gz
......
......@@ -86,6 +86,8 @@ export PATH="$PATH:$ABSOUT/usr/bin:$ABSOUT/usr/sbin:$ABSOUT/bin:$ABSOUT/sbin"
# First install base files before anything else
BASE_FILES="$(ls $OPENWRT_BIN/packages/base/base-files*.ipk | head -1)" # ls magic to get full name of package file
opkg-trans -R "$ABSOUT" -a "$BASE_FILES"
REPO_KEYS="$(ls $OPENWRT_BIN/turrispackages/cznic-repo-keys-test*.ipk | head -1)" # ls magic to get full name of package file
opkg-trans -R "$ABSOUT" -a "$REPO_KEYS"
# Get base.lua and change path to repository
UPDATER_BASECONF="$BUILD_DIR/base.lua"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment