Some gardening

build/build.sh

@@ -26,7 +26,7 @@ function usage() {
     echo
   else
     echo "branch names:"
-    echo "  master  openwrt-22.03  openwrt-21.02"
+    echo "  master  openwrt-23.05  openwrt-22.03"
     echo
     echo "arch names:"
     echo "  run build/build.sh with a branch name to see available arch names"
@@ -74,6 +74,7 @@ unbuf="stdbuf --output=0 --error=0"
 (
   # pick the right URL
   dlurl="$dlmirror/snapshots/targets"
+  [ "$branch" == "openwrt-23.05" ] && dlurl="$dlmirror/releases/23.05-SNAPSHOT/targets"
   [ "$branch" == "openwrt-22.03" ] && dlurl="$dlmirror/releases/22.03-SNAPSHOT/targets"
   [ "$branch" == "openwrt-21.02" ] && dlurl="$dlmirror/releases/21.02-SNAPSHOT/targets"
 

build/targets-master.txt

@@ -16,10 +16,11 @@ arm_cortex-a9_vfpv3-d16 mvebu/cortexa9 tegra/generic
 arm_fa526 gemini/generic
 arm_mpcore oxnas/ox820
 arm_xscale kirkwood/generic
+armeb_xscale ixp4xx/generic
 i386_pentium-mmx x86/legacy x86/geode
 i386_pentium4 x86/generic
 mips64_octeonplus octeon/generic
-mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x
+mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xrx200 lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x
 mips_4kec realtek/rtl838x
 mips_mips32 bmips/bcm6318 bmips/bcm6328 bmips/bcm6358 bmips/bcm6362 bmips/bcm6368 bmips/bcm63268 lantiq/ase
 mipsel_24kc ramips/mt7620 ramips/mt7621 ramips/mt76x8 ramips/rt288x ramips/rt305x

build/targets-openwrt-23.05.txt

@@ -19,7 +19,7 @@ arm_xscale kirkwood/generic
 i386_pentium-mmx x86/legacy x86/geode
 i386_pentium4 x86/generic
 mips64_octeonplus octeon/generic
-mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x
+mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xrx200 lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x
 mips_4kec realtek/rtl838x
 mips_mips32 bcm63xx/generic bcm63xx/smp bmips/bcm6318 bmips/bcm6328 bmips/bcm6358 bmips/bcm6362 bmips/bcm6368 bmips/bcm63268 lantiq/ase
 mipsel_24kc ramips/mt7620 ramips/mt7621 ramips/mt76x8 ramips/rt288x ramips/rt305x

build/targets-testbuildbot.txt

@@ -1,32 +1,6 @@
 # Generated by 'openwrt.git/scripts/dump-target-info.pl architectures'
-aarch64_cortex-a53 bcm27xx/bcm2710 bcm4908/generic mediatek/mt7622 mediatek/filogic mvebu/cortexa53 qualcommax/ipq807x sunxi/cortexa53
-aarch64_cortex-a72 bcm27xx/bcm2711 mvebu/cortexa72
-aarch64_generic armsr/armv8 layerscape/armv8_64b octeontx/generic rockchip/armv8
-arm_arm1176jzf-s_vfp bcm27xx/bcm2708
-arm_arm926ej-s at91/sam9x mxs/generic
-arm_cortex-a15_neon-vfpv4 armsr/armv7 ipq806x/generic ipq806x/chromium
-arm_cortex-a5_vfpv4 at91/sama5
-arm_cortex-a7 mediatek/mt7629
-arm_cortex-a7_neon-vfpv4 bcm27xx/bcm2709 imx/cortexa7 ipq40xx/generic ipq40xx/chromium ipq40xx/mikrotik layerscape/armv7 mediatek/mt7623 sunxi/cortexa7
-arm_cortex-a7_vfpv4 at91/sama7
-arm_cortex-a8_vfpv3 sunxi/cortexa8
-arm_cortex-a9 bcm53xx/generic
-arm_cortex-a9_neon imx/cortexa9 zynq/generic
-arm_cortex-a9_vfpv3-d16 mvebu/cortexa9 tegra/generic
-arm_fa526 gemini/generic
-arm_mpcore oxnas/ox820
-arm_xscale kirkwood/generic
-i386_pentium-mmx x86/legacy x86/geode
-i386_pentium4 x86/generic
-mips64_octeonplus octeon/generic
-mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x
-mips_4kec realtek/rtl838x
-mips_mips32 bmips/bcm6318 bmips/bcm6328 bmips/bcm6358 bmips/bcm6362 bmips/bcm6368 bmips/bcm63268 lantiq/ase
-mipsel_24kc ramips/mt7620 ramips/mt7621 ramips/mt76x8 ramips/rt288x ramips/rt305x
-mipsel_24kc_24kf pistachio/generic
-mipsel_74kc bcm47xx/mips74k ramips/rt3883
-mipsel_mips32 bcm47xx/generic bcm47xx/legacy
-powerpc_464fp apm821xx/nand apm821xx/sata
-powerpc_8548 mpc85xx/p1010 mpc85xx/p1020 mpc85xx/p2020
-riscv64_riscv64 sifiveu/generic
+aarch64_generic armsr/armv8
+arm_cortex-a7_neon-vfpv4 ipq40xx/generic ipq40xx/mikrotik
+mips_24kc ath79/tiny
+mipsel_24kc ramips/mt7621
 x86_64 x86/64

packages/falter-common/Makefile

@@ -2,7 +2,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=falter-common
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
@@ -59,7 +59,7 @@ define Package/falter-more
 	$(call Package/falter-standard/template)
 	TITLE:=Falter more files
 	EXTRA_DEPENDS:=falter-common, falter-profiles, luci-app-ffwizard-falter, falter-berlin-migration, falter-berlin-tunneldigger, falter-policyrouting, falter-berlin-ssid-changer,
-	EXTRA_DEPENDS+= falter-berlin-firewall-defaults, qos-scripts, firewall4, luci-app-firewall, luci-i18n-firewall-de,
+	EXTRA_DEPENDS+= qos-scripts, firewall4, luci-app-firewall, luci-i18n-firewall-de,
 	EXTRA_DEPENDS+= falter-berlin-autoupdate, falter-berlin-autoupdate-keys, luci-app-falter-autoupdate, luci-i18n-falter-autoupdate-de,
 	EXTRA_DEPENDS+= falter-berlin-service-registrar, luci-app-falter-service-registrar, luci-i18n-falter-service-registrar-de,
 	EXTRA_DEPENDS+= collectd-mod-cpu, collectd-mod-load
@@ -70,7 +70,7 @@ define Package/falter-more/description
 endef
 
 define Package/falter-more/install
-	true
+	$(CP) ./files/* $(1)/
 endef