: Adjust the correct version according with patches and meta-oe

PATCH In review Parthiban Nallathambi 3 participants 5 messages Mar 18, 2018 – May 11, 2018

Share & tools

Parthiban Nallathambi

author

2018-03-18 16:49 UTC #0 lore raw

PATCH 1/1 : Adjust the correct version according with patches and meta-oe

Patches reffered in bbapend are with 1.24 (based on meta-oe 'rocko') version but the bbappend naming is with 1.27 (based on meta-oe 'master'.

Rename the bbappend to point to correct version of meta-oe rocko branch.

Signed-off-by Parthiban Nallathambi <[email protected]>

---
 recipes-tweaks/busybox/{busybox_1.27%.bbappend => busybox_1.24%.bbappend} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-tweaks/busybox/{busybox_1.27%.bbappend => busybox_1.24%.bbappend} (100%)

recipes-tweaks/busybox/busybox_1.24%.bbappend renamed from recipes-tweaks/busybox/busybox_1.27%.bbappend +0 -0

similarity index 100%
rename from recipes-tweaks/busybox/busybox_1.27%.bbappend
rename to recipes-tweaks/busybox/busybox_1.24%.bbappend

Signature · 1 line

2.14.3

Parthiban Nallathambi

author

2018-03-18 16:50 UTC #1 lore raw

PATCH 1/1 : Update patch based on 2.6 version

Update the existing patch to work for hostapd 2.6 (which is the current version of openembedded-core rocko branch).

"netifd.sh" is no more part of hostapd source, so
removing it from do_install section of tweak

Signed-off-by Parthiban Nallathambi <[email protected]>

---
 recipes-tweaks/hostapd/hostapd/300-noscan.patch | 42 ++++++++++++-------------
 recipes-tweaks/hostapd/hostapd_%.bbappend       |  2 --
 2 files changed, 21 insertions(+), 23 deletions(-)

recipes-tweaks/hostapd/hostapd/300-noscan.patch +21 ~~-21~~

index e89cb9d..e9f8ee1 100644
@@ -1,7 +1,7 @@
-diff -ruN hostapd-2.5.orig/hostapd/config_file.c hostapd-2.5/hostapd/config_file.c
---- hostapd-2.5.orig/hostapd/config_file.c	2017-02-15 16:20:07.102232803 -0700
-+++ hostapd-2.5/hostapd/config_file.c	2017-02-15 16:20:35.132232593 -0700
-@@ -2795,6 +2795,10 @@
+diff -ruN hostapd-2.6/hostapd/config_file.c hostapd-2.6.orig/hostapd/config_file.c
+--- hostapd-2.6/hostapd/config_file.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/hostapd/config_file.c	2018-03-17 23:05:11.032723997 +0100
+@@ -2863,6 +2863,10 @@
  		}
  #endif /* CONFIG_IEEE80211W */
  #ifdef CONFIG_IEEE80211N

