[RFC PATCH 1/4] mac80211: Update to version 5.8.18-test2
The removed patches were applied upstream.
Signed-off-by: Hauke Mehrtens
---
package/kernel/mac80211/Makefile | 8 +-
.../patches/ath/404-regd_no_assoc_hints.patch | 4 +-
...und-bug-with-some-inconsistent-BSSes.patch | 2 +-
...62-brcmfmac-Disable-power-management.patch | 2 +-
.../mac80211/patches/brcm/998-survey.patch| 8 +-
.../patches/build/050-lib80211_option.patch | 3 +-
.../110-mac80211_keep_keys_on_stop_ap.patch | 2 +-
.../mac80211/patches/subsys/210-ap_scan.patch | 2 +-
.../300-mac80211-optimize-skb-resizing.patch | 2 +-
...unction-for-running-rx-without-passi.patch | 14 +--
...ce-packet-loss-event-false-positives.patch | 116 --
...-AQL-aggregation-estimation-for-low-.patch | 6 +-
...e-duplication-in-tx-status-functions.patch | 6 +-
...-optimize-station-connection-monitor.patch | 6 +-
...ED_TXPROCESSING-and-HW_80211_ENCAP-t.patch | 2 +-
...the-driver-when-a-sta-uses-4-address.patch | 2 +-
...allow-bigger-VHT-MPDUs-than-the-hard.patch | 34 -
...11-fix-misplaced-while-instead-of-if.patch | 31 -
.../500-mac80211_configure_antenna_gain.patch | 6 +-
19 files changed, 38 insertions(+), 218 deletions(-)
delete mode 100644
package/kernel/mac80211/patches/subsys/310-mac80211-reduce-packet-loss-event-false-positives.patch
delete mode 100644
package/kernel/mac80211/patches/subsys/331-mac80211-do-not-allow-bigger-VHT-MPDUs-than-the-hard.patch
delete mode 100644
package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 8448350acf5e..e0d2e4087883 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mac80211
-PKG_VERSION:=5.8-1
-PKG_RELEASE:=2
-PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.8/
-PKG_HASH:=19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b
+PKG_VERSION:=5.8.18-test2
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=https://hauke-m.de/files/backports-test/
+PKG_HASH:=8bbb49a25b7138eae3a3557915264b0cb6ccc81bdfbc663f707f242e03fdf5a7
PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)
diff --git a/package/kernel/mac80211/patches/ath/404-regd_no_assoc_hints.patch
b/package/kernel/mac80211/patches/ath/404-regd_no_assoc_hints.patch
index 89e26af763f3..020e2bbab51b 100644
--- a/package/kernel/mac80211/patches/ath/404-regd_no_assoc_hints.patch
+++ b/package/kernel/mac80211/patches/ath/404-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -3042,6 +3042,8 @@ void regulatory_hint_country_ie(struct w
+@@ -3045,6 +3045,8 @@ void regulatory_hint_country_ie(struct w
enum environment_cap env = ENVIRON_ANY;
struct regulatory_request *request = NULL, *lr;
@@ -9,7 +9,7 @@
/* IE len must be evenly divisible by 2 */
if (country_ie_len & 0x01)
return;
-@@ -3293,6 +3295,7 @@ static bool is_wiphy_all_set_reg_flag(en
+@@ -3296,6 +3298,7 @@ static bool is_wiphy_all_set_reg_flag(en
void regulatory_hint_disconnect(void)
{
diff --git
a/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
b/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
index 069aab82497c..4e79111377fc 100644
---
a/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
+++
b/package/kernel/mac80211/patches/brcm/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
@@ -10,7 +10,7 @@ Signed-off-by: Rafał Miłecki
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -712,8 +712,36 @@ static struct wireless_dev *brcmf_cfg802
+@@ -714,8 +714,36 @@ static struct wireless_dev *brcmf_cfg802
struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
struct brcmf_pub *drvr = cfg->pub;
struct wireless_dev *wdev;
diff --git
a/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch
b/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch
index 8a20ae133a96..91bf464ede55 100644
---
a/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch
+++
b/package/kernel/mac80211/patches/brcm/862-brcmfmac-Disable-power-management.patch
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -2953,6 +2953,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip
+@@ -2955,6 +2955,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip
* preference in cfg struct to apply this to
* FW later while initializing the dongle
[RFC PATCH 4/4] iw: Update to version 5.9
---
package/network/utils/iw/Makefile | 4 +-
.../utils/iw/patches/001-nl80211_h_sync.patch | 354 +-
.../utils/iw/patches/200-reduce_size.patch| 6 +-
3 files changed, 11 insertions(+), 353 deletions(-)
diff --git a/package/network/utils/iw/Makefile
b/package/network/utils/iw/Makefile
index 90e678291170..6db9aaf105ae 100644
--- a/package/network/utils/iw/Makefile
+++ b/package/network/utils/iw/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=iw
-PKG_VERSION:=5.8
+PKG_VERSION:=5.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/software/network/iw
-PKG_HASH:=b59c4bacb0b6675cc09f2f30ebdceb91174cb65443d0a062fba2c09fad772db4
+PKG_HASH:=293a07109aeb7e36267cf59e3ce52857e9ffae3aeb8ac77894b1839fe1f2
PKG_MAINTAINER:=Felix Fietkau
PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/iw/patches/001-nl80211_h_sync.patch
b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
index 394acbd0e7d6..c944e02ba65b 100644
--- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch
+++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
@@ -1,363 +1,21 @@
--- a/nl80211.h
+++ b/nl80211.h
-@@ -252,9 +252,13 @@
- * DOC: SAE authentication offload
+@@ -2527,6 +2527,9 @@ enum nl80211_commands {
+ *override mask. Used with NL80211_ATTR_S1G_CAPABILITY in
+ *NL80211_CMD_ASSOCIATE or NL80211_CMD_CONNECT.
*
- * By setting @NL80211_EXT_FEATURE_SAE_OFFLOAD flag drivers can indicate they
-- * support offloading SAE authentication for WPA3-Personal networks. In
-- * %NL80211_CMD_CONNECT the password for SAE should be specified using
-- * %NL80211_ATTR_SAE_PASSWORD.
-+ * support offloading SAE authentication for WPA3-Personal networks in station
-+ * mode. Similarly @NL80211_EXT_FEATURE_SAE_OFFLOAD_AP flag can be set by
-+ * drivers indicating the offload support in AP mode.
-+ *
-+ * The password for SAE should be specified using %NL80211_ATTR_SAE_PASSWORD
in
-+ * %NL80211_CMD_CONNECT and %NL80211_CMD_START_AP for station and AP mode
-+ * respectively.
- */
-
- /**
-@@ -647,13 +651,9 @@
- *authentication/association or not receiving a response from the AP.
- *Non-zero %NL80211_ATTR_STATUS_CODE value is indicated in that case as
- *well to remain backwards compatible.
-- *When establishing a security association, drivers that support 4 way
-- *handshake offload should send %NL80211_CMD_PORT_AUTHORIZED event when
-- *the 4 way handshake is completed successfully.
- * @NL80211_CMD_ROAM: Notification indicating the card/driver roamed by
itself.
-- *When a security association was established with the new AP (e.g. if
-- *the FT protocol was used for roaming or the driver completed the 4 way
-- *handshake), this event should be followed by an
-+ *When a security association was established on an 802.1X network using
-+ *fast transition, this event should be followed by an
- *%NL80211_CMD_PORT_AUTHORIZED event.
- * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
- *userspace that a connection was dropped by the AP or due to other
-@@ -1067,13 +1067,11 @@
- * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously
- *configured PMK for the authenticator address identified by
- *%NL80211_ATTR_MAC.
-- * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates that the 4 way
-- *handshake was completed successfully by the driver. The BSSID is
-- *specified with %NL80211_ATTR_MAC. Drivers that support 4 way handshake
-- *offload should send this event after indicating 802.11 association with
-- *%NL80211_CMD_CONNECT or %NL80211_CMD_ROAM. If the 4 way handshake failed
-- *%NL80211_CMD_DISCONNECT should be indicated instead.
-- *
-+ * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates an 802.1X FT roam was
-+ *completed successfully. Drivers that support 4 way handshake offload
-+ *should send this event after indicating 802.1X FT assocation with
-+ *%NL80211_CMD_ROAM. If the 4 way handshake failed %NL80211_CMD_DISCONNECT
-+ *should be indicated instead.
- * @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request
- *and RX notification. This command is used both as a request to transmit
- *a control port frame and as a notification that a control port frame
-@@ -2082,10 +2080,10 @@ enum nl80211_commands {
- *operation).
- * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE
information
- *for the time while performing a channel switch.
-- * @NL80211_ATTR_CSA_C_OFF_BEACON: An array of offsets (u16) to the channel
-- *switch counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
-- * @NL80211_ATTR_CSA_C_OFF_PRESP: An array of offsets (u16) to the channel
-- *switch counters in the probe response (%NL80211_ATTR_PROBE_RESP).
-+ * @NL80211_ATTR_CNTDWN_OFFS_BEACON: An array of offsets (u16) to the
[RFC PATCH 0/4] mac80211: Update to version 5.10-rc6
This updates mac80211 to backports version 5.10-rc6. This is currently only the test version, I will release official versions of backports in the next days and then update these patches. Kernel 5.10 should be an LTS kernel so we will get updates for it the next 5 years, I would prefer to use backports based on this version in our next release. Please test this and report error to me. The changes are also in my stating tree: https://git.openwrt.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mac80211-5.10 Hauke Mehrtens (4): mac80211: Update to version 5.8.18-test2 mac80211: Update to version 5.9.11-test3 mac80211: Update to version 5.10-rc6-test5 iw: Update to version 5.9 .../ath10k-ct/patches/300-mac80211-5.10.patch | 24 + package/kernel/mac80211/Makefile |8 +- .../patches/ath/404-regd_no_assoc_hints.patch |4 +- .../ath/410-ath9k_allow_adhoc_and_ap.patch|2 +- .../ath/440-ath5k_channel_bw_debugfs.patch|4 +- ...abled-MFP-capability-unconditionally.patch |4 +- .../patches/ath/542-ath9k_debugfs_diag.patch |2 +- .../ath/543-ath9k_entropy_from_adc.patch |8 +- .../patches/ath/545-ath9k_ani_ws_detect.patch |2 +- .../ath/551-ath9k_ubnt_uap_plus_hsr.patch |8 +- .../patches/ath/553-ath9k_of_gpio_mask.patch |2 +- ...21-ath10k_init_devices_synchronously.patch |2 +- .../ath/930-ath10k_add_tpt_led_trigger.patch |4 +- ...rolling-support-for-various-chipsets.patch | 38 +- ...75-ath10k-use-tpt-trigger-by-default.patch |4 +- ...980-ath10k-fix-max-antenna-gain-unit.patch |6 +- ...-power-reduction-for-US-regulatory-d.patch |8 +- .../810-b43-gpio-mask-module-option.patch |2 +- .../patches/brcm/811-b43_no_pio.patch |2 +- .../brcm/812-b43-add-antenna-control.patch| 16 +- .../814-b43-only-use-gpio-0-1-for-led.patch |2 +- ...-register-wiphy-s-during-module_init.patch |2 +- ...und-bug-with-some-inconsistent-BSSes.patch |2 +- ...62-brcmfmac-Disable-power-management.patch |2 +- ...-in-driver-tables-with-country-codes.patch |2 +- .../mac80211/patches/brcm/998-survey.patch| 12 +- .../patches/build/050-lib80211_option.patch |3 +- .../patches/build/060-no_local_ssb_bcma.patch | 16 +- .../602-rt2x00-introduce-rt2x00eeprom.patch |6 +- .../611-rt2x00-add-AP+STA-support.patch |2 +- .../612-rt2x00-led-tpt-trigger-support.patch |2 +- ...backports-add-netif_receive_skb_list.patch | 30 - .../071-backports-add-skb_list_del_init.patch | 24 - ...072-backports-add-sched_set_fifo_low.patch | 32 - ...-backport-tasklet_setup-from_tasklet.patch | 35 - .../100-remove-cryptoapi-dependencies.patch |6 +- .../110-mac80211_keep_keys_on_stop_ap.patch |2 +- .../mac80211/patches/subsys/210-ap_scan.patch |2 +- .../300-mac80211-optimize-skb-resizing.patch | 65 +- ...domize-BA-session-dialog-token-alloc.patch |2 +- ...11-improve-AQL-tx-airtime-estimation.patch | 81 -- ...unction-for-running-rx-without-passi.patch | 186 --- ...skb_get_hash-instead-of-skb_get_hash.patch | 55 - ...lcate-skb-hash-early-when-using-itxq.patch | 19 - ...ce-packet-loss-event-false-positives.patch | 116 -- ...e-provided-via-status-rate-on-ieee80.patch | 151 --- ...out-code-to-look-up-the-average-pack.patch | 187 --- ...-AQL-aggregation-estimation-for-low-.patch | 67 - ...sing-queue-hash-initialization-to-80.patch | 25 - ...nd-refresh-aggregation-session-in-en.patch | 45 - ...cap-offload-for-tx-multicast-control.patch | 136 -- ...o-control.hw_key-for-encap-offload-p.patch | 31 - ...-rework-tx-encapsulation-offload-API.patch | 613 - ...e-duplication-in-tx-status-functions.patch | 197 --- ...tx-status-call-to-ieee80211_sta_regi.patch | 26 - ...-optimize-station-connection-monitor.patch | 174 --- ...ED_TXPROCESSING-and-HW_80211_ENCAP-t.patch | 227 ...02.3-offload-and-802.11-tx-status-co.patch | 159 --- ...-using-ieee80211_tx_status_ext-to-fr.patch | 63 - ...ieee80211_tx_status_ext-to-support-b.patch | 53 - ...the-driver-when-a-sta-uses-4-address.patch | 109 -- ...ize-code-to-remove-a-forward-declara.patch | 1110 - ...AQL-aggregation-estimation-to-HE-and.patch | 49 - ...-add-AQL-support-for-VHT160-tx-rates.patch | 23 - ...igger-A-MSDU-sizes-in-VHT-even-if-HT.patch | 26 - ...allow-bigger-VHT-MPDUs-than-the-hard.patch | 34 - ...regression-in-sta-connection-monitor.patch | 70 -- ...ory-leak-on-filtered-powersave-frame.patch | 55 - ...nstrel-remove-deferred-sampling-code.patch | 96 -- ...l-fix-tx-status-processing-corner-ca.patch | 26 - ...11-fix-misplaced-while-instead-of-if.patch | 31 - .../patches/subsys/400-allow-ibss-mixed.patch |2 +- .../500-mac80211_configure_antenna_gain.patch | 36 +- .../mt76/patches/100-mac80211-5.10.patch | 82 ++ package/network/utils/iw/Makefile |4 +-
Re: [PATCH 2/2] openvpn: remove
Felix you're the maintainer, more blessings? Also would you like to stay the maintainer or would e.g. Rosen like to adopt yet another package? Best On Di, Dez 1, 2020 at 12:37, Rosen Penev wrote: This will be moved to packages. Signed-off-by: Rosen Penev --- Acked-by: Paul Spooren .../services/openvpn/Config-mbedtls.in| 58 --- .../network/services/openvpn/Config-nossl.in | 50 -- .../services/openvpn/Config-openssl.in| 62 --- package/network/services/openvpn/Makefile | 158 -- .../files/etc/hotplug.d/openvpn/01-user | 22 - .../services/openvpn/files/etc/openvpn.user | 11 - .../openvpn/files/lib/functions/openvpn.sh| 16 - .../services/openvpn/files/openvpn.config | 474 -- .../services/openvpn/files/openvpn.init | 209 .../services/openvpn/files/openvpn.options| 194 --- .../services/openvpn/files/openvpn.upgrade| 1 - .../openvpn/files/usr/libexec/openvpn-hotplug | 10 - .../001-reproducible-remove_DATE.patch| 10 - ...bedtls-disable-runtime-version-check.patch | 11 - ...l-dont-use-deprecated-ssleay-symbols.patch | 58 --- ...enssl-add-missing-include-statements.patch | 65 --- .../210-build_always_use_internal_lz4.patch | 74 --- .../openvpn/patches/220-disable_des.patch | 81 --- 18 files changed, 1564 deletions(-) delete mode 100644 package/network/services/openvpn/Config-mbedtls.in delete mode 100644 package/network/services/openvpn/Config-nossl.in delete mode 100644 package/network/services/openvpn/Config-openssl.in delete mode 100644 package/network/services/openvpn/Makefile delete mode 100644 package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user delete mode 100644 package/network/services/openvpn/files/etc/openvpn.user delete mode 100644 package/network/services/openvpn/files/lib/functions/openvpn.sh delete mode 100644 package/network/services/openvpn/files/openvpn.config delete mode 100644 package/network/services/openvpn/files/openvpn.init delete mode 100644 package/network/services/openvpn/files/openvpn.options delete mode 100644 package/network/services/openvpn/files/openvpn.upgrade delete mode 100644 package/network/services/openvpn/files/usr/libexec/openvpn-hotplug delete mode 100644 package/network/services/openvpn/patches/001-reproducible-remove_DATE.patch delete mode 100644 package/network/services/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch delete mode 100644 package/network/services/openvpn/patches/110-openssl-dont-use-deprecated-ssleay-symbols.patch delete mode 100644 package/network/services/openvpn/patches/111-openssl-add-missing-include-statements.patch delete mode 100644 package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch delete mode 100644 package/network/services/openvpn/patches/220-disable_des.patch diff --git a/package/network/services/openvpn/Config-mbedtls.in b/package/network/services/openvpn/Config-mbedtls.in deleted file mode 100644 index beac492022..00 --- a/package/network/services/openvpn/Config-mbedtls.in +++ /dev/null @@ -1,58 +0,0 @@ -if PACKAGE_openvpn-mbedtls - -config OPENVPN_mbedtls_ENABLE_LZO - bool "Enable LZO compression support" - default y - -config OPENVPN_mbedtls_ENABLE_LZ4 - bool "Enable LZ4 compression support" - default y - -config OPENVPN_mbedtls_ENABLE_SERVER - bool "Enable server support (otherwise only client mode is support)" - default y - -#config OPENVPN_mbedtls_ENABLE_EUREPHIA -# bool "Enable support for the eurephia plug-in" -# default n - -config OPENVPN_mbedtls_ENABLE_MANAGEMENT - bool "Enable management server support" - default n - -#config OPENVPN_mbedtls_ENABLE_PKCS11 -# bool "Enable pkcs11 support" -# default n - -config OPENVPN_mbedtls_ENABLE_FRAGMENT - bool "Enable internal fragmentation support (--fragment)" - default y - -config OPENVPN_mbedtls_ENABLE_MULTIHOME - bool "Enable multi-homed UDP server support (--multihome)" - default y - -config OPENVPN_mbedtls_ENABLE_PORT_SHARE - bool "Enable TCP server port-share support (--port-share)" - default y - -config OPENVPN_mbedtls_ENABLE_DEF_AUTH - bool "Enable deferred authentication" - default y - -config OPENVPN_mbedtls_ENABLE_PF - bool "Enable internal packet filter" - default y - -config OPENVPN_mbedtls_ENABLE_IPROUTE2 - bool "Enable support for iproute2" - default n - -config OPENVPN_mbedtls_ENABLE_SMALL - bool "Enable size optimization" - default y - help - enable smaller executable size (disable OCC, usage - message, and verb 4 parm list) - -endif diff --git a/package/network/services/openvpn/Config-nossl.in b/package/network/services/openvpn/Config-nossl.in deleted file mode 100644 index 79140ad5d1..00 --- a/package/network/services/openvpn/Config-nossl.in +++
[PATCH 2/2] openvpn: remove
This will be moved to packages. Signed-off-by: Rosen Penev --- .../services/openvpn/Config-mbedtls.in| 58 --- .../network/services/openvpn/Config-nossl.in | 50 -- .../services/openvpn/Config-openssl.in| 62 --- package/network/services/openvpn/Makefile | 158 -- .../files/etc/hotplug.d/openvpn/01-user | 22 - .../services/openvpn/files/etc/openvpn.user | 11 - .../openvpn/files/lib/functions/openvpn.sh| 16 - .../services/openvpn/files/openvpn.config | 474 -- .../services/openvpn/files/openvpn.init | 209 .../services/openvpn/files/openvpn.options| 194 --- .../services/openvpn/files/openvpn.upgrade| 1 - .../openvpn/files/usr/libexec/openvpn-hotplug | 10 - .../001-reproducible-remove_DATE.patch| 10 - ...bedtls-disable-runtime-version-check.patch | 11 - ...l-dont-use-deprecated-ssleay-symbols.patch | 58 --- ...enssl-add-missing-include-statements.patch | 65 --- .../210-build_always_use_internal_lz4.patch | 74 --- .../openvpn/patches/220-disable_des.patch | 81 --- 18 files changed, 1564 deletions(-) delete mode 100644 package/network/services/openvpn/Config-mbedtls.in delete mode 100644 package/network/services/openvpn/Config-nossl.in delete mode 100644 package/network/services/openvpn/Config-openssl.in delete mode 100644 package/network/services/openvpn/Makefile delete mode 100644 package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user delete mode 100644 package/network/services/openvpn/files/etc/openvpn.user delete mode 100644 package/network/services/openvpn/files/lib/functions/openvpn.sh delete mode 100644 package/network/services/openvpn/files/openvpn.config delete mode 100644 package/network/services/openvpn/files/openvpn.init delete mode 100644 package/network/services/openvpn/files/openvpn.options delete mode 100644 package/network/services/openvpn/files/openvpn.upgrade delete mode 100644 package/network/services/openvpn/files/usr/libexec/openvpn-hotplug delete mode 100644 package/network/services/openvpn/patches/001-reproducible-remove_DATE.patch delete mode 100644 package/network/services/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch delete mode 100644 package/network/services/openvpn/patches/110-openssl-dont-use-deprecated-ssleay-symbols.patch delete mode 100644 package/network/services/openvpn/patches/111-openssl-add-missing-include-statements.patch delete mode 100644 package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch delete mode 100644 package/network/services/openvpn/patches/220-disable_des.patch diff --git a/package/network/services/openvpn/Config-mbedtls.in b/package/network/services/openvpn/Config-mbedtls.in deleted file mode 100644 index beac492022..00 --- a/package/network/services/openvpn/Config-mbedtls.in +++ /dev/null @@ -1,58 +0,0 @@ -if PACKAGE_openvpn-mbedtls - -config OPENVPN_mbedtls_ENABLE_LZO - bool "Enable LZO compression support" - default y - -config OPENVPN_mbedtls_ENABLE_LZ4 - bool "Enable LZ4 compression support" - default y - -config OPENVPN_mbedtls_ENABLE_SERVER - bool "Enable server support (otherwise only client mode is support)" - default y - -#config OPENVPN_mbedtls_ENABLE_EUREPHIA -# bool "Enable support for the eurephia plug-in" -# default n - -config OPENVPN_mbedtls_ENABLE_MANAGEMENT - bool "Enable management server support" - default n - -#config OPENVPN_mbedtls_ENABLE_PKCS11 -# bool "Enable pkcs11 support" -# default n - -config OPENVPN_mbedtls_ENABLE_FRAGMENT - bool "Enable internal fragmentation support (--fragment)" - default y - -config OPENVPN_mbedtls_ENABLE_MULTIHOME - bool "Enable multi-homed UDP server support (--multihome)" - default y - -config OPENVPN_mbedtls_ENABLE_PORT_SHARE - bool "Enable TCP server port-share support (--port-share)" - default y - -config OPENVPN_mbedtls_ENABLE_DEF_AUTH - bool "Enable deferred authentication" - default y - -config OPENVPN_mbedtls_ENABLE_PF - bool "Enable internal packet filter" - default y - -config OPENVPN_mbedtls_ENABLE_IPROUTE2 - bool "Enable support for iproute2" - default n - -config OPENVPN_mbedtls_ENABLE_SMALL - bool "Enable size optimization" - default y - help - enable smaller executable size (disable OCC, usage - message, and verb 4 parm list) - -endif diff --git a/package/network/services/openvpn/Config-nossl.in b/package/network/services/openvpn/Config-nossl.in deleted file mode 100644 index 79140ad5d1..00 --- a/package/network/services/openvpn/Config-nossl.in +++ /dev/null @@ -1,50 +0,0 @@ -if PACKAGE_openvpn-nossl - -config OPENVPN_nossl_ENABLE_LZO - bool "Enable LZO compression support" - default y - -config OPENVPN_nossl_ENABLE_LZ4 - bool "Enable LZ4 compression support" -
[PATCH 1/2] openvpn-easy-rsa: remove
This will be moved to packages.
Signed-off-by: Rosen Penev
---
.../services/openvpn-easy-rsa/Makefile| 69 ---
.../files/openvpn-easy-rsa.upgrade| 1 -
.../patches/101-static_EASYRSA.patch | 22 --
3 files changed, 92 deletions(-)
delete mode 100644 package/network/services/openvpn-easy-rsa/Makefile
delete mode 100644
package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade
delete mode 100644
package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch
diff --git a/package/network/services/openvpn-easy-rsa/Makefile
b/package/network/services/openvpn-easy-rsa/Makefile
deleted file mode 100644
index 0cf73950a6..00
--- a/package/network/services/openvpn-easy-rsa/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2010-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openvpn-easy-rsa
-
-PKG_VERSION:=3.0.4
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa/releases/download/v$(PKG_VERSION)/
-PKG_SOURCE:=EasyRSA-$(PKG_VERSION).tgz
-PKG_HASH:=472167f976c6cb7c860cec6150a5616e163ae20365c81f179811d6ee0779ec5a
-PKG_LICENSE:=GPL-2.0
-PKG_BUILD_DIR:=$(BUILD_DIR)/EasyRSA-$(PKG_VERSION)
-PKGARCH:=all
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openvpn-easy-rsa
- TITLE:=CLI utility to build and manage a PKI CA.
- SECTION:=net
- CATEGORY:=Network
- URL:=http://openvpn.net
- SUBMENU:=VPN
- DEPENDS:=+openssl-util
-endef
-
-define Package/openvpn-easy-rsa/conffiles
-/etc/easy-rsa/vars
-/etc/easy-rsa/openssl-1.0.cnf
-/etc/easy-rsa/openssl-easyrsa.cnf
-endef
-
-define Build/Configure
-
-endef
-
-define Build/Compile
-
-endef
-
-define Package/openvpn-easy-rsa/install
- $(INSTALL_DIR) $(1)/usr/bin
-
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/easyrsa $(1)/usr/bin/
- $(INSTALL_DIR) $(1)/etc/easy-rsa
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/openssl-easyrsa.cnf
$(1)/etc/easy-rsa/openssl-1.0.cnf
- $(LN) /etc/easy-rsa/openssl-1.0.cnf
$(1)/etc/easy-rsa/openssl-easyrsa.cnf
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/vars.example $(1)/etc/easy-rsa/vars
-
- $(INSTALL_DIR) $(1)/etc/easy-rsa/pki
- chmod 700 $(1)/etc/easy-rsa/pki
- $(INSTALL_DIR) $(1)/etc/easy-rsa/pki/private
- chmod 700 $(1)/etc/easy-rsa/pki/private
- $(INSTALL_DIR) $(1)/etc/easy-rsa/pki/reqs
- chmod 700 $(1)/etc/easy-rsa/pki/reqs
-
- $(INSTALL_DIR) $(1)/etc/easy-rsa/x509-types
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/x509-types/*
$(1)/etc/easy-rsa/x509-types/
-
- $(INSTALL_DIR) $(1)/lib/upgrade/keep.d
- $(INSTALL_DATA) files/openvpn-easy-rsa.upgrade
$(1)/lib/upgrade/keep.d/$(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,openvpn-easy-rsa))
diff --git
a/package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade
b/package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade
deleted file mode 100644
index 8110b81a46..00
--- a/package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade
+++ /dev/null
@@ -1 +0,0 @@
-/etc/easy-rsa/pki/
diff --git
a/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch
b/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch
deleted file mode 100644
index b81366c60b..00
--- a/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: EasyRSA-3.0.4/easyrsa
-===
EasyRSA-3.0.4.orig/easyrsa
-+++ EasyRSA-3.0.4/easyrsa
-@@ -1033,7 +1033,7 @@ vars_setup() {
- vars=
-
- # set up program path
-- prog_vars="${0%/*}/vars"
-+ prog_vars="/etc/easy-rsa/vars"
- # set up PKI path
- pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
-
-@@ -1060,7 +1060,7 @@ Note: using Easy-RSA configuration from:
- fi
-
- # Set defaults, preferring existing env-vars if present
-- set_var EASYRSA "${0%/*}"
-+ set_var EASYRSA "/etc/easy-rsa"
- set_var EASYRSA_OPENSSL openssl
- set_var EASYRSA_PKI "$PWD/pki"
- set_var EASYRSA_DN cn_only
--
2.28.0
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: odhcp6c RENEW timeout issue leads to OOM/OOPS [Was: Re: QEMU x86/64 ubus issues ... ]
Hi Petr, On Sat, Nov 28, 2020 at 8:48 PM Hans Dedecker wrote: > > Hi, > > On Sat, Nov 28, 2020 at 5:04 PM Petr Štetiar wrote: > > > > Hans Dedecker [2020-11-26 21:19:30]: > > > > Hi, > > > > > Is it possible to have a pcap trace of the DHCPv6 messages on the wan ? > > > I hope to find some time next weekend to investigate the issue further > > > > http://ynezz.true.cz/openwrt/odhcp6c/capture.pcap.gz# > Thank you for the traces; looking into the DHCPv6 packets make the issue > clear. > Packet 22 is a DHCPv6 reply packet in response to a renew which in its > turn is triggered by a DHCPv6 reconfigure packet. > The packet contains an IA-PD option but no IA prefix option which is > strange. According to the DHCPv6 RFC renew messages must be kept > sending when T1 has expired for either an IA address or IA prefix when > the server does not reply the IA address or IA prefix which is > happening in this case. > I will do further investigation how we could protect odhpc6c against > such DHCPv6 server behavior Can you check if commit https://git.openwrt.org/?p=project/odhcp6c.git;a=commit;h=a7b2221f687264c020b7a18a4e690d79f312a667 fixes the issue in your setup ? While doing the test can you put odhcp6c into verbose mode (-v) and take again a pcap trace on the wan ? Hans > > Hans > > > > Cheers, > > > > Petr ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
RE: [PATCH 2/2] ath79: mojo c-75: use second flash chip
> diff --git a/target/linux/ath79/image/generic.mk > b/target/linux/ath79/image/generic.mk > index 0f90c00b9c43..b7618a8ab33c 100644 > --- a/target/linux/ath79/image/generic.mk > +++ b/target/linux/ath79/image/generic.mk > @@ -1199,7 +1199,7 @@ define Device/mojo_c-75 >DEVICE_ALT0_VENDOR := WatchGuard >DEVICE_ALT0_MODEL := AP320 >DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k-ct kmod- > usb2 > - IMAGE_SIZE := 15936k > + IMAGE_SIZE := 32320k I'm not sure whether that's possible or whether the image itself is restricted to a single consecutive area to be written to (i.e. the flash can be concatenated and used, but the _image_ is limited to the first partition _in_ it) Best Adrian > endef > TARGET_DEVICES += mojo_c-75 > > -- > 2.29.2 > > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
RE: [PATCH 1/2] ath79: add support for Mojo Networks AirTight C-75
Hi,
> -Original Message-
> From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org]
> On Behalf Of Tomasz Maciej Nowak
> Sent: Dienstag, 1. Dezember 2020 18:36
> To: openwrt-devel@lists.openwrt.org
> Cc: Vladimir Georgievsky
> Subject: [PATCH 1/2] ath79: add support for Mojo Networks AirTight C-75
>
> Mojo Networks AirTight C-75 is a dual-band access point, also sold by
> WatchGuard under name AP320.
>
> Specification
> SoC: Qualcomm Atheros QCA9550
> RAM: 128 MiB DDR2
> Flash: 2x 16 MiB SPI NOR
> WIFI: 2.4 GHz 3T3R integrated
> 5 GHz 3T3R QCA9890 oversized Mini PCIe card
> Ethernet: 2x 10/100/1000 Mbps QCA8334
> port labeled LAN1 is PoE capable (802.3at)
> USB: 1x 2.0
> LEDs: 7x which two are GPIO controlled, four switch controlled, one
> controlled by wireless driver
> Buttons: 1x GPIO controlled
> Serial: RJ-45 port, Cisco pinout
> baud: 115200, parity: none, flow control: none
> JTAG: Yes, pins marked J1 on PCB
>
> Installation
> 1. Prepare TFTP server with OpenWrt initramfs-kernel image.
> 2. Connect to one of LAN ports.
> 3. Connect to serial port.
> 4. Power on the device and when prompted to stop autoboot, hit any key.
> 5. Adjust "ipaddr" and "serverip" addresses in U-Boot environment, use
>'setenv' to do that, then run following commands:
> tftpboot 0x8100
> bootm 0x8100
> 6. Wait about 1 minute for OpenWrt to boot.
> 7. Transfer OpenWrt sysupgrade image to /tmp directory and flash it
>with:
> sysupgrade -n /tmp/
> 8. After flashing, the access point will reboot to OpenWrt. Wait few
>minutes, until the Power LED stops blinking, then it's ready for
>configuration.
>
> Known issues
> Green power LED does not work.
>
> Additional information
> The U-Boot fails to initialise ethernet ports correctly when a UART adapter is
> attached to UART pins (marked J3 on PCB).
>
> Cc: Vladimir Georgievsky
> Signed-of-by: Tomasz Maciej Nowak
> ---
> package/boot/uboot-envtools/files/ath79 | 1 +
> target/linux/ath79/dts/qca9550_mojo_c-75.dts | 173
> ++
> .../generic/base-files/etc/board.d/02_network | 4 +
> target/linux/ath79/image/generic.mk | 11 ++
> 4 files changed, 189 insertions(+)
> create mode 100644 target/linux/ath79/dts/qca9550_mojo_c-75.dts
>
> diff --git a/package/boot/uboot-envtools/files/ath79
> b/package/boot/uboot-envtools/files/ath79
> index 259c52c77034..a6b52b370530 100644
> --- a/package/boot/uboot-envtools/files/ath79
> +++ b/package/boot/uboot-envtools/files/ath79
> @@ -20,6 +20,7 @@ alfa-network,n5q|\
> alfa-network,pi-wifi4|\
> alfa-network,r36a|\
> allnet,all-wap02860ac|\
> +airtight,c-75|\
This is inconsistent with the other names. See more detailed comment below.
> arduino,yun|\
> buffalo,bhr-4grv2|\
> devolo,magic-2-wifi|\
> diff --git a/target/linux/ath79/dts/qca9550_mojo_c-75.dts
> b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
> new file mode 100644
> index ..51046a740a02
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
> @@ -0,0 +1,173 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> +
> +#include
> +#include
> +
> +#include "qca955x.dtsi"
This include needs to be first (after the license).
> +
> +/ {
> + model = "Mojo Networks AirTight C-75";
> + compatible = "mojo,c-75", "qca,qca9550", "qca,qca9558";
Please decide for one name and then use that consistently. It appears to me
that both Mojo Networks and Airtight Networks are different _vendor_ names (due
to a rename)?
Then please decide for one and use that one consistently, i.e.
either
model = "Mojo Networks C-75";
compatible = "mojo,c-75", "qca,qca9550", "qca,qca9558";
or
model = "Airtight Networks C-75";
compatible = "airtight,c-75", "qca,qca9550", "qca,qca9558";
> +
> + aliases {
> + label-mac-device =
> + led-boot = _power;
> + led-failsafe = _power;
> + led-upgrade = _power;
No led-running?
> + };
> +
> + keys {
> + compatible = "gpio-keys";
> +
> + reset {
> + linux,code = ;
> + gpios = < 17 GPIO_ACTIVE_LOW>;
missing label?
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> +
> + led_power: power {
> + label = "amber:power";
> + gpios = < 14 GPIO_ACTIVE_HIGH>;
> + default-state = "on";
> + };
> +
> + wlan2g {
> + label = "green:wlan2g";
> + gpios = < 13 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "phy1tpt";
> + };
> + };
> +};
> +
> + {
> + status = "okay";
> +
> + mtd-mac-address = < 0x0>;
> + phy-handle = <>;
> + phy-mode = "rgmii";
> + pll-data = <0xa600 0x0101 0x1616>; };
> +
> + {
> + status = "okay";
> +
>
RE: [PATCH] ath79: restore sysupgrade support for ja76pf2 and routerstations
> I'm fine with using that command and moving it to image.mk. I'm planing to > move both ja76pf2 and routerstations images to use sysupgrade-tar, after > first ath79-only stable release, so I don't know if we should bother moving > the combine-image command. Ah, then it's probably a waste of time and I won't touch it. Best Adrian openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH] ath79: restore sysupgrade support for ja76pf2 and routerstations
Hi.
W dniu 01.12.2020 o 20:09, Adrian Schmutzler pisze:
> Hi,
>
>> -Original Message-
>> From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org]
>> On Behalf Of Tomasz Maciej Nowak
>> Sent: Dienstag, 1. Dezember 2020 18:30
>> To: openwrt-devel@lists.openwrt.org
>> Subject: [PATCH] ath79: restore sysupgrade support for ja76pf2 and
>> routerstations
>>
>> Because the bug described in FS#2428 has been fixed with bf2870c
>> ("kernel: fix mtd partition erase < parent_erasesize writes") these devices
>> can now safely do sysupgrade. Restore sysupgrade support disabled
>> in:
>> 0cc87b3 ("ath79: image: disable sysupgrade images for routerstations and
>> ja76pf2")
>> and
>> cc5256a ("ath79: base-files: disable sysupgrade for routerstations and
>> ja76pf2")
>
> I'm merging this one with a few minor adjustments.
>
>> +define Build/combined-image
>> +sh $(TOPDIR)/scripts/combined-image.sh \
>> +"$(IMAGE_KERNEL)" \
>> +"$@" \
>> +"$@.new"
>> +@mv $@.new $@
>> +endef
>
> I wonder whether we can merge this with the similar function from ath25 and
> put it back into image-commands.mk.
> The only difference seems that ath25 uses the $(IMAGE_ROOTFS) argument, while
> we use the rootfs set up in $@.
>
> Do you have an opinion on that?
I'm fine with using that command and moving it to image.mk. I'm planing to move
both ja76pf2 and routerstations images to use sysupgrade-tar, after first
ath79-only stable release, so I don't know if we should bother moving the
combine-image command.
>
> Best
>
> Adrian
>
Regards
--
TMN
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
RE: [PATCH] ath79: restore sysupgrade support for ja76pf2 and routerstations
Hi,
> -Original Message-
> From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org]
> On Behalf Of Tomasz Maciej Nowak
> Sent: Dienstag, 1. Dezember 2020 18:30
> To: openwrt-devel@lists.openwrt.org
> Subject: [PATCH] ath79: restore sysupgrade support for ja76pf2 and
> routerstations
>
> Because the bug described in FS#2428 has been fixed with bf2870c
> ("kernel: fix mtd partition erase < parent_erasesize writes") these devices
> can now safely do sysupgrade. Restore sysupgrade support disabled
> in:
> 0cc87b3 ("ath79: image: disable sysupgrade images for routerstations and
> ja76pf2")
> and
> cc5256a ("ath79: base-files: disable sysupgrade for routerstations and
> ja76pf2")
I'm merging this one with a few minor adjustments.
> +define Build/combined-image
> + sh $(TOPDIR)/scripts/combined-image.sh \
> + "$(IMAGE_KERNEL)" \
> + "$@" \
> + "$@.new"
> + @mv $@.new $@
> +endef
I wonder whether we can merge this with the similar function from ath25 and put
it back into image-commands.mk.
The only difference seems that ath25 uses the $(IMAGE_ROOTFS) argument, while
we use the rootfs set up in $@.
Do you have an opinion on that?
Best
Adrian
openpgp-digital-signature.asc
Description: PGP signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
RE: Makefile warnings on master branch
Hi, > -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of X Xiao > Sent: Dienstag, 1. Dezember 2020 18:53 > To: openwrt-devel@lists.openwrt.org > Subject: Makefile warnings on master branch > > I did a git pull yesterday and saw the below warnings: > > WARNING: Makefile 'package/feeds/packages/apcupsd/Makefile' has a > dependency on 'libusb-compat', which does not exist > WARNING: Makefile 'package/feeds/packages/avrdude/Makefile' has a > dependency on 'libusb-compat', which does not exist > WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' > has a dependency on 'libnetfilter-cttimeout', which does not > existWARNING: Makefile > 'package/feeds/packages/conntrack-tools/Makefile' has a dependency on > 'libnetfilter-cthelper', which does not exist > WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' > has a dependency on 'libnetfilter-queue', which does not exist > WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' > has a dependency on 'libnetfilter-cttimeout', which does not exist > WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' > has a dependency on 'libnetfilter-cthelper', which does not exist > WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' > has a dependency on 'libnetfilter-queue', which does not exist > WARNING: Makefile 'package/feeds/packages/ulogd/Makefile' has a > dependency on 'libnetfilter-log', which does not exist these packages have been moved from main repo to feeds, so you need to update the feeds (and possibly install the new packages if you have actual dependencies on them). Best Adrian > > Recently related packages are removed from openwrt core base, but those > changes should not lead to warnings like above. How can I get rid of them? > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Makefile warnings on master branch
I did a git pull yesterday and saw the below warnings: WARNING: Makefile 'package/feeds/packages/apcupsd/Makefile' has a dependency on 'libusb-compat', which does not exist WARNING: Makefile 'package/feeds/packages/avrdude/Makefile' has a dependency on 'libusb-compat', which does not exist WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' has a dependency on 'libnetfilter-cttimeout', which does not existWARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' has a dependency on 'libnetfilter-cthelper', which does not exist WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' has a dependency on 'libnetfilter-queue', which does not exist WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' has a dependency on 'libnetfilter-cttimeout', which does not exist WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' has a dependency on 'libnetfilter-cthelper', which does not exist WARNING: Makefile 'package/feeds/packages/conntrack-tools/Makefile' has a dependency on 'libnetfilter-queue', which does not exist WARNING: Makefile 'package/feeds/packages/ulogd/Makefile' has a dependency on 'libnetfilter-log', which does not exist Recently related packages are removed from openwrt core base, but those changes should not lead to warnings like above. How can I get rid of them? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH] ath79: mojo c-75: use second flash chip
Please ignore this one, I've resent proper series. -- TMN ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 1/2] ath79: add support for Mojo Networks AirTight C-75
Mojo Networks AirTight C-75 is a dual-band access point, also sold by
WatchGuard under name AP320.
Specification
SoC: Qualcomm Atheros QCA9550
RAM: 128 MiB DDR2
Flash: 2x 16 MiB SPI NOR
WIFI: 2.4 GHz 3T3R integrated
5 GHz 3T3R QCA9890 oversized Mini PCIe card
Ethernet: 2x 10/100/1000 Mbps QCA8334
port labeled LAN1 is PoE capable (802.3at)
USB: 1x 2.0
LEDs: 7x which two are GPIO controlled, four switch controlled, one
controlled by wireless driver
Buttons: 1x GPIO controlled
Serial: RJ-45 port, Cisco pinout
baud: 115200, parity: none, flow control: none
JTAG: Yes, pins marked J1 on PCB
Installation
1. Prepare TFTP server with OpenWrt initramfs-kernel image.
2. Connect to one of LAN ports.
3. Connect to serial port.
4. Power on the device and when prompted to stop autoboot, hit any key.
5. Adjust "ipaddr" and "serverip" addresses in U-Boot environment, use
'setenv' to do that, then run following commands:
tftpboot 0x8100
bootm 0x8100
6. Wait about 1 minute for OpenWrt to boot.
7. Transfer OpenWrt sysupgrade image to /tmp directory and flash it
with:
sysupgrade -n /tmp/
8. After flashing, the access point will reboot to OpenWrt. Wait few
minutes, until the Power LED stops blinking, then it's ready for
configuration.
Known issues
Green power LED does not work.
Additional information
The U-Boot fails to initialise ethernet ports correctly when a UART
adapter is attached to UART pins (marked J3 on PCB).
Cc: Vladimir Georgievsky
Signed-of-by: Tomasz Maciej Nowak
---
package/boot/uboot-envtools/files/ath79 | 1 +
target/linux/ath79/dts/qca9550_mojo_c-75.dts | 173 ++
.../generic/base-files/etc/board.d/02_network | 4 +
target/linux/ath79/image/generic.mk | 11 ++
4 files changed, 189 insertions(+)
create mode 100644 target/linux/ath79/dts/qca9550_mojo_c-75.dts
diff --git a/package/boot/uboot-envtools/files/ath79
b/package/boot/uboot-envtools/files/ath79
index 259c52c77034..a6b52b370530 100644
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@@ -20,6 +20,7 @@ alfa-network,n5q|\
alfa-network,pi-wifi4|\
alfa-network,r36a|\
allnet,all-wap02860ac|\
+airtight,c-75|\
arduino,yun|\
buffalo,bhr-4grv2|\
devolo,magic-2-wifi|\
diff --git a/target/linux/ath79/dts/qca9550_mojo_c-75.dts
b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
new file mode 100644
index ..51046a740a02
--- /dev/null
+++ b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
@@ -0,0 +1,173 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include
+#include
+
+#include "qca955x.dtsi"
+
+/ {
+ model = "Mojo Networks AirTight C-75";
+ compatible = "mojo,c-75", "qca,qca9550", "qca,qca9558";
+
+ aliases {
+ label-mac-device =
+ led-boot = _power;
+ led-failsafe = _power;
+ led-upgrade = _power;
+ };
+
+ keys {
+ compatible = "gpio-keys";
+
+ reset {
+ linux,code = ;
+ gpios = < 17 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ led_power: power {
+ label = "amber:power";
+ gpios = < 14 GPIO_ACTIVE_HIGH>;
+ default-state = "on";
+ };
+
+ wlan2g {
+ label = "green:wlan2g";
+ gpios = < 13 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "phy1tpt";
+ };
+ };
+};
+
+ {
+ status = "okay";
+
+ mtd-mac-address = < 0x0>;
+ phy-handle = <>;
+ phy-mode = "rgmii";
+ pll-data = <0xa600 0x0101 0x1616>;
+};
+
+ {
+ status = "okay";
+
+ mtd-mac-address = < 0x6>;
+ phy-mode = "sgmii";
+ pll-data = <0x03000101 0x0101 0x1616>;
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+};
+
+ {
+ status = "okay";
+
+ phy0: ethernet-phy@0 {
+ reg = <0>;
+ qca,ar8327-initvals = <
+ 0x0c 0x00080080
+ 0x04 0x0760
+ 0x58 0xc935c935
+ 0x5c 0x0300
+ 0x7c 0x007e
+ 0x94 0x007e
+ >;
+ };
+};
+
+ {
+ status = "okay";
+
+ wifi@0,0 {
+ compatible = "qcom,ath10k";
+ reg = <0x 0 0 0 0>;
+ };
+};
+
+ {
+ status = "okay";
+
+ num-cs = <2>;
+
+ flash@0 {
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <2500>;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells =
[PATCH 2/2] ath79: mojo c-75: use second flash chip
The flash capacity is divided in two flash chips and currently only
first is used. Increase available space for OpenWrt by additional 16 MiB
using mtd-concat driver.
Cc: Vladimir Georgievsky
Signed-off-by: Tomasz Maciej Nowak
---
target/linux/ath79/dts/qca9550_mojo_c-75.dts | 24
target/linux/ath79/image/generic.mk | 2 +-
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/target/linux/ath79/dts/qca9550_mojo_c-75.dts
b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
index 51046a740a02..30cff65b39b5 100644
--- a/target/linux/ath79/dts/qca9550_mojo_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
@@ -40,6 +40,23 @@
linux,default-trigger = "phy1tpt";
};
};
+
+ mtd-concat {
+ compatible = "mtd-concat";
+ devices = < >;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "firmware";
+ reg = <0x0 0x1f9>;
+ compatible = "denx,uimage";
+ };
+ };
+ };
};
{
@@ -121,10 +138,8 @@
read-only;
};
- partition@6 {
- label = "firmware";
+ concat0: partition@6 {
reg = <0x06 0xf9>;
- compatible = "denx,uimage";
};
art: partition@ff {
@@ -145,8 +160,7 @@
#address-cells = <1>;
#size-cells = <1>;
- partition@0 {
- label = "opt";
+ concat1: partition@0 {
reg = <0x0 0x100>;
};
};
diff --git a/target/linux/ath79/image/generic.mk
b/target/linux/ath79/image/generic.mk
index 0f90c00b9c43..b7618a8ab33c 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1199,7 +1199,7 @@ define Device/mojo_c-75
DEVICE_ALT0_VENDOR := WatchGuard
DEVICE_ALT0_MODEL := AP320
DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k-ct kmod-usb2
- IMAGE_SIZE := 15936k
+ IMAGE_SIZE := 32320k
endef
TARGET_DEVICES += mojo_c-75
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] ath79: restore sysupgrade support for ja76pf2 and routerstations
Because the bug described in FS#2428 has been fixed with bf2870c
("kernel: fix mtd partition erase < parent_erasesize writes") these
devices can now safely do sysupgrade. Restore sysupgrade support disabled
in:
0cc87b3 ("ath79: image: disable sysupgrade images for routerstations and
ja76pf2")
and
cc5256a ("ath79: base-files: disable sysupgrade for routerstations and
ja76pf2")
Signed-off-by: Tomasz Maciej Nowak
---
.../ath79/generic/base-files/lib/upgrade/platform.sh | 4 ++--
target/linux/ath79/image/Makefile | 8
target/linux/ath79/image/generic-ubnt.mk | 3 ++-
target/linux/ath79/image/generic.mk | 3 ++-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
index 10756abbafd5..f4fca06384b1 100644
--- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
@@ -45,11 +45,11 @@ platform_do_upgrade() {
redboot_fis_do_upgrade "$1" vmlinux_2
;;
jjplus,ja76pf2)
- echo "Sysupgrade disabled due bug FS#2428"
+ redboot_fis_do_upgrade "$1" linux
;;
ubnt,routerstation|\
ubnt,routerstation-pro)
- echo "Sysupgrade disabled due bug FS#2428"
+ redboot_fis_do_upgrade "$1" kernel
;;
*)
default_do_upgrade "$1"
diff --git a/target/linux/ath79/image/Makefile
b/target/linux/ath79/image/Makefile
index 4b4a67fd4d54..92ddb15f28ae 100644
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -47,6 +47,14 @@ define Build/relocate-kernel
rm -rf $@.relocate
endef
+define Build/combined-image
+ sh $(TOPDIR)/scripts/combined-image.sh \
+ "$(IMAGE_KERNEL)" \
+ "$@" \
+ "$@.new"
+ @mv $@.new $@
+endef
+
define Device/Default
DEVICE_DTS_DIR := ../dts
diff --git a/target/linux/ath79/image/generic-ubnt.mk
b/target/linux/ath79/image/generic-ubnt.mk
index 6e12c34d8509..7c143519dc9f 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -310,9 +310,10 @@ define Device/ubnt_routerstation_common
DEVICE_VENDOR := Ubiquiti
SOC := ar7161
IMAGE_SIZE := 16128k
- IMAGES := factory.bin
+ IMAGES += factory.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \
check-size
+ IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image |
append-metadata | check-size (IMAGE_SIZE)
KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
KERNEL_INITRAMFS := kernel-bin | append-dtb
endef
diff --git a/target/linux/ath79/image/generic.mk
b/target/linux/ath79/image/generic.mk
index a0d5e7ab0190..0819bdbd2778 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1144,9 +1144,10 @@ define Device/jjplus_ja76pf2
DEVICE_VENDOR := jjPlus
DEVICE_MODEL := JA76PF2
DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-basic-wolfssl -uboot-envtools
fconfig
- IMAGES := kernel.bin rootfs.bin
+ IMAGES += kernel.bin rootfs.bin
IMAGE/kernel.bin := append-kernel
IMAGE/rootfs.bin := append-rootfs | pad-rootfs
+ IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image |
append-metadata | check-size (IMAGE_SIZE)
KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
KERNEL_INITRAMFS := kernel-bin | append-dtb
IMAGE_SIZE := 16000k
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] ath79: mojo c-75: use second flash chip
The flash capacity is divided in two flash chips and currently only
first is used. Increase available space for OpenWrt by additional 16 MiB
using mtd-concat driver.
Cc: Vladimir Georgievsky
Signed-off-by: Tomasz Maciej Nowak
---
target/linux/ath79/dts/qca9550_mojo_c-75.dts | 24
target/linux/ath79/image/generic.mk | 2 +-
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/target/linux/ath79/dts/qca9550_mojo_c-75.dts
b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
index 51046a740a02..30cff65b39b5 100644
--- a/target/linux/ath79/dts/qca9550_mojo_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_mojo_c-75.dts
@@ -40,6 +40,23 @@
linux,default-trigger = "phy1tpt";
};
};
+
+ mtd-concat {
+ compatible = "mtd-concat";
+ devices = < >;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "firmware";
+ reg = <0x0 0x1f9>;
+ compatible = "denx,uimage";
+ };
+ };
+ };
};
{
@@ -121,10 +138,8 @@
read-only;
};
- partition@6 {
- label = "firmware";
+ concat0: partition@6 {
reg = <0x06 0xf9>;
- compatible = "denx,uimage";
};
art: partition@ff {
@@ -145,8 +160,7 @@
#address-cells = <1>;
#size-cells = <1>;
- partition@0 {
- label = "opt";
+ concat1: partition@0 {
reg = <0x0 0x100>;
};
};
diff --git a/target/linux/ath79/image/generic.mk
b/target/linux/ath79/image/generic.mk
index 0f90c00b9c43..b7618a8ab33c 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1199,7 +1199,7 @@ define Device/mojo_c-75
DEVICE_ALT0_VENDOR := WatchGuard
DEVICE_ALT0_MODEL := AP320
DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k-ct kmod-usb2
- IMAGE_SIZE := 15936k
+ IMAGE_SIZE := 32320k
endef
TARGET_DEVICES += mojo_c-75
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 4/5] mvebu: sysupgrade: use v function for writing logs
Sync with x86 target changes.
Signed-off-by: Tomasz Maciej Nowak
---
v1->v2
Added commit message.
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 12 ++--
.../mvebu/cortexa9/base-files/lib/upgrade/linksys.sh | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
index ed332bf3e3ec..0f95b1b65971 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
@@ -3,7 +3,7 @@ platform_check_image_sdcard() {
local diskdev partdev diff
export_bootdevice && export_partdevice diskdev 0 || {
- echo "Unable to determine upgrade device"
+ v "Unable to determine upgrade device"
return 1
}
@@ -20,7 +20,7 @@ platform_check_image_sdcard() {
rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
if [ -n "$diff" ]; then
- echo "Partition layout has changed. Full image will be written."
+ v "Partition layout has changed. Full image will be written."
ask_bool 0 "Abort" && exit 1
return 0
fi
@@ -31,7 +31,7 @@ platform_do_upgrade_sdcard() {
local diskdev partdev diff
export_bootdevice && export_partdevice diskdev 0 || {
- echo "Unable to determine upgrade device"
+ v "Unable to determine upgrade device"
return 1
}
@@ -64,15 +64,15 @@ platform_do_upgrade_sdcard() {
#iterate over each partition from the image and write it to the
boot disk
while read part start size; do
if export_partdevice partdev $part; then
- echo "Writing image to /dev/$partdev..."
+ v "Writing image to /dev/$partdev..."
get_image_dd "$1" of="/dev/$partdev" ibs="512"
obs=1M skip="$start" count="$size" conv=fsync
else
- echo "Unable to find partition $part device,
skipped."
+ v "Unable to find partition $part device,
skipped."
fi
done < /tmp/partmap.image
#copy partition uuid
- echo "Writing new UUID to /dev/$diskdev..."
+ v "Writing new UUID to /dev/$diskdev..."
get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4
seek=440 conv=fsync
fi
diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
index 6ccfdd0768da..c5da471d76f1 100644
--- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
@@ -57,7 +57,7 @@ platform_do_upgrade_linksys() {
if [ ! -n "$part_label" ]
then
- echo "cannot find target partition"
+ v "cannot find target partition"
exit 1
fi
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 2/5] tegra: sysupgrade: remove check for number of arguments
This chunk got mistakenly removed from 30c95c4, since the get_image_dd
evaluates only first agument, so that check is useless.
Fixes: 30c95c4 ("tegra: sysupgrade: use get_image_dd wrapper")
Signed-off-by: Tomasz Maciej Nowak
---
New patch.
target/linux/tegra/base-files/lib/upgrade/platform.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh
b/target/linux/tegra/base-files/lib/upgrade/platform.sh
index 4b39b3e18230..715d1c1b8046 100644
--- a/target/linux/tegra/base-files/lib/upgrade/platform.sh
+++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh
@@ -3,8 +3,6 @@ REQUIRE_IMAGE_METADATA=1
platform_check_image() {
local diskdev partdev diff
- [ "$#" -gt 1 ] && return 1
-
export_bootdevice && export_partdevice diskdev 0 || {
v "Unable to determine upgrade device"
return 1
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 1/5] tegra: sysupgrade: use v function for writing logs
Sync with x86 target changes.
Signed-off-by: Tomasz Maciej Nowak
---
v1->v2
Add commit message.
.../linux/tegra/base-files/lib/upgrade/platform.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh
b/target/linux/tegra/base-files/lib/upgrade/platform.sh
index 4dd049519c76..4b39b3e18230 100644
--- a/target/linux/tegra/base-files/lib/upgrade/platform.sh
+++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh
@@ -6,7 +6,7 @@ platform_check_image() {
[ "$#" -gt 1 ] && return 1
export_bootdevice && export_partdevice diskdev 0 || {
- echo "Unable to determine upgrade device"
+ v "Unable to determine upgrade device"
return 1
}
@@ -23,7 +23,7 @@ platform_check_image() {
rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
if [ -n "$diff" ]; then
- echo "Partition layout has changed. Full image will be written."
+ v "Partition layout has changed. Full image will be written."
ask_bool 0 "Abort" && exit 1
return 0
fi
@@ -43,7 +43,7 @@ platform_do_upgrade() {
local diskdev partdev diff
export_bootdevice && export_partdevice diskdev 0 || {
- echo "Unable to determine upgrade device"
+ v "Unable to determine upgrade device"
return 1
}
@@ -79,14 +79,14 @@ platform_do_upgrade() {
#iterate over each partition from the image and write it to the boot
disk
while read part start size; do
if export_partdevice partdev $part; then
- echo "Writing image to /dev/$partdev..."
+ v "Writing image to /dev/$partdev..."
get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M
skip="$start" count="$size" conv=fsync
else
- echo "Unable to find partition $part device, skipped."
+ v "Unable to find partition $part device, skipped."
fi
done < /tmp/partmap.image
#copy partition uuid
- echo "Writing new UUID to /dev/$diskdev..."
+ v "Writing new UUID to /dev/$diskdev..."
get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440
conv=fsync
}
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] ath79: wlr-7100: remove device variant indicator
As reported by user, the same image works on both device variants which
are v1 001 and v1 002.
Signed-off-by: Tomasz Maciej Nowak
---
target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts | 2 +-
target/linux/ath79/image/generic.mk| 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
index 787b516056d0..2669db783eaa 100644
--- a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
+++ b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
@@ -6,7 +6,7 @@
#include
/ {
- model = "Sitecom WLR-7100 v1 002 (X7 AC1200)";
+ model = "Sitecom WLR-7100 (X7 AC1200)";
compatible = "sitecom,wlr-7100", "qca,ar9344";
aliases {
diff --git a/target/linux/ath79/image/generic.mk
b/target/linux/ath79/image/generic.mk
index a0d5e7ab0190..6ac8691f19ee 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1659,7 +1659,6 @@ define Device/sitecom_wlr-7100
SOC := ar1022
DEVICE_VENDOR := Sitecom
DEVICE_MODEL := WLR-7100
- DEVICE_VARIANT := v1 002
DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct-smallbuffers
kmod-usb2
IMAGES += factory.dlf
IMAGE/factory.dlf := append-kernel | pad-to (BLOCKSIZE) | \
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 5/5] mvebu: sysupgrade: write additional information to log output
This will explain what is actually occuring on dd invocations.
Additionally remove comments for steps which are described by printed
statements anyway.
Signed-off-by: Tomasz Maciej Nowak
---
v1->v2
Additional remark in commit message.
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
index 0f95b1b65971..caa726b4d529 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
@@ -9,7 +9,7 @@ platform_check_image_sdcard() {
get_partitions "/dev/$diskdev" bootdisk
- #extract the boot sector from the image
+ v "Extract boot sector from the image"
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
get_partitions /tmp/image.bs image
@@ -40,7 +40,7 @@ platform_do_upgrade_sdcard() {
if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk
- #extract the boot sector from the image
+ v "Extract boot sector from the image"
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
get_partitions /tmp/image.bs image
@@ -59,7 +59,7 @@ platform_do_upgrade_sdcard() {
partx -d - "/dev/$diskdev"
partx -a - "/dev/$diskdev"
else
- #write uboot image
+ v "Writing bootloader to /dev/$diskdev"
get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=2048
conv=fsync
#iterate over each partition from the image and write it to the
boot disk
while read part start size; do
@@ -71,7 +71,6 @@ platform_do_upgrade_sdcard() {
fi
done < /tmp/partmap.image
- #copy partition uuid
v "Writing new UUID to /dev/$diskdev..."
get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4
seek=440 conv=fsync
fi
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 3/5] tegra: sysupgrade: write additional information to log output
This will explain what is actually occuring on dd invocations.
Additionally remove comments for steps which are described by printed
statements anyway.
Signed-off-by: Tomasz Maciej Nowak
---
v1->v2
Additional remark in commit message
target/linux/tegra/base-files/lib/upgrade/platform.sh | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh
b/target/linux/tegra/base-files/lib/upgrade/platform.sh
index 715d1c1b8046..170bc11ba709 100644
--- a/target/linux/tegra/base-files/lib/upgrade/platform.sh
+++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh
@@ -10,7 +10,7 @@ platform_check_image() {
get_partitions "/dev/$diskdev" bootdisk
- #extract the boot sector from the image
+ v "Extract boot sector from the image"
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
get_partitions /tmp/image.bs image
@@ -50,7 +50,7 @@ platform_do_upgrade() {
if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk
- #extract the boot sector from the image
+ v "Extract boot sector from the image"
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
get_partitions /tmp/image.bs image
@@ -72,7 +72,7 @@ platform_do_upgrade() {
return 0
fi
- #write uboot image
+ v "Writing bootloader to /dev/$diskdev"
get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=4097
conv=fsync,notrunc
#iterate over each partition from the image and write it to the boot
disk
while read part start size; do
@@ -84,7 +84,6 @@ platform_do_upgrade() {
fi
done < /tmp/partmap.image
- #copy partition uuid
v "Writing new UUID to /dev/$diskdev..."
get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440
conv=fsync
}
--
2.29.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[RFC PATCH] ramips: do not enable unused GPIO controllers
Several devices enable GPIO controllers not used in the DTS files.
Drop them.
Signed-off-by: Adrian Schmutzler
---
Is it really that simple or am I moving along the wrong path here?
---
target/linux/ramips/dts/mt7620a_engenius_esr600.dts | 4
target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts | 4
target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts | 4
target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts | 4
target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi| 4
target/linux/ramips/dts/mt7620a_microduino_microwrt.dts | 8
target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts| 4
target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts| 8
target/linux/ramips/dts/mt7620a_sercomm_na930.dts | 4
target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts| 4
target/linux/ramips/dts/mt7620a_yukai_bocco.dts | 8
target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts | 8
target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts | 4
target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts | 4
target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi | 4
target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts | 8
target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts| 8
target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts | 4
target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts | 4
target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi| 4
target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts| 4
target/linux/ramips/dts/rt5350_hame_mpr-a1.dts| 4
.../linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi | 4
target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts | 4
target/linux/ramips/dts/rt5350_tenda_3g150b.dts | 4
target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts | 4
target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts | 4
27 files changed, 132 deletions(-)
diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
index 807e18d62b..b8fe2f8cdb 100644
--- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
+++ b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts
@@ -63,10 +63,6 @@
};
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
index 00153fab64..545e11a83f 100644
--- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
@@ -62,10 +62,6 @@
};
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
index 43dfa0d5f5..575566c5fa 100644
--- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
@@ -57,10 +57,6 @@
};
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
index e3189a2f9b..75823787bf 100644
--- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
@@ -57,10 +57,6 @@
};
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
index 06f4054c50..6349ec5365 100644
--- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
@@ -38,10 +38,6 @@
ralink,wdtmux = <1>;
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
index b1602a98a1..4307d51424 100644
--- a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
+++ b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
@@ -28,14 +28,6 @@
};
};
- {
- status = "okay";
-};
-
- {
- status = "okay";
-};
-
{
status = "okay";
diff --git a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
index 908f89d149..07f606fce4 100644
--- a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
+++ b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
@@ -43,10 +43,6 @@
};
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts
b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts
index e6374434ed..aa7ddb0a25 100644
--- a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts
[PATCH 2/2] ramips: remove redundant status for USB controllers
mt7621, mt7628an and rt5350 have USB controllers (ehci/ohci or xhci)
enabled by default. Thus, this patch drops redundant status=okay
statements in derived device DTS files.
While at it, also drop an explicit status=okay in mt7621.dtsi, as
this is default.
Note:
For rt5350, about 50 % of the devices enabled ehci/ohci in the DTS
files, and there is actually no device actively disabling it.
It looks like only a few people are aware that the controllers are
enabled by default here.
Signed-off-by: Adrian Schmutzler
---
target/linux/ramips/dts/mt7621.dtsi | 1 -
target/linux/ramips/dts/mt7621_youku_yk-l2.dts| 4
target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts | 8
target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts| 8
target/linux/ramips/dts/mt7628an_skylab_skw92a.dts| 8
target/linux/ramips/dts/mt7628an_tama_w06.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts | 8
.../linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts | 8
target/linux/ramips/dts/rt5350_allnet_all5003.dts | 8
target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi | 8
target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts | 8
target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts | 8
target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts| 8
target/linux/ramips/dts/rt5350_hame_mpr-a1.dts| 8
target/linux/ramips/dts/rt5350_hame_mpr-a2.dts| 8
target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts| 8
target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts | 8
target/linux/ramips/dts/rt5350_intenso_memory2move.dts| 8
target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi | 8
target/linux/ramips/dts/rt5350_nixcore_x1.dtsi| 8
.../linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi | 8
target/linux/ramips/dts/rt5350_omnima_miniembplug.dts | 8
target/linux/ramips/dts/rt5350_poray_m3.dts | 8
target/linux/ramips/dts/rt5350_poray_m4.dtsi | 8
target/linux/ramips/dts/rt5350_poray_x5.dts | 8
target/linux/ramips/dts/rt5350_poray_x8.dts | 8
target/linux/ramips/dts/rt5350_tenda_3g150b.dts | 8
target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts| 8
target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts | 8
target/linux/ramips/dts/rt5350_vocore_vocore.dtsi | 8
target/linux/ramips/dts/rt5350_wansview_ncs601w.dts | 8
target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts | 8
32 files changed, 245 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621.dtsi
b/target/linux/ramips/dts/mt7621.dtsi
index 1c19545443..7636f9d800 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -371,7 +371,6 @@
xhci: xhci@1E1C {
#address-cells = <1>;
#size-cells = <0>;
- status = "okay";
compatible = "mediatek,mt8173-xhci";
reg = <0x1e1c 0x1000
diff --git a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
index fd4395985c..627188873d 100644
--- a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
+++ b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
@@ -63,10 +63,6 @@
status = "okay";
};
- {
- status = "okay";
-};
-
{
status = "okay";
diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
index 4ebe0cf11f..c5e0c2e02b 100644
--- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
@@ -131,11 +131,3 @@
{
status = "okay";
};
-
- {
- status = "okay";
-};
-
- {
- status = "okay";
-};
diff --git a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts
b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts
index 95d7750be0..6962651e1b 100644
--- a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts
+++ b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts
@@ -93,14 +93,6 @@
};
};
- {
- status = "okay";
-};
-
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
index 111f70a8d5..6e1cb396b8 100644
--- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
+++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
@@ -97,11 +97,3 @@
{
status = "okay";
};
-
- {
- status = "okay";
-};
-
- {
- status = "okay";
-};
diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts
[PATCH 1/2] ramips: simplify status for ehci/ohci on mt7628 TP-Link devices
At the moment, ehci/ohci is enabled in mt7628an SoC DTSI, then
disabled in the TP-Link-specific DTSI files, and finally enabled
again in the DTS files of the devices needing it.
This on-off-on scheme is hard to grasp on a quick look. Thus, this
patch drops the status in the TP-Link-specific DTSI files, having
the TP-Link devices treated like the rest of mt7628an DTSes, i.e.
ehci/ohci is enabled by default and needs to be disabled explicitly
where needed.
Signed-off-by: Adrian Schmutzler
---
.../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 8
target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 8
target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 8
target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts | 8
target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts | 8
target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts | 8
target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts | 8
16 files changed, 72 insertions(+), 56 deletions(-)
diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
index 7f7e5ac8b4..b6ce7b1f56 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
@@ -72,14 +72,6 @@
};
};
- {
- status = "disabled";
-};
-
- {
- status = "disabled";
-};
-
{
status = "okay";
mtd-mac-address = < 0xf100>;
diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index b134badb15..2faf8a87fe 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
@@ -53,14 +53,6 @@
};
};
- {
- status = "disabled";
-};
-
- {
- status = "disabled";
-};
-
{
status = "okay";
mtd-mac-address = < 0xf100>;
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index f6321bb15f..58743db6b4 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -69,6 +69,14 @@
};
};
+ {
+ status = "disabled";
+};
+
+ {
+ status = "disabled";
+};
+
{
mtd-mac-address-increment = <(-2)>;
};
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
index 7969bfc733..d76ce34ca9 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -71,6 +71,14 @@
};
};
+ {
+ status = "disabled";
+};
+
+ {
+ status = "disabled";
+};
+
_default {
gpio {
groups = "i2s", "gpio", "refclk", "p0led_an", "p1led_an",
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index ea53870eeb..4966d56a68 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -67,6 +67,14 @@
};
};
+ {
+ status = "disabled";
+};
+
+ {
+ status = "disabled";
+};
+
_default {
gpio {
groups = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an",
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index 4ca0cd61a5..11bf903531 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -69,6 +69,14 @@
};
};
+ {
+ status = "disabled";
+};
+
+ {
+ status = "disabled";
+};
+
_default {
gpio {
groups = "i2c", "p0led_an", "p1led_an", "p2led_an",
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index 8e602331f3..173b4cddca 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -69,14 +69,6 @@
};
};
- {
- status = "okay";
-};
-
- {
- status
[PATCH] ramips: drop redundant status for gpio/gpio0
The first gpio controller (gpio or gpio0) is always enabled by
default in the SoC DTSI files. No need to set status=okay in the
device DTS files a second time.
Remove the redundant statements.
Signed-off-by: Adrian Schmutzler
---
target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts | 4
target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts | 4
target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts| 4
target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts| 4
target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts| 4
target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts | 4
target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts | 4
target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts | 4
target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts | 4
target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi| 4
target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts| 4
target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi | 4
target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi| 4
target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi | 4
target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts| 4
.../linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts | 4
target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts| 4
target/linux/ramips/dts/mt7620a_youku_yk1.dts | 4
target/linux/ramips/dts/mt7620a_yukai_bocco.dts | 4
target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts | 4
target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi| 4
target/linux/ramips/dts/mt7620a_zte_q7.dts| 4
target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts | 4
target/linux/ramips/dts/mt7620n_kingston_mlw221.dts | 4
target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts| 4
target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts | 4
target/linux/ramips/dts/mt7621_telco-electronics_x1.dts | 4
target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi | 4
target/linux/ramips/dts/rt2880_airlink101_ar670w.dts | 4
target/linux/ramips/dts/rt2880_airlink101_ar725w.dts | 4
target/linux/ramips/dts/rt2880_asus_rt-n15.dts| 4
target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts | 4
target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts | 4
target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts | 4
target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts | 4
target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts| 4
target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi | 4
target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi| 4
target/linux/ramips/dts/rt3352_allnet_all5002.dts | 4
target/linux/ramips/dts/rt5350_airlive_air3gii.dts| 4
target/linux/ramips/dts/rt5350_allnet_all5003.dts | 4
target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts| 4
target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts | 4
target/linux/ramips/dts/rt5350_nixcore_x1.dtsi| 4
target/linux/ramips/dts/rt5350_omnima_miniembplug.dts | 4
45 files changed, 180 deletions(-)
diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
index 42047390b0..30a0201c39 100644
--- a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
+++ b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
@@ -106,10 +106,6 @@
mtd-mac-address = < 0x28>;
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
index 07586f6922..fc2b74db2a 100644
--- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
+++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
@@ -96,10 +96,6 @@
};
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
index bbd193b4ac..63667da281 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
@@ -69,10 +69,6 @@
};
};
- {
- status = "okay";
-};
-
{
status = "okay";
};
diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
index 6ad3f41560..f4db67648a 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
@@ -59,10 +59,6 @@
status =
[PATCH] openvpn: disable LZO support by default
OpenVPN recommends disabling compression, as it may weaken the security of the connection. For users who need compression, we build with LZ4 support by default. LZO in OpenVPN pulls in liblzo at approx. 32 kB. OpenWrt users will no longer be able to connect to OpenVPN peers that require LZO compression, unless they build the OpenVPN package themselves. Signed-off-by: Magnus Kroken --- package/network/services/openvpn/Config-mbedtls.in| 2 +- package/network/services/openvpn/Config-openssl.in| 2 +- package/network/services/openvpn/files/openvpn.config | 6 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/network/services/openvpn/Config-mbedtls.in b/package/network/services/openvpn/Config-mbedtls.in index 2a2f303c48..3cf233b8f7 100644 --- a/package/network/services/openvpn/Config-mbedtls.in +++ b/package/network/services/openvpn/Config-mbedtls.in @@ -2,7 +2,7 @@ if PACKAGE_openvpn-mbedtls config OPENVPN_mbedtls_ENABLE_LZO bool "Enable LZO compression support" - default y + default n config OPENVPN_mbedtls_ENABLE_LZ4 bool "Enable LZ4 compression support" diff --git a/package/network/services/openvpn/Config-openssl.in b/package/network/services/openvpn/Config-openssl.in index 7a7be74db9..335bbaa2c4 100644 --- a/package/network/services/openvpn/Config-openssl.in +++ b/package/network/services/openvpn/Config-openssl.in @@ -2,7 +2,7 @@ if PACKAGE_openvpn-openssl config OPENVPN_openssl_ENABLE_LZO bool "Enable LZO compression support" - default y + default n config OPENVPN_openssl_ENABLE_LZ4 bool "Enable LZ4 compression support" diff --git a/package/network/services/openvpn/files/openvpn.config b/package/network/services/openvpn/files/openvpn.config index f6278836e7..09d504da28 100644 --- a/package/network/services/openvpn/files/openvpn.config +++ b/package/network/services/openvpn/files/openvpn.config @@ -293,9 +293,7 @@ config openvpn sample_server # # LZ4 requires OpenVPN 2.4+ client and server # option compress lz4 - # LZO is compatible with most OpenVPN versions - # (set "compress lzo" on 2.4+ clients, and "comp-lzo yes" on older clients) -# option compress lzo + # Control how OpenVPN handles peers using compression # # Do not allow any connections using compression @@ -487,8 +485,6 @@ config openvpn sample_client # # LZ4 requires OpenVPN 2.4+ on server and client # option compress lz4 - # LZO is compatible with most OpenVPN versions -# option compress lzo # Set log file verbosity. option verb 3 -- 2.20.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2] openvpn: update to 2.5.0
New features: * Per client tls-crypt keys * ChaCha20-Poly1305 can be used to encrypt the data channel * Routes are added/removed via Netlink instead of ifconfig/route (unless iproute2 support is enabled). * VLAN support when using a TAP device Significant changes: * Server support can no longer be disabled. * Crypto support can no longer be disabled, remove nossl variant. * Blowfish (BF-CBC) is no longer implicitly the default cipher. OpenVPN peers prior to 2.4, or peers with data cipher negotiation disabled, will not be able to connect to a 2.5 peer unless option data_fallback_ciphers is set on the 2.5 peer and it contains a cipher supported by the client. Signed-off-by: Magnus Kroken --- v2: Fix missed -/_ conversion in openvpn.options, thanks Jo for pointing this out. Restored LZO as enabled by default to ease the version update, proposal to disable LZO will be sent as a separate patch. .../services/openvpn/Config-mbedtls.in| 4 -- .../network/services/openvpn/Config-nossl.in | 50 -- .../services/openvpn/Config-openssl.in| 4 -- package/network/services/openvpn/Makefile | 20 +- .../services/openvpn/files/openvpn.config | 61 +++-- .../services/openvpn/files/openvpn.options| 14 +++- .../001-reproducible-remove_DATE.patch| 6 +- ...bedtls-disable-runtime-version-check.patch | 2 +- ...l-dont-use-deprecated-ssleay-symbols.patch | 58 - ...enssl-add-missing-include-statements.patch | 65 --- .../210-build_always_use_internal_lz4.patch | 2 +- .../openvpn/patches/220-disable_des.patch | 21 ++ 12 files changed, 69 insertions(+), 238 deletions(-) delete mode 100644 package/network/services/openvpn/Config-nossl.in delete mode 100644 package/network/services/openvpn/patches/110-openssl-dont-use-deprecated-ssleay-symbols.patch delete mode 100644 package/network/services/openvpn/patches/111-openssl-add-missing-include-statements.patch diff --git a/package/network/services/openvpn/Config-mbedtls.in b/package/network/services/openvpn/Config-mbedtls.in index beac492022..2a2f303c48 100644 --- a/package/network/services/openvpn/Config-mbedtls.in +++ b/package/network/services/openvpn/Config-mbedtls.in @@ -8,10 +8,6 @@ config OPENVPN_mbedtls_ENABLE_LZ4 bool "Enable LZ4 compression support" default y -config OPENVPN_mbedtls_ENABLE_SERVER - bool "Enable server support (otherwise only client mode is support)" - default y - #config OPENVPN_mbedtls_ENABLE_EUREPHIA # bool "Enable support for the eurephia plug-in" # default n diff --git a/package/network/services/openvpn/Config-nossl.in b/package/network/services/openvpn/Config-nossl.in deleted file mode 100644 index 79140ad5d1..00 --- a/package/network/services/openvpn/Config-nossl.in +++ /dev/null @@ -1,50 +0,0 @@ -if PACKAGE_openvpn-nossl - -config OPENVPN_nossl_ENABLE_LZO - bool "Enable LZO compression support" - default y - -config OPENVPN_nossl_ENABLE_LZ4 - bool "Enable LZ4 compression support" - default y - -config OPENVPN_nossl_ENABLE_SERVER - bool "Enable server support (otherwise only client mode is support)" - default y - -config OPENVPN_nossl_ENABLE_MANAGEMENT - bool "Enable management server support" - default n - -config OPENVPN_nossl_ENABLE_FRAGMENT - bool "Enable internal fragmentation support (--fragment)" - default y - -config OPENVPN_nossl_ENABLE_MULTIHOME - bool "Enable multi-homed UDP server support (--multihome)" - default y - -config OPENVPN_nossl_ENABLE_PORT_SHARE - bool "Enable TCP server port-share support (--port-share)" - default y - -config OPENVPN_nossl_ENABLE_DEF_AUTH - bool "Enable deferred authentication" - default y - -config OPENVPN_nossl_ENABLE_PF - bool "Enable internal packet filter" - default y - -config OPENVPN_nossl_ENABLE_IPROUTE2 - bool "Enable support for iproute2" - default n - -config OPENVPN_nossl_ENABLE_SMALL - bool "Enable size optimization" - default y - help - enable smaller executable size (disable OCC, usage - message, and verb 4 parm list) - -endif diff --git a/package/network/services/openvpn/Config-openssl.in b/package/network/services/openvpn/Config-openssl.in index f2b618eff1..7a7be74db9 100644 --- a/package/network/services/openvpn/Config-openssl.in +++ b/package/network/services/openvpn/Config-openssl.in @@ -12,10 +12,6 @@ config OPENVPN_openssl_ENABLE_X509_ALT_USERNAME bool "Enable the --x509-username-field feature" default n -config OPENVPN_openssl_ENABLE_SERVER - bool "Enable server support (otherwise only client mode is support)" - default y - #config OPENVPN_openssl_ENABLE_EUREPHIA # bool "Enable support for the eurephia plug-in" # default n diff --git a/package/network/services/openvpn/Makefile
RE: Octeon snapshot builds missing EdgeRouter artifacts
Hi, > -Original Message- > From: Raylynn Knight [mailto:raykni...@me.com] > Sent: Dienstag, 1. Dezember 2020 06:58 > To: OpenWrt Development List > Subject: Octeon snapshot builds missing EdgeRouter artifacts > > The snapshot builds for Octeon are missing the artifacts for the EdgeRouter > and EdgeRouter Pro devices (artifacts should be identical). I couldn’t figure > out exactly what is wrong with the make file, but if I build locally and > select: > > * Target System (Cavium Networks Octeon) > * Target Profile (Multiple Devices) > * Target Devices > (*) Enable all profiles by default > > All of the profiles except the Ubiquiti EdgeRouter profile are selected. So > whatever mechanism is used to determine all profiles is missing the Ubiquiti > EdgeRouter profile. The EdgeRouter is broken at the moment and can't be fixed easily, so it was disabled by default: https://github.com/openwrt/openwrt/commit/3824fa26d256d162fc0e02e46714eda7816cae4a If you want to build it, you should build this device only with the option named in the commit description. Best Adrian > > Hoping someone more familiar with the build system constructs can fix this. > > Thank you, > Ray > openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
