Skip to content

Commit

Permalink
connman: refresh the patches to apply cleanly
Browse files Browse the repository at this point in the history
:Release Notes:
Resolves the warning from do_patch shown e.g. in:
https://forum.webosose.org/t/solved-build-failed-for-rpi4/1011

:Detailed Notes:
WARNING: connman-1.35-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 0011-Provide-station-information-when-AP-mode.patch
patching file gsupplicant/gsupplicant.h
patching file gsupplicant/supplicant.c
patching file include/technology.h
patching file plugins/wifi.c
Hunk #1 succeeded at 3286 (offset -1 lines).
Hunk #2 succeeded at 3525 (offset -1 lines).
patching file src/connman.h
patching file src/manager.c
patching file src/technology.c
Hunk #1 succeeded at 2074 (offset -44 lines).
patching file src/tethering.c
Hunk #1 succeeded at 29 with fuzz 1.
Hunk #2 succeeded at 52 (offset -2 lines).
Hunk webosose#3 succeeded at 63 (offset -2 lines).
Hunk webosose#4 succeeded at 80 (offset -2 lines).
Hunk webosose#5 succeeded at 749 (offset -2 lines).
Hunk webosose#6 succeeded at 772 (offset -2 lines).

Now at patch 0011-Provide-station-information-when-AP-mode.patch

:Testing Performed:

:QA Notes:

:Issues Addressed:
[PLAT-101120] CCC: Blacklist failing recipes

Change-Id: I6635cf4d32a17712650fb675a0a1a21ae0554b41
  • Loading branch information
shr-project committed Feb 25, 2020
1 parent c4f1bdd commit 02ac96d
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 87 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1886b233b6c8ab77066b4a58a88c31738c23fff0 Mon Sep 17 00:00:00 2001
From 1fdb99a8829b048a0f1a95c5f60ba12c8ce02ed6 Mon Sep 17 00:00:00 2001
From: Vibhanshu Dhote <[email protected]>
Date: Wed, 21 Feb 2018 16:36:23 +0530
Subject: [PATCH] Add support for the WPS PBS and PIN mode
Expand All @@ -19,14 +19,14 @@ Upstream-Status : Inappropriate [webOS specific]

---
gsupplicant/gsupplicant.h | 5 +
gsupplicant/supplicant.c | 66 ++++++++
gsupplicant/supplicant.c | 66 +++++++
include/device.h | 2 +
include/technology.h | 2 +
plugins/wifi.c | 387 +++++++++++++++++++++++++++++++++++++++++++---
plugins/wifi.c | 387 ++++++++++++++++++++++++++++++++++++--
src/connman.h | 2 +
src/device.c | 116 ++++++++++++++
src/device.c | 116 ++++++++++++
src/service.c | 2 +
src/technology.c | 49 ++++++
src/technology.c | 49 +++++
9 files changed, 611 insertions(+), 20 deletions(-)

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7408cc223cb168da0d426cb6286ec7f0f920915c Mon Sep 17 00:00:00 2001
From 63642a04a072f0bff70e202b885b30fb508ee01c Mon Sep 17 00:00:00 2001
From: "krishna.konwar" <[email protected]>
Date: Fri, 3 Aug 2018 16:17:00 +0530
Subject: [PATCH] Set IPv6 state same as IPV4 on disconnect
Expand All @@ -18,10 +18,10 @@ Upstream-Status : Inappropriate [webOS specific]
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/service.c b/src/service.c
index 768426b..9bac0d5 100644
index 13902ba..c7074c9 100644
--- a/src/service.c
+++ b/src/service.c
@@ -5803,8 +5803,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
@@ -6010,8 +6010,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
if (service->state == CONNMAN_SERVICE_STATE_IDLE)
return -EINVAL;

Expand All @@ -33,6 +33,3 @@ index 768426b..9bac0d5 100644

break;

--
2.7.4

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b39c2a95428dbc1d827691f1c4ffeb860b875120 Mon Sep 17 00:00:00 2001
From 527001e9f890be303c8f6426d201571893ee0789 Mon Sep 17 00:00:00 2001
From: Vasu Kantubukta <[email protected]>
Date: Wed, 19 Dec 2018 21:02:59 +0530
Subject: [PATCH] Fix for wifi network switching and unable to connect to open
Expand Down Expand Up @@ -33,10 +33,10 @@ Upstream-Status: Inappropriate [webOS specific]
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 2798de3..863ee97 100644
index 5d6cbb9..bf22a5d 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2792,7 +2792,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2805,7 +2805,7 @@ static void interface_state(GSupplicantInterface *interface)
connman_network_set_associating(network, false);
wifi->disconnecting = false;