@@ -12,10 +12,10 @@ diff -ruN hostapd-2.5.orig/hostapd/config_file.c hostapd-2.5/hostapd/config_file
  	} else if (os_strcmp(buf, "ieee80211n") == 0) {
  		conf->ieee80211n = atoi(pos);
  	} else if (os_strcmp(buf, "ht_capab") == 0) {
-diff -ruN hostapd-2.5.orig/src/ap/ap_config.h hostapd-2.5/src/ap/ap_config.h
---- hostapd-2.5.orig/src/ap/ap_config.h	2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/ap_config.h	2017-02-15 16:20:35.135565927 -0700
-@@ -626,6 +626,8 @@
+diff -ruN hostapd-2.6/src/ap/ap_config.h hostapd-2.6.orig/src/ap/ap_config.h
+--- hostapd-2.6/src/ap/ap_config.h	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/ap_config.h	2018-03-17 23:04:30.697722861 +0100
+@@ -664,6 +664,8 @@
  
  	int ht_op_mode_fixed;
  	u16 ht_capab;

@@ -24,22 +24,22 @@ diff -ruN hostapd-2.5.orig/src/ap/ap_config.h hostapd-2.5/src/ap/ap_config.h
  	int ieee80211n;
  	int secondary_channel;
  	int no_pri_sec_switch;
-diff -ruN hostapd-2.5.orig/src/ap/hw_features.c hostapd-2.5/src/ap/hw_features.c
---- hostapd-2.5.orig/src/ap/hw_features.c	2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/hw_features.c	2017-02-15 16:22:03.158898602 -0700
-@@ -472,7 +472,7 @@
- 	struct wpa_driver_scan_params params;
- 	int ret;
+diff -ruN hostapd-2.6/src/ap/hw_features.c hostapd-2.6.orig/src/ap/hw_features.c
+--- hostapd-2.6/src/ap/hw_features.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/hw_features.c	2018-03-17 23:05:54.273725214 +0100
+@@ -226,7 +226,7 @@
+ {
+ 	int pri_chan, sec_chan;
  
 -	if (!iface->conf->secondary_channel)
 +	if (!iface->conf->secondary_channel || iface->conf->noscan)
- 		return 0; /* HT40 not used */
+ 		return 1; /* HT40 not used */
  
- 	hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
-diff -ruN hostapd-2.5.orig/src/ap/ieee802_11_ht.c hostapd-2.5/src/ap/ieee802_11_ht.c
---- hostapd-2.5.orig/src/ap/ieee802_11_ht.c	2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/ieee802_11_ht.c	2017-02-15 16:20:35.135565927 -0700
-@@ -221,6 +221,9 @@
+ 	pri_chan = iface->conf->channel;
+diff -ruN hostapd-2.6/src/ap/ieee802_11_ht.c hostapd-2.6.orig/src/ap/ieee802_11_ht.c
+--- hostapd-2.6/src/ap/ieee802_11_ht.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/ieee802_11_ht.c	2018-03-17 23:08:20.303729325 +0100
+@@ -244,6 +244,9 @@
  	if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
  		return;

@@ -49,7 +49,7 @@ diff -ruN hostapd-2.5.orig/src/ap/ieee802_11_ht.c hostapd-2.5/src/ap/ieee802_11_
  	if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
  		return;
  
-@@ -345,6 +348,9 @@
+@@ -368,6 +371,9 @@
  	if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
  		return;

recipes-tweaks/hostapd/hostapd_%.bbappend +0 -2

index be45723..3b2f646 100644
@@ -15,8 +15,6 @@ do_install_append() {
     install -d ${D}${base_libdir}/netifd/wireless
     install -d ${D}${base_libdir}/wifi
 
-    install -m 0755 ${WORKDIR}/git/openwrt/package/network/services/hostapd/files/netifd.sh ${D}${base_libdir}/netifd/hostapd.sh
-
     install -m 0755 ${WORKDIR}/git/openwrt/package/kernel/mac80211/files/lib/wifi/mac80211.sh ${D}${base_libdir}/wifi/mac80211.sh
     install -m 0755 ${WORKDIR}/git/openwrt/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh ${D}${base_libdir}/netifd/wireless/mac80211.sh
 }

Signature · 1 line

2.14.3

Khem Raj

2018-03-19 04:50 UTC #2 lore raw

Re: [meta-openwrt][PATCH] [hostapd]: Update patch based on 2.6 version

Quoted 7 lines · Parthiban Nallathambi

Update the existing patch to work for hostapd 2.6 (which is the current version of openembedded-core rocko branch).
"netifd.sh" is no more part of hostapd source, so
removing it from do_install section of tweak

thanks looks ok.

Quoted 95 lines

Signed-off-by Parthiban Nallathambi <[email protected]>

---
  recipes-tweaks/hostapd/hostapd/300-noscan.patch | 42 ++++++++++++-------------
  recipes-tweaks/hostapd/hostapd_%.bbappend       |  2 --
  2 files changed, 21 insertions(+), 23 deletions(-)

recipes-tweaks/hostapd/hostapd/300-noscan.patch +21 ~~-21~~

index e89cb9d..e9f8ee1 100644
@@ -1,7 +1,7 @@
-diff -ruN hostapd-2.5.orig/hostapd/config_file.c hostapd-2.5/hostapd/config_file.c
---- hostapd-2.5.orig/hostapd/config_file.c	2017-02-15 16:20:07.102232803 -0700
-+++ hostapd-2.5/hostapd/config_file.c	2017-02-15 16:20:35.132232593 -0700
-@@ -2795,6 +2795,10 @@
+diff -ruN hostapd-2.6/hostapd/config_file.c hostapd-2.6.orig/hostapd/config_file.c
+--- hostapd-2.6/hostapd/config_file.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/hostapd/config_file.c	2018-03-17 23:05:11.032723997 +0100
+@@ -2863,6 +2863,10 @@
   		}
   #endif /* CONFIG_IEEE80211W */
   #ifdef CONFIG_IEEE80211N

@@ -12,10 +12,10 @@ diff -ruN hostapd-2.5.orig/hostapd/config_file.c hostapd-2.5/hostapd/config_file
   	} else if (os_strcmp(buf, "ieee80211n") == 0) {
   		conf->ieee80211n = atoi(pos);
   	} else if (os_strcmp(buf, "ht_capab") == 0) {
-diff -ruN hostapd-2.5.orig/src/ap/ap_config.h hostapd-2.5/src/ap/ap_config.h
---- hostapd-2.5.orig/src/ap/ap_config.h	2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/ap_config.h	2017-02-15 16:20:35.135565927 -0700
-@@ -626,6 +626,8 @@
+diff -ruN hostapd-2.6/src/ap/ap_config.h hostapd-2.6.orig/src/ap/ap_config.h
+--- hostapd-2.6/src/ap/ap_config.h	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/ap_config.h	2018-03-17 23:04:30.697722861 +0100
+@@ -664,6 +664,8 @@
 
   	int ht_op_mode_fixed;
   	u16 ht_capab;

@@ -24,22 +24,22 @@ diff -ruN hostapd-2.5.orig/src/ap/ap_config.h hostapd-2.5/src/ap/ap_config.h
   	int ieee80211n;
   	int secondary_channel;
   	int no_pri_sec_switch;
-diff -ruN hostapd-2.5.orig/src/ap/hw_features.c hostapd-2.5/src/ap/hw_features.c
---- hostapd-2.5.orig/src/ap/hw_features.c	2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/hw_features.c	2017-02-15 16:22:03.158898602 -0700
-@@ -472,7 +472,7 @@
- 	struct wpa_driver_scan_params params;
- 	int ret;
+diff -ruN hostapd-2.6/src/ap/hw_features.c hostapd-2.6.orig/src/ap/hw_features.c
+--- hostapd-2.6/src/ap/hw_features.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/hw_features.c	2018-03-17 23:05:54.273725214 +0100
+@@ -226,7 +226,7 @@
+ {
+ 	int pri_chan, sec_chan;
 
  -	if (!iface->conf->secondary_channel)
  +	if (!iface->conf->secondary_channel || iface->conf->noscan)
- 		return 0; /* HT40 not used */
+ 		return 1; /* HT40 not used */
 
- 	hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
-diff -ruN hostapd-2.5.orig/src/ap/ieee802_11_ht.c hostapd-2.5/src/ap/ieee802_11_ht.c
---- hostapd-2.5.orig/src/ap/ieee802_11_ht.c	2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/ieee802_11_ht.c	2017-02-15 16:20:35.135565927 -0700
-@@ -221,6 +221,9 @@
+ 	pri_chan = iface->conf->channel;
+diff -ruN hostapd-2.6/src/ap/ieee802_11_ht.c hostapd-2.6.orig/src/ap/ieee802_11_ht.c
+--- hostapd-2.6/src/ap/ieee802_11_ht.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/ieee802_11_ht.c	2018-03-17 23:08:20.303729325 +0100
+@@ -244,6 +244,9 @@
   	if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
   		return;

@@ -49,7 +49,7 @@ diff -ruN hostapd-2.5.orig/src/ap/ieee802_11_ht.c hostapd-2.5/src/ap/ieee802_11_
   	if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
   		return;
 
-@@ -345,6 +348,9 @@
+@@ -368,6 +371,9 @@
   	if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
   		return;

recipes-tweaks/hostapd/hostapd_%.bbappend +0 -2

index be45723..3b2f646 100644
@@ -15,8 +15,6 @@ do_install_append() {
      install -d ${D}${base_libdir}/netifd/wireless
      install -d ${D}${base_libdir}/wifi
 
-    install -m 0755 ${WORKDIR}/git/openwrt/package/network/services/hostapd/files/netifd.sh ${D}${base_libdir}/netifd/hostapd.sh
-
      install -m 0755 ${WORKDIR}/git/openwrt/package/kernel/mac80211/files/lib/wifi/mac80211.sh ${D}${base_libdir}/wifi/mac80211.sh
      install -m 0755 ${WORKDIR}/git/openwrt/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh ${D}${base_libdir}/netifd/wireless/mac80211.sh
  }

Daniel F. Dickinson

2018-05-11 02:51 UTC #3 lore raw

Re: [meta-openwrt][PATCH] [hostapd]: Update patch based on 2.6 version

Quoted 7 lines · Khem Raj

Quoted 4 lines · Parthiban Nallathambi
Update the existing patch to work for hostapd 2.6 (which is the current version of openembedded-core rocko branch).

Quoted 6 lines

Quoted 3 lines
"netifd.sh" is no more part of hostapd source, so
removing it from do_install section of tweak
thanks looks ok.

Sorry I just noticed this. hostapd.sh comes from the OpenWrt repo not the hostapd repo, and is required for netifd, so this will break AP mode for meta-openwrt.

I think P.N. was confused because most recipes don't use multiple repos.

Regards,

Daniel

Quoted 118 lines

Quoted 118 lines
Signed-off-by Parthiban Nallathambi <[email protected]>
---
recipes-tweaks/hostapd/hostapd/300-noscan.patch | 42
++++++++++++-------------
recipes-tweaks/hostapd/hostapd_%.bbappend | 2 --
  2 files changed, 21 insertions(+), 23 deletions(-)
recipes-tweaks/hostapd/hostapd/300-noscan.patch +0 -1
index e89cb9d..e9f8ee1 100644
@@ -1,7 +1,7 @@
-diff -ruN hostapd-2.5.orig/hostapd/config_file.c 
hostapd-2.5/hostapd/config_file.c
---- hostapd-2.5.orig/hostapd/config_file.c    2017-02-15 16:20:07.102232803 -0700
-+++ hostapd-2.5/hostapd/config_file.c    2017-02-15 16:20:35.132232593 -0700
-@@ -2795,6 +2795,10 @@
+diff -ruN hostapd-2.6/hostapd/config_file.c hostapd-2.6.orig/hostapd/config_file.c
+--- hostapd-2.6/hostapd/config_file.c    2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/hostapd/config_file.c    2018-03-17 23:05:11.032723997 +0100
+@@ -2863,6 +2863,10 @@
           }
   #endif /* CONFIG_IEEE80211W */
   #ifdef CONFIG_IEEE80211N
recipes-tweaks/hostapd/hostapd/300-noscan.patch +0 -0
@@ -12,10 +12,10 @@ diff -ruN hostapd-2.5.orig/hostapd/config_file.c 
hostapd-2.5/hostapd/config_file
       } else if (os_strcmp(buf, "ieee80211n") == 0) { conf->ieee80211n = atoi(pos);
       } else if (os_strcmp(buf, "ht_capab") == 0) { -diff -ruN hostapd-2.5.orig/src/ap/ap_config.h hostapd-2.5/src/ap/ap_config.h
---- hostapd-2.5.orig/src/ap/ap_config.h    2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/ap_config.h    2017-02-15 16:20:35.135565927 -0700
-@@ -626,6 +626,8 @@
+diff -ruN hostapd-2.6/src/ap/ap_config.h hostapd-2.6.orig/src/ap/ap_config.h
+--- hostapd-2.6/src/ap/ap_config.h    2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/ap_config.h    2018-03-17 23:04:30.697722861 +0100
+@@ -664,6 +664,8 @@
       int ht_op_mode_fixed;
       u16 ht_capab;
recipes-tweaks/hostapd/hostapd/300-noscan.patch +0 -0
@@ -24,22 +24,22 @@ diff -ruN hostapd-2.5.orig/src/ap/ap_config.h 
hostapd-2.5/src/ap/ap_config.h
       int ieee80211n;
       int secondary_channel;
       int no_pri_sec_switch;
-diff -ruN hostapd-2.5.orig/src/ap/hw_features.c hostapd-2.5/src/ap/hw_features.c
---- hostapd-2.5.orig/src/ap/hw_features.c    2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/hw_features.c    2017-02-15 16:22:03.158898602 -0700
-@@ -472,7 +472,7 @@
-     struct wpa_driver_scan_params params;
-     int ret;
+diff -ruN hostapd-2.6/src/ap/hw_features.c hostapd-2.6.orig/src/ap/hw_features.c
+--- hostapd-2.6/src/ap/hw_features.c    2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/hw_features.c    2018-03-17 23:05:54.273725214 +0100
+@@ -226,7 +226,7 @@
+ {
+     int pri_chan, sec_chan;
-    if (!iface->conf->secondary_channel)
+    if (!iface->conf->secondary_channel || iface->conf->noscan) -         return 0; /* HT40 not used */
+         return 1; /* HT40 not used */
-     hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
-diff -ruN hostapd-2.5.orig/src/ap/ieee802_11_ht.c hostapd-2.5/src/ap/ieee802_11_ht.c
---- hostapd-2.5.orig/src/ap/ieee802_11_ht.c    2017-02-15 16:20:07.105566137 -0700
-+++ hostapd-2.5/src/ap/ieee802_11_ht.c    2017-02-15 16:20:35.135565927 -0700
-@@ -221,6 +221,9 @@
+     pri_chan = iface->conf->channel;
+diff -ruN hostapd-2.6/src/ap/ieee802_11_ht.c hostapd-2.6.orig/src/ap/ieee802_11_ht.c
+--- hostapd-2.6/src/ap/ieee802_11_ht.c    2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6.orig/src/ap/ieee802_11_ht.c    2018-03-17 23:08:20.303729325 +0100
+@@ -244,6 +244,9 @@
       if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)) return;
