diff --git a/modules b/modules index b75b15d8..9210a650 100644 --- a/modules +++ b/modules @@ -1,16 +1,16 @@ GLUON_FEEDS='packages routing gluon' OPENWRT_REPO=https://github.com/openwrt/openwrt.git -OPENWRT_BRANCH=openwrt-22.03 -OPENWRT_COMMIT=5f583d31c72233efffa5c0fd2cbc802c8d059729 +OPENWRT_BRANCH=master +OPENWRT_COMMIT=590d1fd0e636f627bbfeb988909ec36cc5450a3b PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git -PACKAGES_PACKAGES_BRANCH=openwrt-22.03 -PACKAGES_PACKAGES_COMMIT=d057936acbefd76b033e7c365baa68b48ccb9166 +PACKAGES_PACKAGES_BRANCH=master +PACKAGES_PACKAGES_COMMIT=47ae88c3793e6ff950260785d84b81a8ad5d4918 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git -PACKAGES_ROUTING_BRANCH=openwrt-22.03 -PACKAGES_ROUTING_COMMIT=1cc7676b9f32acc30ec47f15fcb70380d5d6ef01 +PACKAGES_ROUTING_BRANCH=master +PACKAGES_ROUTING_COMMIT=3e96c851a7871f38c52c7be0e0f693b045fe0758 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=29912ec6308fd10b47763b4cf28a638d07f59973 diff --git a/patches/openwrt/0005-ramips-add-MT7621-WiFi-devpath-migration.patch b/patches/openwrt/0004-ramips-add-MT7621-WiFi-devpath-migration.patch similarity index 100% rename from patches/openwrt/0005-ramips-add-MT7621-WiFi-devpath-migration.patch rename to patches/openwrt/0004-ramips-add-MT7621-WiFi-devpath-migration.patch diff --git a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch deleted file mode 100644 index 349b4d99..00000000 --- a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: David Bauer -Date: Sun, 5 Jun 2022 23:43:38 +0200 -Subject: ramips-mt7621: make DSA images swconfig upgradable - -diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk -index ab0ff95f7529aa43e69e67a4e3a303242c9b2605..4c3a38db442f06d6c1acf77fb729d93a67e2d52a 100644 ---- a/target/linux/ramips/image/mt7621.mk -+++ b/target/linux/ramips/image/mt7621.mk -@@ -180,7 +180,6 @@ endef - TARGET_DEVICES += asiarf_ap7621-nv1 - - define Device/asus_rt-ac57u -- $(Device/dsa-migration) - DEVICE_VENDOR := ASUS - DEVICE_MODEL := RT-AC57U - DEVICE_ALT0_VENDOR := ASUS -@@ -1286,7 +1285,6 @@ endef - TARGET_DEVICES += mts_wg430223 - - define Device/netgear_ex6150 -- $(Device/dsa-migration) - $(Device/uimage-lzma-loader) - DEVICE_VENDOR := NETGEAR - DEVICE_MODEL := EX6150 -@@ -1299,7 +1297,6 @@ endef - TARGET_DEVICES += netgear_ex6150 - - define Device/netgear_sercomm_nand -- $(Device/dsa-migration) - $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 -@@ -1482,7 +1479,6 @@ endef - TARGET_DEVICES += netgear_wax202 - - define Device/netgear_wndr3700-v5 -- $(Device/dsa-migration) - $(Device/netgear_sercomm_nor) - $(Device/uimage-lzma-loader) - IMAGE_SIZE := 15232k -@@ -1819,7 +1815,6 @@ endef - TARGET_DEVICES += tplink_tl-wpa8631p-v3 - - define Device/ubnt_edgerouter_common -- $(Device/dsa-migration) - $(Device/uimage-lzma-loader) - DEVICE_VENDOR := Ubiquiti - IMAGE_SIZE := 256768k -@@ -2235,7 +2230,6 @@ endef - TARGET_DEVICES += zbtlink_zbt-wg2626 - - define Device/zbtlink_zbt-wg3526-16m -- $(Device/dsa-migration) - $(Device/uimage-lzma-loader) - IMAGE_SIZE := 16064k - DEVICE_VENDOR := Zbtlink -@@ -2248,7 +2242,6 @@ endef - TARGET_DEVICES += zbtlink_zbt-wg3526-16m - - define Device/zbtlink_zbt-wg3526-32m -- $(Device/dsa-migration) - $(Device/uimage-lzma-loader) - IMAGE_SIZE := 32448k - DEVICE_VENDOR := Zbtlink diff --git a/patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0005-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch similarity index 83% rename from patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch rename to patches/openwrt/0005-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch index 061a898c..f4c869f1 100644 --- a/patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch +++ b/patches/openwrt/0005-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch @@ -3,7 +3,7 @@ Date: Tue, 5 Jul 2022 23:49:31 +0200 Subject: lantiq-xrx200: make DSA images swconfig upgradable diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk -index 756105b94c7f844439132ab57837c9ac87d231ca..5563968de9ab3f491fa89d755fcc6e6fff79948f 100644 +index 751f61589de8cfa51f75ffe0a151b22e87b2e9dd..3c2a58dee81a8972e0056e9cb5a3824637b34af2 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -1,7 +1,7 @@ @@ -16,7 +16,7 @@ index 756105b94c7f844439132ab57837c9ac87d231ca..5563968de9ab3f491fa89d755fcc6e6f endef diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk -index deea3996670fcef6d2a546373425c4ca5d92734b..d23b80e94e5548ccb19738f22c29c75fa19ab1e7 100644 +index f3149bf2c0789e659d287a62de03fe0a891d713b..f413ca8082e403dd58e794b9e21d27e6cde91aa8 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -1,7 +1,7 @@ diff --git a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0006-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch similarity index 99% rename from patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch rename to patches/openwrt/0006-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch index ec9641c0..6b38fca4 100644 --- a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch +++ b/patches/openwrt/0006-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch @@ -208,10 +208,10 @@ index 0000000000000000000000000000000000000000..e3da684dc950ea4c226705d27b23b047 + + int system_bridge_addif(struct device *bridge, struct device *dev) diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 -index a348d4821ecef796c8c2b983a969b7becb7ae334..dad7baabe69f53ca9afeff8e9392397dd9dc35aa 100644 +index 9c4aad86c1484055194ec39da8f755ecb368178a..f5e3c7babd3bea2d66ce6fd138ecb87967cb940e 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 -@@ -738,6 +738,7 @@ CONFIG_BRIDGE=y +@@ -737,6 +737,7 @@ CONFIG_BRIDGE=y # CONFIG_BRIDGE_EBT_T_NAT is not set # CONFIG_BRIDGE_EBT_VLAN is not set CONFIG_BRIDGE_IGMP_SNOOPING=y diff --git a/patches/openwrt/0009-xrx200-migrate-fritz7360-v2-using-incorrect-image.patch b/patches/openwrt/0007-xrx200-migrate-fritz7360-v2-using-incorrect-image.patch similarity index 100% rename from patches/openwrt/0009-xrx200-migrate-fritz7360-v2-using-incorrect-image.patch rename to patches/openwrt/0007-xrx200-migrate-fritz7360-v2-using-incorrect-image.patch diff --git a/patches/openwrt/0008-hostapd-don-t-select-indoor-channel-on-outdoor-operation.patch b/patches/openwrt/0008-hostapd-don-t-select-indoor-channel-on-outdoor-operation.patch deleted file mode 100644 index 4d3909e2..00000000 --- a/patches/openwrt/0008-hostapd-don-t-select-indoor-channel-on-outdoor-operation.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: David Bauer -Date: Sat, 10 Sep 2022 01:06:02 +0200 -Subject: hostapd: don't select indoor channel on outdoor operation - -Don't select channels designated for exclusive-indoor use when the -country3 element is set on outdoor operation. - -Signed-off-by: David Bauer -(cherry picked from commit 5110cf7ebdd5af57f98fe4581ce4c5ddb0a2bf86) - -diff --git a/package/network/services/hostapd/patches/800-acs-don-t-select-indoor-channel-on-outdoor-operation.patch b/package/network/services/hostapd/patches/800-acs-don-t-select-indoor-channel-on-outdoor-operation.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..96ebdefae9e710a350fa44a359896071b142af67 ---- /dev/null -+++ b/package/network/services/hostapd/patches/800-acs-don-t-select-indoor-channel-on-outdoor-operation.patch -@@ -0,0 +1,58 @@ -+From 37528a5205cb0b9e2238b7d97fb2ff5457448f1c Mon Sep 17 00:00:00 2001 -+From: David Bauer -+Date: Thu, 8 Sep 2022 01:45:41 +0200 -+Subject: [PATCH] acs: don't select indoor channel on outdoor operation -+ -+Don't select channels designated for exclusive-indoor use when the -+country3 element is set on outdoor operation. -+ -+Signed-off-by: David Bauer -+--- -+ src/ap/acs.c | 9 +++++++++ -+ src/ap/dfs.c | 3 +++ -+ 2 files changed, 12 insertions(+) -+ -+--- a/src/ap/acs.c -++++ b/src/ap/acs.c -+@@ -552,6 +552,9 @@ static void acs_survey_mode_interference -+ if (chan->max_tx_power < iface->conf->min_tx_power) -+ continue; -+ -++ if (chan->flag & HOSTAPD_CHAN_INDOOR_ONLY && iface->conf->country[2] == 0x4f) -++ continue; -++ -+ wpa_printf(MSG_DEBUG, "ACS: Survey analysis for channel %d (%d MHz)", -+ chan->chan, chan->freq); -+ -+@@ -686,6 +689,9 @@ acs_find_ideal_chan_mode(struct hostapd_ -+ if (chan->max_tx_power < iface->conf->min_tx_power) -+ continue; -+ -++ if (chan->flag & HOSTAPD_CHAN_INDOOR_ONLY && iface->conf->country[2] == 0x4f) -++ continue; -++ -+ if (!chan_bw_allowed(chan, bw, 1, 1)) { -+ wpa_printf(MSG_DEBUG, -+ "ACS: Channel %d: BW %u is not supported", -+@@ -1065,6 +1071,9 @@ static int * acs_request_scan_add_freqs( -+ if (chan->max_tx_power < iface->conf->min_tx_power) -+ continue; -+ -++ if (chan->flag & HOSTAPD_CHAN_INDOOR_ONLY && iface->conf->country[2] == 0x4f) -++ continue; -++ -+ *freq++ = chan->freq; -+ } -+ -+--- a/src/ap/dfs.c -++++ b/src/ap/dfs.c -+@@ -282,6 +282,9 @@ static int dfs_find_channel(struct hosta -+ if (chan->max_tx_power < iface->conf->min_tx_power) -+ continue; -+ -++ if (chan->flag & HOSTAPD_CHAN_INDOOR_ONLY && iface->conf->country[2] == 0x4f) -++ continue; -++ -+ if (ret_chan && idx == channel_idx) { -+ wpa_printf(MSG_DEBUG, "Selected channel %d (%d)", -+ chan->freq, chan->chan); diff --git a/patches/openwrt/0010-kconfig-abort-configuration-on-unset-symbol.patch b/patches/openwrt/0010-kconfig-abort-configuration-on-unset-symbol.patch deleted file mode 100644 index 5116508c..00000000 --- a/patches/openwrt/0010-kconfig-abort-configuration-on-unset-symbol.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: David Bauer -Date: Fri, 11 Nov 2022 13:37:07 +0100 -Subject: kconfig: abort configuration on unset symbol - -This fixes the initial patch to cover all cases where unset symbols are -handled in the code. - -Fixes commit eaa9c94c7574 ("generic: Kconfig: exit on unset symbol") - -Signed-off-by: David Bauer - -diff --git a/target/linux/generic/hack-5.10/205-kconfig-abort-configuration-on-unset-symbol.patch b/target/linux/generic/hack-5.10/205-kconfig-abort-configuration-on-unset-symbol.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..bd5c54d4b8b73b36c9f5b809447a8e76fce19e5d ---- /dev/null -+++ b/target/linux/generic/hack-5.10/205-kconfig-abort-configuration-on-unset-symbol.patch -@@ -0,0 +1,41 @@ -+From 310e8e04a05d9eb43fa9dd7f00143300afcaa37a Mon Sep 17 00:00:00 2001 -+From: David Bauer -+Date: Fri, 11 Nov 2022 13:33:44 +0100 -+Subject: [PATCH] kconfig: abort configuration on unset symbol -+ -+When a target configuration has unset Kconfig symbols, the build will -+fail when OpenWrt is compiled with V=s and stdin is connected to a tty. -+ -+In case OpenWrt is compiled without either of these preconditions, the -+build will succeed with the symbols in question being unset. -+ -+Modify the kernel configuration in a way it fails on unset symbols -+regardless of the aforementioned preconditions. -+ -+Signed-off-by: David Bauer -+--- -+ scripts/kconfig/conf.c | 6 ++++++ -+ 1 file changed, 6 insertions(+) -+ -+--- a/scripts/kconfig/conf.c -++++ b/scripts/kconfig/conf.c -+@@ -109,6 +109,9 @@ static int conf_askvalue(struct symbol * -+ } -+ /* fall through */ -+ case oldaskconfig: -++ if (!tty_stdio && getenv("FAIL_ON_UNCONFIGURED")) { -++ exit(1); -++ } -+ fflush(stdout); -+ xfgets(line, sizeof(line), stdin); -+ return 1; -+@@ -303,6 +306,9 @@ static int conf_choice(struct menu *menu -+ } -+ /* fall through */ -+ case oldaskconfig: -++ if (!tty_stdio && getenv("FAIL_ON_UNCONFIGURED")) { -++ exit(1); -++ } -+ fflush(stdout); -+ xfgets(line, sizeof(line), stdin); -+ strip(line); -diff --git a/target/linux/generic/hack-5.10/205-kconfig-exit.patch b/target/linux/generic/hack-5.10/205-kconfig-exit.patch -deleted file mode 100644 -index c3fb7a1f999e56da34b0a15565ce36098cfba7fb..0000000000000000000000000000000000000000 ---- a/target/linux/generic/hack-5.10/205-kconfig-exit.patch -+++ /dev/null -@@ -1,11 +0,0 @@ ----- a/scripts/kconfig/conf.c --+++ b/scripts/kconfig/conf.c --@@ -215,6 +215,8 @@ static int conf_sym(struct menu *menu) -- break; -- continue; -- case 0: --+ if (!sym_has_value(sym) && !tty_stdio && getenv("FAIL_ON_UNCONFIGURED")) --+ exit(1); -- newval = oldval; -- break; -- case '?': diff --git a/patches/openwrt/0011-ath79-combine-OCEDO-dual-firmware-partitions.patch b/patches/openwrt/0011-ath79-combine-OCEDO-dual-firmware-partitions.patch deleted file mode 100644 index 1a217ca0..00000000 --- a/patches/openwrt/0011-ath79-combine-OCEDO-dual-firmware-partitions.patch +++ /dev/null @@ -1,115 +0,0 @@ -From: David Bauer -Date: Tue, 15 Nov 2022 15:25:40 +0100 -Subject: ath79: combine OCEDO dual firmware-partitions - -In order to maximize the available space on OCEDO boards using a -dual-image partition layout, combine the two OS partitions into a single -partition. - -This allows users to access more usable space for additional packages. - -Don't limit the usable image size to the size of a single OS partition. -The initial installation has to be done with an older version of OpenWrt -in case the generated image exceeds the space of a single OS -partition in the future. - -Signed-off-by: David Bauer -(cherry picked from commit eded295cd7fd53bfa5afcb67a1b91cfda0523ba6) - -diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts -index 0bbeb2b533b3fbbdcce53e094412d459ee762d85..3ecd20e2aa8fe04164cddbc84e0eb800e049c011 100644 ---- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts -+++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts -@@ -91,15 +91,10 @@ - }; - - partition@50000 { -+ /* Dual-Flash layout combined */ - compatible = "denx,uimage"; - label = "firmware"; -- reg = <0x050000 0x740000>; -- }; -- -- partition@790000 { -- label = "vendor"; -- reg = <0x790000 0x740000>; -- read-only; -+ reg = <0x050000 0xe80000>; - }; - - partition@ed0000 { -diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts -index 66f8c6589b20221edc41a2f882b28229ff8633b9..de9e1bc19c4d03707f5b921ee5e9fe7422f461bb 100644 ---- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts -+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts -@@ -88,15 +88,10 @@ - }; - - partition@50000 { -+ /* Dual-Flash layout combined */ - compatible = "denx,uimage"; - label = "firmware"; -- reg = <0x050000 0x740000>; -- }; -- -- partition@790000 { -- label = "vendor"; -- reg = <0x790000 0x740000>; -- read-only; -+ reg = <0x050000 0xe80000>; - }; - - partition@ed0000 { -diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts -index 2dc4c07e918c50eb522100eb7f72c8804d5ba5fb..f8b3681bb7f143a498d5cb64897af335b970c43b 100644 ---- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts -+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts -@@ -59,15 +59,10 @@ - }; - - partition@50000 { -+ /* Dual-Flash layout combined */ - compatible = "denx,uimage"; - label = "firmware"; -- reg = <0x050000 0x740000>; -- }; -- -- partition@790000 { -- label = "vendor"; -- reg = <0x790000 0x740000>; -- read-only; -+ reg = <0x050000 0xe80000>; - }; - - partition@ed0000 { -diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index f1542e4e38f7540dd9facf4c40f0b271b9ea1e45..87d01a42eda274f9197f3382d955b87ecf615f7d 100644 ---- a/target/linux/ath79/image/generic.mk -+++ b/target/linux/ath79/image/generic.mk -@@ -1803,7 +1803,7 @@ define Device/ocedo_koala - DEVICE_MODEL := Koala - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct - SUPPORTED_DEVICES += koala -- IMAGE_SIZE := 7424k -+ IMAGE_SIZE := 14848k - endef - TARGET_DEVICES += ocedo_koala - -@@ -1811,7 +1811,7 @@ define Device/ocedo_raccoon - SOC := ar9344 - DEVICE_VENDOR := Ocedo - DEVICE_MODEL := Raccoon -- IMAGE_SIZE := 7424k -+ IMAGE_SIZE := 14848k - endef - TARGET_DEVICES += ocedo_raccoon - -@@ -1820,7 +1820,7 @@ define Device/ocedo_ursus - DEVICE_VENDOR := Ocedo - DEVICE_MODEL := Ursus - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct -- IMAGE_SIZE := 7424k -+ IMAGE_SIZE := 14848k - endef - TARGET_DEVICES += ocedo_ursus - diff --git a/patches/openwrt/0012-ath79-combine-UniFi-AC-dual-firmware-partitions.patch b/patches/openwrt/0012-ath79-combine-UniFi-AC-dual-firmware-partitions.patch deleted file mode 100644 index a67277f0..00000000 --- a/patches/openwrt/0012-ath79-combine-UniFi-AC-dual-firmware-partitions.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: David Bauer -Date: Thu, 17 Nov 2022 22:53:33 +0100 -Subject: ath79: combine UniFi AC dual firmware-partitions - -In order to maximize the available space on UniFi AC boards using a -dual-image partition layout, combine the two OS partitions into a single -partition. - -This allows users to access more usable space for additional packages. - -Don't limit the usable image size to the size of a single OS partition. -The initial installation has to be done with an older version of OpenWrt -in case the generated image exceeds the space of a single kernel -partition in the future. - -Signed-off-by: David Bauer -(cherry picked from commit e4a76673ff4f655ba0698d9edb9efbacd0f82fff) - -diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi -index 2e407c348642cf5145f79c15288856fa141b0512..6704ec983b0beed5421a59f663cf8db6d650f559 100644 ---- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi -+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi -@@ -69,17 +69,12 @@ - }; - - partition@70000 { -+ /* Combine kernel0 & kernel1 */ - label = "firmware"; -- reg = <0x070000 0x790000>; -+ reg = <0x070000 0xf20000>; - compatible = "denx,uimage"; - }; - -- partition@800000 { -- label = "kernel1"; -- reg = <0x800000 0x790000>; -- read-only; -- }; -- - partition@f90000 { - label = "bs"; - reg = <0xf90000 0x020000>; -diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk -index 7642c59e02848741996d6f9dcaf923d5dbaf6880..d6898c79d6b4d51d19813781e086db8086537318 100644 ---- a/target/linux/ath79/image/generic-ubnt.mk -+++ b/target/linux/ath79/image/generic-ubnt.mk -@@ -221,7 +221,7 @@ TARGET_DEVICES += ubnt_unifi - define Device/ubnt_unifiac - DEVICE_VENDOR := Ubiquiti - SOC := qca9563 -- IMAGE_SIZE := 7744k -+ IMAGE_SIZE := 15488k - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct - endef - diff --git a/patches/packages/routing/0004-oonf-olsrd2-add-support-to-check-if-service-is-running.patch b/patches/packages/routing/0004-oonf-olsrd2-add-support-to-check-if-service-is-running.patch index 4b8c9aad..9d3bddfe 100644 --- a/patches/packages/routing/0004-oonf-olsrd2-add-support-to-check-if-service-is-running.patch +++ b/patches/packages/routing/0004-oonf-olsrd2-add-support-to-check-if-service-is-running.patch @@ -3,18 +3,19 @@ Date: Sun, 10 Apr 2022 01:58:41 +0200 Subject: oonf-olsrd2: add support to check if service is running diff --git a/oonf-olsrd2/files/olsrd2.init b/oonf-olsrd2/files/olsrd2.init -index debae9883258b821a5ea0aecebe879ddc84e29eb..b6c1e9a5522788005db850ceaf6699aa1eee6877 100755 +index 04b30ffa4a7a4d65e2fb9944e4570273a9418f2e..f516b1b17e32b7eba7c4d485d72a123c87fb52f6 100755 --- a/oonf-olsrd2/files/olsrd2.init +++ b/oonf-olsrd2/files/olsrd2.init -@@ -3,4 +3,11 @@ - START=82 - DAEMON='olsrd2' +@@ -5,4 +5,12 @@ DAEMON='olsrd2' -+running() { -+ test -e "/tmp/run/olsrd2.pid" && test -e "/proc/$(cat "/tmp/run/olsrd2.pid")" && return 0 -+ return 1 -+} + [ -n "$IPKG_INSTROOT" ] || { + . /lib/functions/oonf_init.sh + -+extra_command "running" "Check if service is running" ++ running() { ++ test -e "/tmp/run/olsrd2.pid" && test -e "/proc/$(cat "/tmp/run/olsrd2.pid")" && return 0 ++ return 1 ++ } ++ ++ extra_command "running" "Check if service is running" + } + - . /lib/functions/oonf_init.sh