diff --git a/build.sh b/build.sh index e5ef127..888acf3 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,18 @@ #!/bin/bash -VERSION="23.05.0" +VERSION="23.05.4" -podman build \ - --build-arg=IB_URL="https://downloads.openwrt.org/releases/${VERSION}/targets/ath79/generic/openwrt-imagebuilder-${VERSION}-ath79-generic.Linux-x86_64.tar.xz" \ - -t "openfest-openwrt-ath79:${VERSION}" . +mkdir -p "tmp/dl" +mkdir -p "bin" + +podman run \ + --rm \ + -ti \ + -v "$(pwd)/bin:/out" \ + -v "$(pwd)/tmp/dl:/builder/dl" \ + -u root \ + "ghcr.io/openwrt/imagebuilder:ath79-generic-$VERSION" \ + bash -c 'chown -R buildbot:buildbot /out /builder/dl' for ap_dir in specific_config/ath79/dlink_dap-2695-a1/* do @@ -12,8 +20,7 @@ do tmpdir="tmp/${customization_name}" mkdir -p "${tmpdir}" - mkdir -p "tmp/dl" - mkdir -p "bin" + cp -rvp generic_config/ath79/dlink_dap-2695-a1/* "${tmpdir}/" cp -rvp "${ap_dir}"/* "${tmpdir}/" @@ -22,15 +29,17 @@ do -ti \ -v "$(pwd)/bin:/out:z" \ -v "$(pwd)/${tmpdir}:/files:z" \ - -v "$(pwd)/tmp/dl:/ib/dl:z" \ - "openfest-openwrt-ath79:${VERSION}" \ + -v "$(pwd)/tmp/dl:/builder/dl:z" \ + "ghcr.io/openwrt/imagebuilder:ath79-generic-${VERSION}" \ + bash -c "\ + chown -R buildbot:buildbot /out /builder/dl && make image PROFILE=dlink_dap-2695-a1 \ PACKAGES='kmod-ath10k -kmod-ath10k-ct -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x -wpad-basic-mbedtls wpad-wolfssl usteer tcpdump-mini mtr iperf3 ethtool bwm-ng luci ebtables ip-bridge socat' \ DISABLED_SERVICES='dnsmasq odhcpd firewall' \ BIN_DIR=/out \ FILES=/files \ - EXTRA_IMAGE_NAME="${customization_name}"\ - V=sc + EXTRA_IMAGE_NAME=\"${customization_name}\"\ + V=sc" done rm -rf "tmp" diff --git a/generic_config/ath79/dlink_dap-2695-a1/etc/config/wireless b/generic_config/ath79/dlink_dap-2695-a1/etc/config/wireless index b36d435..4c1d5aa 100644 --- a/generic_config/ath79/dlink_dap-2695-a1/etc/config/wireless +++ b/generic_config/ath79/dlink_dap-2695-a1/etc/config/wireless @@ -28,7 +28,7 @@ config wifi-iface 'wifinet0' option device 'radio0' option mode 'ap' option network 'wifi' - option macaddr '02:0f:20:23:00:00' + option macaddr '02:0f:20:24:00:00' # Security option ssid 'OpenFest' @@ -65,7 +65,7 @@ config wifi-iface 'wifinet1' option device 'radio1' option mode 'ap' option network 'wifi' - option macaddr '02:0f:20:23:00:01' + option macaddr '02:0f:20:24:00:01' # Security option ssid 'OpenFest' @@ -102,7 +102,7 @@ config wifi-iface 'wifinet2' option device 'radio0' option mode 'ap' option network 'wifi' - option macaddr '02:0f:20:23:00:02' + option macaddr '02:0f:20:24:00:02' # Security option ssid 'OpenFest Secure' @@ -145,7 +145,7 @@ config wifi-iface 'wifinet3' option device 'radio1' option mode 'ap' option network 'wifi' - option macaddr '02:0f:20:23:00:03' + option macaddr '02:0f:20:24:00:03' # Security option ssid 'OpenFest Secure' diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-fl/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-fl/etc/uci-defaults/99-custom-config.conf index 1d3310e..8312a17 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-fl/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-fl/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-fl' set network.mgmt.ipaddr='10.20.0.50' set wireless.radio0.channel='52' set wireless.radio1.channel='4' -set wireless.wifinet0.macaddr='02:0f:20:23:50:00' -set wireless.wifinet1.macaddr='02:0f:20:23:50:01' -set wireless.wifinet2.macaddr='02:0f:20:23:50:02' +set wireless.wifinet0.macaddr='02:0f:20:24:50:00' +set wireless.wifinet1.macaddr='02:0f:20:24:50:01' +set wireless.wifinet2.macaddr='02:0f:20:24:50:02' set wireless.wifinet2.nasid='ap-fl-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:50:03' +set wireless.wifinet3.macaddr='02:0f:20:24:50:03' set wireless.wifinet3.nasid='ap-fl-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-fr/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-fr/etc/uci-defaults/99-custom-config.conf index 30b08dc..41044a7 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-fr/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-fr/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-fr' set network.mgmt.ipaddr='10.20.0.51' set wireless.radio0.channel='100' set wireless.radio1.channel='7' -set wireless.wifinet0.macaddr='02:0f:20:23:51:00' -set wireless.wifinet1.macaddr='02:0f:20:23:51:01' -set wireless.wifinet2.macaddr='02:0f:20:23:51:02' +set wireless.wifinet0.macaddr='02:0f:20:24:51:00' +set wireless.wifinet1.macaddr='02:0f:20:24:51:01' +set wireless.wifinet2.macaddr='02:0f:20:24:51:02' set wireless.wifinet2.nasid='ap-fr-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:51:03' +set wireless.wifinet3.macaddr='02:0f:20:24:51:03' set wireless.wifinet3.nasid='ap-fr-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-team/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-team/etc/uci-defaults/99-custom-config.conf index afa7dbd..32beacb 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-team/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-team/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-team' set network.mgmt.ipaddr='10.20.0.56' set wireless.radio0.channel='52' set wireless.radio1.channel='4' -set wireless.wifinet0.macaddr='02:0f:20:23:56:00' -set wireless.wifinet1.macaddr='02:0f:20:23:56:01' -set wireless.wifinet2.macaddr='02:0f:20:23:56:02' +set wireless.wifinet0.macaddr='02:0f:20:24:56:00' +set wireless.wifinet1.macaddr='02:0f:20:24:56:01' +set wireless.wifinet2.macaddr='02:0f:20:24:56:02' set wireless.wifinet2.nasid='ap-team-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:56:03' +set wireless.wifinet3.macaddr='02:0f:20:24:56:03' set wireless.wifinet3.nasid='ap-team-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a1/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a1/etc/uci-defaults/99-custom-config.conf index 8f2b0a9..31da19d 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a1/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a1/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-voc-a1' set network.mgmt.ipaddr='10.20.0.52' set wireless.radio0.channel='36' set wireless.radio1.channel='1' -set wireless.wifinet0.macaddr='02:0f:20:23:52:00' -set wireless.wifinet1.macaddr='02:0f:20:23:52:01' -set wireless.wifinet2.macaddr='02:0f:20:23:52:02' +set wireless.wifinet0.macaddr='02:0f:20:24:52:00' +set wireless.wifinet1.macaddr='02:0f:20:24:52:01' +set wireless.wifinet2.macaddr='02:0f:20:24:52:02' set wireless.wifinet2.nasid='ap-voc-a1-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:52:03' +set wireless.wifinet3.macaddr='02:0f:20:24:52:03' set wireless.wifinet3.nasid='ap-voc-a1-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a2/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a2/etc/uci-defaults/99-custom-config.conf index ae661e1..25657c5 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a2/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-voc-a2/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-voc-a2' set network.mgmt.ipaddr='10.20.0.53' set wireless.radio0.channel='132' set wireless.radio1.channel='13' -set wireless.wifinet0.macaddr='02:0f:20:23:53:00' -set wireless.wifinet1.macaddr='02:0f:20:23:53:01' -set wireless.wifinet2.macaddr='02:0f:20:23:53:02' +set wireless.wifinet0.macaddr='02:0f:20:24:53:00' +set wireless.wifinet1.macaddr='02:0f:20:24:53:01' +set wireless.wifinet2.macaddr='02:0f:20:24:53:02' set wireless.wifinet2.nasid='ap-voc-a2-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:53:03' +set wireless.wifinet3.macaddr='02:0f:20:24:53:03' set wireless.wifinet3.nasid='ap-voc-a2-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-voc-b/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-voc-b/etc/uci-defaults/99-custom-config.conf index 610a19d..48fef55 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-voc-b/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-voc-b/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-voc-b' set network.mgmt.ipaddr='10.20.0.54' set wireless.radio0.channel='100' set wireless.radio1.channel='7' -set wireless.wifinet0.macaddr='02:0f:20:23:54:00' -set wireless.wifinet1.macaddr='02:0f:20:23:54:01' -set wireless.wifinet2.macaddr='02:0f:20:23:54:02' +set wireless.wifinet0.macaddr='02:0f:20:24:54:00' +set wireless.wifinet1.macaddr='02:0f:20:24:54:01' +set wireless.wifinet2.macaddr='02:0f:20:24:54:02' set wireless.wifinet2.nasid='ap-voc-b-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:54:03' +set wireless.wifinet3.macaddr='02:0f:20:24:54:03' set wireless.wifinet3.nasid='ap-voc-b-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-ws-c/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-ws-c/etc/uci-defaults/99-custom-config.conf index 4d8abda..364110b 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-ws-c/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-ws-c/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-ws-c' set network.mgmt.ipaddr='10.20.0.55' set wireless.radio0.channel='116' set wireless.radio1.channel='10' -set wireless.wifinet0.macaddr='02:0f:20:23:55:00' -set wireless.wifinet1.macaddr='02:0f:20:23:55:01' -set wireless.wifinet2.macaddr='02:0f:20:23:55:02' +set wireless.wifinet0.macaddr='02:0f:20:24:55:00' +set wireless.wifinet1.macaddr='02:0f:20:24:55:01' +set wireless.wifinet2.macaddr='02:0f:20:24:55:02' set wireless.wifinet2.nasid='ap-ws-c-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:55:03' +set wireless.wifinet3.macaddr='02:0f:20:24:55:03' set wireless.wifinet3.nasid='ap-ws-c-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-ws-l/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-ws-l/etc/uci-defaults/99-custom-config.conf index 4a1782a..2d363cc 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-ws-l/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-ws-l/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-ws-l' set network.mgmt.ipaddr='10.20.0.57' set wireless.radio0.channel='36' set wireless.radio1.channel='1' -set wireless.wifinet0.macaddr='02:0f:20:23:57:00' -set wireless.wifinet1.macaddr='02:0f:20:23:57:01' -set wireless.wifinet2.macaddr='02:0f:20:23:57:02' +set wireless.wifinet0.macaddr='02:0f:20:24:57:00' +set wireless.wifinet1.macaddr='02:0f:20:24:57:01' +set wireless.wifinet2.macaddr='02:0f:20:24:57:02' set wireless.wifinet2.nasid='ap-ws-l-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:57:03' +set wireless.wifinet3.macaddr='02:0f:20:24:57:03' set wireless.wifinet3.nasid='ap-ws-l-2g' EOI uci commit diff --git a/specific_config/ath79/dlink_dap-2695-a1/ap-ws-r/etc/uci-defaults/99-custom-config.conf b/specific_config/ath79/dlink_dap-2695-a1/ap-ws-r/etc/uci-defaults/99-custom-config.conf index 54aac98..b62166f 100644 --- a/specific_config/ath79/dlink_dap-2695-a1/ap-ws-r/etc/uci-defaults/99-custom-config.conf +++ b/specific_config/ath79/dlink_dap-2695-a1/ap-ws-r/etc/uci-defaults/99-custom-config.conf @@ -3,11 +3,11 @@ set system.@system[0].hostname='ap-ws-r' set network.mgmt.ipaddr='10.20.0.58' set wireless.radio0.channel='116' set wireless.radio1.channel='10' -set wireless.wifinet0.macaddr='02:0f:20:23:58:00' -set wireless.wifinet1.macaddr='02:0f:20:23:58:01' -set wireless.wifinet2.macaddr='02:0f:20:23:58:02' +set wireless.wifinet0.macaddr='02:0f:20:24:58:00' +set wireless.wifinet1.macaddr='02:0f:20:24:58:01' +set wireless.wifinet2.macaddr='02:0f:20:24:58:02' set wireless.wifinet2.nasid='ap-ws-r-5g' -set wireless.wifinet3.macaddr='02:0f:20:23:58:03' +set wireless.wifinet3.macaddr='02:0f:20:24:58:03' set wireless.wifinet3.nasid='ap-ws-r-2g' EOI uci commit