recipes-tweaks/hostapd/hostapd/300-noscan.patch +0 -0
@@ -49,7 +49,7 @@ diff -ruN hostapd-2.5.orig/src/ap/ieee802_11_ht.c 
hostapd-2.5/src/ap/ieee802_11_
if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) return;
-@@ -345,6 +348,9 @@
+@@ -368,6 +371,9 @@
if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) return;
recipes-tweaks/hostapd/hostapd_%.bbappend +0 -0
index be45723..3b2f646 100644
@@ -15,8 +15,6 @@ do_install_append() {
      install -d ${D}${base_libdir}/netifd/wireless
      install -d ${D}${base_libdir}/wifi
-    install -m 0755 ${WORKDIR}/git/openwrt/package/network/services/hostapd/files/netifd.sh ${D}${base_libdir}/netifd/hostapd.sh
-
      install -m 0755 ${WORKDIR}/git/openwrt/package/kernel/mac80211/files/lib/wifi/mac80211.sh ${D}${base_libdir}/wifi/mac80211.sh install -m 0755 ${WORKDIR}/git/openwrt/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh ${D}${base_libdir}/netifd/wireless/mac80211.sh }

Khem Raj

2018-03-19 05:10 UTC #4 lore raw

In reply to Parthiban Nallathambi

recipes-tweaks/busybox/busybox_1.24%.bbappend

Quoted 18 lines · Parthiban Nallathambi

Patches reffered in bbapend are with 1.24 (based on meta-oe 'rocko') version but the bbappend naming is with 1.27 (based on meta-oe 'master'.
Rename the bbappend to point to correct version of meta-oe rocko branch.
Signed-off-by Parthiban Nallathambi <[email protected]>
---
  recipes-tweaks/busybox/{busybox_1.27%.bbappend => busybox_1.24%.bbappend} | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
rename recipes-tweaks/busybox/{busybox_1.27%.bbappend => busybox_1.24%.bbappend} (100%)
recipes-tweaks/busybox/busybox_1.24%.bbappend renamed from recipes-tweaks/busybox/busybox_1.27%.bbappend +0 -0
similarity index 100%
rename from recipes-tweaks/busybox/busybox_1.27%.bbappend
rename to recipes-tweaks/busybox/busybox_1.24%.bbappend

Please add [meta-openwrt] in subject, and [branchname] as well otherwise, I will miss it, best is to send a github pull request. we do not have rocko branch for meta-openwrt because we only have it working with master and we will create sumo branch once core layers branch out.