Message ID | 20231126201227.15014-1-giulio.benetti@benettiengineering.com |
---|---|
State | Accepted |
Headers | show |
Series | package/esp-hosted: bump to version 2023-11-23 | expand |
Giulio, All, On 2023-11-26 21:12 +0100, Giulio Benetti spake thusly: > Drop local patch applied upstream: > https://github.com/espressif/esp-hosted/commit/12b0ca9c46094c86eb76b5f0eaa626f868efaec8 > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Applied to next, thanks. Regards, Yann E. MORIN. > --- > ...st-fix-build-failure-when-CONFIG_PM-.patch | 33 ------------------- > package/esp-hosted/esp-hosted.hash | 2 +- > package/esp-hosted/esp-hosted.mk | 2 +- > 3 files changed, 2 insertions(+), 35 deletions(-) > delete mode 100644 package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch > > diff --git a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch b/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch > deleted file mode 100644 > index abbc64a434..0000000000 > --- a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 56920e3ce04aa2eadb529a6787200789bf1c3925 Mon Sep 17 00:00:00 2001 > -From: Giulio Benetti <giulio.benetti@benettiengineering.com> > -Date: Wed, 9 Aug 2023 23:16:52 +0200 > -Subject: [PATCH] esp_hosted_ng: host: fix build failure when CONFIG_PM is not > - defined > - > -wiphy->wowlan is not defined when CONFIG_PM is not enabled so let's > -guard the assignment to wiphy->wowlan according to option CONFIG_PM. > - > -Upstream: https://github.com/espressif/esp-hosted/pull/254 > - > -Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > ---- > - esp_hosted_ng/host/esp_cfg80211.c | 2 ++ > - 1 file changed, 2 insertions(+) > - > -diff --git a/esp_hosted_ng/host/esp_cfg80211.c b/esp_hosted_ng/host/esp_cfg80211.c > -index 70fdbb9773..d3c4108c29 100644 > ---- a/esp_hosted_ng/host/esp_cfg80211.c > -+++ b/esp_hosted_ng/host/esp_cfg80211.c > -@@ -638,7 +638,9 @@ int esp_cfg80211_register(struct esp_adapter *adapter) > - wiphy->max_scan_ie_len = 1000; > - wiphy->max_sched_scan_ssids = 10; > - wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; > -+#ifdef CONFIG_PM > - wiphy->wowlan = &esp_wowlan_support; > -+#endif > - > - /* Advertise SAE support */ > - wiphy->features |= NL80211_FEATURE_SAE; > --- > -2.34.1 > - > diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash > index c17fe262a1..b129bb42f9 100644 > --- a/package/esp-hosted/esp-hosted.hash > +++ b/package/esp-hosted/esp-hosted.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3310845b2324bda5774b91bcdd3f47621126f4a0011a0f61e31b0ad4a44db2f5 esp-hosted-11e90f185a5a9922343e73e44032816a0e3ddedb.tar.gz > +sha256 6e023c26355643f2aaf6d79d5910f64c49ea638063235d519075629643518a71 esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404.tar.gz > sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE > diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk > index 7491c46512..578108c91d 100644 > --- a/package/esp-hosted/esp-hosted.mk > +++ b/package/esp-hosted/esp-hosted.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ESP_HOSTED_VERSION = 11e90f185a5a9922343e73e44032816a0e3ddedb > +ESP_HOSTED_VERSION = ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404 > ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) > ESP_HOSTED_DEPENDENCIES = linux > ESP_HOSTED_LICENSE = GPL-2.0 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch b/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch deleted file mode 100644 index abbc64a434..0000000000 --- a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 56920e3ce04aa2eadb529a6787200789bf1c3925 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti <giulio.benetti@benettiengineering.com> -Date: Wed, 9 Aug 2023 23:16:52 +0200 -Subject: [PATCH] esp_hosted_ng: host: fix build failure when CONFIG_PM is not - defined - -wiphy->wowlan is not defined when CONFIG_PM is not enabled so let's -guard the assignment to wiphy->wowlan according to option CONFIG_PM. - -Upstream: https://github.com/espressif/esp-hosted/pull/254 - -Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> ---- - esp_hosted_ng/host/esp_cfg80211.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/esp_hosted_ng/host/esp_cfg80211.c b/esp_hosted_ng/host/esp_cfg80211.c -index 70fdbb9773..d3c4108c29 100644 ---- a/esp_hosted_ng/host/esp_cfg80211.c -+++ b/esp_hosted_ng/host/esp_cfg80211.c -@@ -638,7 +638,9 @@ int esp_cfg80211_register(struct esp_adapter *adapter) - wiphy->max_scan_ie_len = 1000; - wiphy->max_sched_scan_ssids = 10; - wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; -+#ifdef CONFIG_PM - wiphy->wowlan = &esp_wowlan_support; -+#endif - - /* Advertise SAE support */ - wiphy->features |= NL80211_FEATURE_SAE; --- -2.34.1 - diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index c17fe262a1..b129bb42f9 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3310845b2324bda5774b91bcdd3f47621126f4a0011a0f61e31b0ad4a44db2f5 esp-hosted-11e90f185a5a9922343e73e44032816a0e3ddedb.tar.gz +sha256 6e023c26355643f2aaf6d79d5910f64c49ea638063235d519075629643518a71 esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 7491c46512..578108c91d 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = 11e90f185a5a9922343e73e44032816a0e3ddedb +ESP_HOSTED_VERSION = ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404 ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0
Drop local patch applied upstream: https://github.com/espressif/esp-hosted/commit/12b0ca9c46094c86eb76b5f0eaa626f868efaec8 Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- ...st-fix-build-failure-when-CONFIG_PM-.patch | 33 ------------------- package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch