Verified Commit 1ebad5e2 authored by Michal Hrusecky's avatar Michal Hrusecky 🦎

compile_fw: Better hack to support testing branch

parent e3fe69e5
...@@ -60,7 +60,8 @@ while read pkg orig_release release; do ...@@ -60,7 +60,8 @@ while read pkg orig_release release; do
done < release-override done < release-override
# Build NAND FW # Build NAND FW
[ -z "$OPENWRT_BRANCH" ] || PKG_BRANCH="-$OPENWRT_BRANCH" [ -z "$OPENWRT_BRANCH" ] || PKG_BRANCH="-$OPENWRT_BRANCH"
[ -n "$REAL_PKG_BRANCH" ] || REAL_PKG_BRANCH="$PKG_BRANCH"
cat configs/common configs/$TARGET_BOARD | sed -e "s|@BOARD@|$TARGET_BOARD|" -e "s|@BRANCH@|$PKG_BRANCH|" > .config cat configs/common configs/$TARGET_BOARD | sed -e "s|@BOARD@|$TARGET_BOARD|" -e "s|@BRANCH@|$PKG_BRANCH|" > .config
[ -n "$BUILD_ALL" ] && echo "CONFIG_ALL=y" >> .config && echo "CONFIG_SDK=y" >> .config [ -n "$BUILD_ALL" ] && echo "CONFIG_ALL=y" >> .config && echo "CONFIG_SDK=y" >> .config
echo CONFIG_ALL_KMODS=y >> .config echo CONFIG_ALL_KMODS=y >> .config
...@@ -69,7 +70,7 @@ echo CONFIG_ALL_KMODS=y >> .config ...@@ -69,7 +70,7 @@ echo CONFIG_ALL_KMODS=y >> .config
# Base list generation # Base list generation
cat > base.lua << EOF cat > base.lua << EOF
-- The basic repository -- The basic repository
Repository 'turris' 'https://api.turris.cz/openwrt-repo/${TARGET_BOARD}${PKG_BRANCH}/packages' { Repository 'turris' 'https://api.turris.cz/openwrt-repo/${TARGET_BOARD}${REAL_PKG_BRANCH}/packages' {
subdirs = {'base', $(echo $(sed -n 's|^src-git[[:blank:]]\+\([^[:blank:]]*\)[[:blank:]]\+http.*|\1|p' ./feeds.conf.default) | sed -e 's|\([^[:blank:]]\+\)|'"'\\1'|g" -e 's|\ |,\ |g')} subdirs = {'base', $(echo $(sed -n 's|^src-git[[:blank:]]\+\([^[:blank:]]*\)[[:blank:]]\+http.*|\1|p' ./feeds.conf.default) | sed -e 's|\([^[:blank:]]\+\)|'"'\\1'|g" -e 's|\ |,\ |g')}
} }
EOF EOF
...@@ -93,7 +94,7 @@ Install 'userlists' { critical = true } ...@@ -93,7 +94,7 @@ Install 'userlists' { critical = true }
-- Install everything that was in the image -- Install everything that was in the image
EOF EOF
if [ -n "${PKG_BRANCH}" ] && [ "${PKG_BRANCH}" \!= master ] && [ "${PKG_BRANCH}" \!= stable ]; then if [ -n "${PKG_BRANCH}" ] && [ "${PKG_BRANCH}" \!= master ] && [ "${PKG_BRANCH}" \!= stable ] && [ "${PKG_BRANCH}" \!= stable-omnia ]; then
echo 'Install "cznic-repo-keys-test"' >> base.lua echo 'Install "cznic-repo-keys-test"' >> base.lua
echo CONFIG_PACKAGE_cznic-repo-keys-test=y >> .config echo CONFIG_PACKAGE_cznic-repo-keys-test=y >> .config
echo CONFIG_PACKAGE_getbranch-test=y >> .config echo CONFIG_PACKAGE_getbranch-test=y >> .config
......
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