From c1fc513cef2231605a7e4ded7cc9e3a67d0036ff Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 3 Mar 2018 18:29:43 +0100 Subject: [PATCH] buildscript: remove community config The community file is not used anymore. Signed-off-by: Tim Niemeyer Reviewed-by: Adrian Schmutzler --- buildscript | 49 ++----------------- community/franken.cfg | 8 --- .../files/usr/sbin/nodewatcher | 1 - .../fff-sysupgrade/files/etc/sysupgrade.sh | 6 +-- 4 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 community/franken.cfg diff --git a/buildscript b/buildscript index 6d78ba1..1a1cfdd 100755 --- a/buildscript +++ b/buildscript @@ -197,18 +197,14 @@ prebuild() { if [ 0 -ne $? ]; then version=$(git log -1 --pretty=format:%h) fi - community=$(basename "$(realpath selected_community)" .cfg) { echo "FIRMWARE_VERSION=\"$version\"" - echo "FIRMWARE_COMMUNITY=\"$community\"" echo "BUILD_DATE=\"build date: $(date)\"" echo "OPENWRT_CORE_REVISION=\"${OPENWRTREV}\"" echo "OPENWRT_FEEDS_PACKAGES_REVISION=\"${PACKAGEREV}\"" } > "$target"/files/etc/firmware_release - cp selected_community "$target"/files/etc/community.cfg - opath=$(pwd) cd "$target" make defconfig @@ -276,14 +272,10 @@ config() { } cp_firmware() { - if [ "$community" = "franken" ]; then - local community="fff" - fi - [ -n "$subtarget" ] || subtarget="generic" for image in ${images[@]}; do - filename_build=${image//lede/${community}-${version}} + filename_build=${image//lede/fff-${version}} filename_build=${filename_build//generic/g} cp "$target/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build" @@ -352,18 +344,6 @@ loadBSP() . selected_bsp } -loadCommunity() -{ - echo "Working with $(/bin/ls -l selected_community | awk '{ print $11 }')" - tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community) -} - -setCommunity() { - /bin/rm -rf selected_community - /bin/ln -s "$1" selected_community - loadCommunity -} - setBSP() { /bin/rm -rf selected_bsp @@ -384,19 +364,13 @@ if [ "$(/usr/bin/id -u)" -eq 0 ]; then exit 1 fi -if [ "$1" != "selectbsp" -a "$1" != "selectcommunity" ]; then +if [ "$1" != "selectbsp" ]; then if [ ! -h selected_bsp ]; then echo "Please select a Board-Support-Package using:" echo "$0 selectbsp" exit fi - if [ ! -h selected_community ]; then - echo "Please select a community file using:" - echo "$0 selectcommunity" - exit - fi loadBSP - loadCommunity echo fi @@ -417,22 +391,6 @@ case "$1" in fi fi ;; - "selectcommunity") - if [ "$2" = "help" ] || [ "$2" = "" ]; then - echo "Select a Community-File:" - echo - echo "Usage: $0 $1 " - echo "available community-files: " - /bin/ls community/*.cfg - echo - else - if [ ! -f "$2" ]; then - echo "Could not find $2" - else - setCommunity "$2" - fi - fi - ;; "prepare") if [ "$2" = "help" ] || [ "$2" = "x" ]; then echo "This option fetches the sources for the images and configurates the build so that it can be compiled" @@ -480,7 +438,7 @@ case "$1" in ;; "buildall") if [ "$2" = "help" ]; then - echo "This option builds the firmware for all routers of a given community." + echo "This option builds the firmware for all routers." echo echo "Usage: $0 $1 [fast]" echo @@ -503,7 +461,6 @@ case "$1" in echo echo "Usage: $0 command" echo "command:" - echo " selectcommunity " echo " selectbsp " echo " prepare" echo " config openwrt" diff --git a/community/franken.cfg b/community/franken.cfg deleted file mode 100644 index 833e98e..0000000 --- a/community/franken.cfg +++ /dev/null @@ -1,8 +0,0 @@ -BATMAN_CHANNEL=1 -BATMAN_CHANNEL_5GHZ=36 -ESSID_AP=franken.freifunk.net -ESSID_MESH=batman.franken.freifunk.net -BSSID_MESH=02:CA:FF:EE:BA:BE -VPN_PROJECT=fff -NTPD_IP=fe80::ff:feee:1%br-mesh -UPGRADE_PATH=http://[fe80::ff:feee:1%br-mesh]/dev/firmware/current diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index 4eebf20..c0ae57b 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -155,7 +155,6 @@ crawl() { SYSTEM_DATA=$SYSTEM_DATA"$fastd_version" SYSTEM_DATA=$SYSTEM_DATA"$nodewatcher_version" SYSTEM_DATA=$SYSTEM_DATA"$FIRMWARE_VERSION" - SYSTEM_DATA=$SYSTEM_DATA"$FIRMWARE_COMMUNITY" SYSTEM_DATA=$SYSTEM_DATA"$BUILD_DATE" SYSTEM_DATA=$SYSTEM_DATA"$OPENWRT_CORE_REVISION" SYSTEM_DATA=$SYSTEM_DATA"$OPENWRT_FEEDS_PACKAGES_REVISION" diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh index 8ef4949..6b6c10a 100755 --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh @@ -67,11 +67,7 @@ if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then done fi -if [ "$FIRMWARE_COMMUNITY" = "franken" ]; then - FIRMWARE_COMMUNITY="fff" -fi - -FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin" +FILE="fff-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin" echo "Downloading $FILE" echo "" wget "${UPGRADE_PATH}/${FILE}"