Expand All @@ -45,6 +45,3 @@ index 2798de3..863ee97 100644
{
/* Set connected to false to allow autoscan to start. */
wifi->connected = FALSE;
--
2.7.4

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6bd89c26bd20ce1c61d38282e7359a970674652f Mon Sep 17 00:00:00 2001
From 67b567cc9796b0e649537d268290d2180c9ab6d2 Mon Sep 17 00:00:00 2001
From: "sachin.shetty" <[email protected]>
Date: Mon, 24 Jun 2019 16:55:43 +0530
Subject: [PATCH] Multiple wi-fi networks are connected via WPS PIN.
Expand All @@ -24,6 +24,7 @@ Verified the image.
connected via WPS PIN.

Upstream-Status: Inappropriate [webOS specific]

---
gsupplicant/supplicant.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Expand All @@ -41,6 +42,3 @@ index 736cee3..452492a 100644
} else if (g_strcmp0(key, "CurrentNetwork") == 0) {
interface_network_added(iter, interface);
} else if (g_strcmp0(key, "BSSs") == 0) {
--
2.7.4

Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
From 1714caa8ce21c5e83d737980df11d6be08d6e3c3 Mon Sep 17 00:00:00 2001
From 786711a97b845886fbfea648fc3a1a9d11e3beec Mon Sep 17 00:00:00 2001
From: "sungmok.shin" <[email protected]>
Date: Tue, 25 Jun 2019 13:11:11 +0900
Subject: [PATCH] Support additional feature for tethering

Support additional feature for tethering

---
gdhcp/server.c | 3 ++
include/technology.h | 1 +
plugins/wifi.c | 11 ++++-
plugins/wifi.c | 11 +++-
src/connman.h | 1 +
src/technology.c | 119 +++++++++++++++++++++++++++++++++++++++++++++---
src/tethering.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/technology.c | 119 +++++++++++++++++++++++++++++++++++++---
src/tethering.c | 125 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 252 insertions(+), 8 deletions(-)

diff --git a/gdhcp/server.c b/gdhcp/server.c
Expand Down Expand Up @@ -425,6 +426,3 @@ index f3cb36f..69fb7a1 100644
static void setup_tun_interface(unsigned int flags, unsigned change,
void *data)
{
--
1.9.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5c558b979b6ac3bb7a1e35b0be989cac0135d738 Mon Sep 17 00:00:00 2001
From 3f07e5a35bde758e5839bf80836496d489b72db4 Mon Sep 17 00:00:00 2001
From: "sungmok.shin" <[email protected]>
Date: Wed, 28 Aug 2019 15:35:45 +0900
Subject: [PATCH] Support channel frequency of scanned AP
Expand All @@ -18,7 +18,7 @@ Support channel frequency of scanned AP
9 files changed, 583 insertions(+), 2 deletions(-)

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index 77dfe56e..3520ee73 100644
index 77dfe56..3520ee7 100644
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -304,6 +304,14 @@ GSupplicantPeer *g_supplicant_interface_peer_lookup(GSupplicantInterface *interf
Expand Down Expand Up @@ -55,7 +55,7 @@ index 77dfe56e..3520ee73 100644
const char *g_supplicant_peer_get_path(GSupplicantPeer *peer);
const char *g_supplicant_peer_get_identifier(GSupplicantPeer *peer);
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 452492af..fc6074c6 100644
index 452492a..fc6074c 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -169,6 +169,10 @@ struct _GSupplicantInterface {
Expand Down Expand Up @@ -252,7 +252,7 @@ index 452492af..fc6074c6 100644
+ return ret;
+}
diff --git a/include/device.h b/include/device.h
index 140f9bcf..04eb35de 100644
index 140f9bc..04eb35d 100644
--- a/include/device.h
+++ b/include/device.h
@@ -72,6 +72,7 @@ void connman_device_set_index(struct connman_device *device, int index);
Expand Down Expand Up @@ -299,7 +299,7 @@ index 140f9bcf..04eb35de 100644

int connman_device_driver_register(struct connman_device_driver *driver);
diff --git a/include/network.h b/include/network.h
index 4fc20c1c..ed61718e 100644
index 4fc20c1..ed61718 100644
--- a/include/network.h
+++ b/include/network.h
@@ -27,6 +27,7 @@
Expand Down Expand Up @@ -337,10 +337,10 @@ index 4fc20c1c..ed61718e 100644
const char *name);
int connman_network_set_strength(struct connman_network *network,
diff --git a/plugins/wifi.c b/plugins/wifi.c
index de45e011..c909a2de 100644
index cbe86a2..39c47b0 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -164,6 +164,12 @@ struct wifi_data {
@@ -163,6 +163,12 @@ struct wifi_data {
bool wps_start_deferred;
};

Expand All @@ -353,7 +353,7 @@ index de45e011..c909a2de 100644
static GList *iface_list = NULL;

static GList *pending_wifi_device = NULL;
@@ -175,6 +181,27 @@ static int tech_set_tethering(struct connman_technology *technology,
@@ -174,6 +180,27 @@ static int tech_set_tethering(struct connman_technology *technology,
const char *identifier, const char *passphrase,
const char *bridge, bool enabled);

Expand Down Expand Up @@ -381,7 +381,7 @@ index de45e011..c909a2de 100644
static int p2p_tech_probe(struct connman_technology *technology)
{
p2p_technology = technology;
@@ -2172,6 +2199,52 @@ static int wifi_cancel_wps(struct connman_device *device)
@@ -2171,6 +2198,52 @@ static int wifi_cancel_wps(struct connman_device *device)
return cancel_wps(wifi);
}

Expand Down Expand Up @@ -434,7 +434,7 @@ index de45e011..c909a2de 100644
static struct connman_device_driver wifi_ng_driver = {
.name = "wifi",
.type = CONNMAN_DEVICE_TYPE_WIFI,
@@ -2183,7 +2256,8 @@ static struct connman_device_driver wifi_ng_driver = {
@@ -2182,7 +2255,8 @@ static struct connman_device_driver wifi_ng_driver = {
.scan = wifi_scan,
.set_regdom = wifi_set_regdom,
.start_wps = wifi_start_wps,
Expand All @@ -444,23 +444,23 @@ index de45e011..c909a2de 100644
};

static void system_ready(void)
@@ -3008,6 +3082,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
@@ -3007,6 +3081,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
bool wps_pbc;
bool wps_ready;
bool wps_advertizing;
+ GHashTable *bss_table;

mode = g_supplicant_network_get_mode(supplicant_network);
identifier = g_supplicant_network_get_identifier(supplicant_network);
@@ -3027,6 +3102,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
@@ -3026,6 +3101,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
wps_ready = g_supplicant_network_is_wps_active(supplicant_network);
wps_advertizing = g_supplicant_network_is_wps_advertizing(
supplicant_network);
+ bss_table = g_supplicant_network_get_bss_table(supplicant_network);

if (!wifi)
return;
@@ -3091,6 +3167,11 @@ static void network_added(GSupplicantNetwork *supplicant_network)
@@ -3090,6 +3166,11 @@ static void network_added(GSupplicantNetwork *supplicant_network)
wifi->hidden = NULL;
}
}
Expand All @@ -472,7 +472,7 @@ index de45e011..c909a2de 100644
}

static void network_removed(GSupplicantNetwork *network)
@@ -3126,11 +3207,13 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
@@ -3125,11 +3206,13 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
struct wifi_data *wifi;
const char *name, *identifier;
struct connman_network *connman_network;
Expand All @@ -486,7 +486,7 @@ index de45e011..c909a2de 100644

DBG("name %s", name);

@@ -3141,6 +3224,11 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
@@ -3140,6 +3223,11 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
if (!connman_network)
return;

Expand All @@ -499,7 +499,7 @@ index de45e011..c909a2de 100644
connman_network_set_strength(connman_network,
calculate_strength(network));
diff --git a/src/device.c b/src/device.c
index 874e21f7..3e45413b 100644
index 874e21f..3e45413 100644
--- a/src/device.c
+++ b/src/device.c
@@ -68,6 +68,11 @@ struct connman_device {
Expand Down Expand Up @@ -599,7 +599,7 @@ index 874e21f7..3e45413b 100644
{
struct ifreq ifr;
diff --git a/src/network.c b/src/network.c
index ed56210f..cbbcd91d 100644
index ed56210..cbbcd91 100644
--- a/src/network.c
+++ b/src/network.c
@@ -44,6 +44,12 @@
Expand Down Expand Up @@ -750,7 +750,7 @@ index ed56210f..cbbcd91d 100644
* connman_network_set_name:
* @network: network structure
diff --git a/src/service.c b/src/service.c
index c7074c9c..319ecf58 100644
index c7074c9..319ecf5 100644
--- a/src/service.c
+++ b/src/service.c
@@ -141,6 +141,7 @@ static struct connman_ipconfig *create_ip4config(struct connman_service *service
Expand Down Expand Up @@ -857,7 +857,7 @@ index c7074c9c..319ecf58 100644
append_ethernet, service);
break;
diff --git a/src/technology.c b/src/technology.c
index 75e75ae5..13c64fee 100644
index 75e75ae..13c64fe 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -77,6 +77,7 @@ struct connman_technology {
Expand Down Expand Up @@ -952,6 +952,3 @@ index 75e75ae5..13c64fee 100644
static const GDBusMethodTable technology_methods[] = {
{ GDBUS_DEPRECATED_METHOD("GetProperties",
NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
--
2.17.1

Loading

0 comments on commit 02ac96d

Please sign in to comment.