Skip to content

Commit

Permalink
connman=webos3 (refresh patch)
Browse files Browse the repository at this point in the history 
:Release Notes:
New Yocto is more strict about applying patches which don't apply
cleanly.

: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 0004-Support-WPS-PBC-and-PIN-mode.patch
patching file gsupplicant/gsupplicant.h
Hunk #1 succeeded at 268 (offset 4 lines).
Hunk #2 succeeded at 361 (offset 5 lines).
patching file gsupplicant/supplicant.c
Hunk #1 succeeded at 699 (offset 13 lines).
Hunk #2 succeeded at 2918 (offset 127 lines).
Hunk #3 succeeded at 5041 (offset 159 lines).
patching file include/device.h
patching file include/technology.h
patching file plugins/wifi.c
Hunk #3 succeeded at 156 (offset 4 lines).
Hunk #4 succeeded at 207 (offset 4 lines).
Hunk #5 succeeded at 798 (offset 6 lines).
Hunk #6 succeeded at 1960 (offset 6 lines).
Hunk #7 succeeded at 2181 (offset 6 lines).
Hunk #8 succeeded at 2207 (offset 6 lines).
Hunk #9 succeeded at 2237 (offset 6 lines).
Hunk #10 succeeded at 2358 (offset 14 lines).
Hunk #11 succeeded at 2404 with fuzz 2.
Hunk #19 succeeded at 2805 (offset 13 lines).
Hunk #20 succeeded at 3422 (offset 55 lines).
patching file src/connman.h
Hunk #1 succeeded at 560 (offset 7 lines).
patching file src/device.c
Hunk #1 succeeded at 1108 (offset -4 lines).
patching file src/service.c
patching file src/technology.c
Hunk #1 succeeded at 1092 (offset 23 lines).
Hunk #2 succeeded at 1144 (offset 23 lines).

Now at patch 0004-Support-WPS-PBC-and-PIN-mode.patch

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-60242] [OSE] Fix build issues
[PLAT-52479] Upgrade to Yocto 2.5 Sumo
[PLAT-52480] CCC: Upgrade to Yocto 2.5 Sumo
[PLAT-56432] CCC: Refresh patches which don't apply cleanly
  • Loading branch information
@shr-project
shr-project authored and Changhyeok Bae committed Jul 13, 2018
1 parent 911036d commit 16a5dcd
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 33 deletions.
62 changes: 30 additions & 32 deletions meta-webos/recipes-connectivity/connman/connman/0004-Support-WPS-PBC-and-PIN-mode.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d5c54345080be6f692be8af851c13edb2ce02a56 Mon Sep 17 00:00:00 2001
From 1886b233b6c8ab77066b4a58a88c31738c23fff0 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 @@ -16,6 +16,7 @@ another method to the technology interface which starts the WPS connection
process without requiring a specific SSID.

Upstream-Status : Inappropriate [webOS specific]

---
gsupplicant/gsupplicant.h | 5 +
gsupplicant/supplicant.c | 66 ++++++++
Expand All @@ -29,10 +30,10 @@ Upstream-Status : Inappropriate [webOS specific]
9 files changed, 611 insertions(+), 20 deletions(-)

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index 26fd2ca..eae1e26 100644
index db61595..77dfe56 100644
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -264,6 +264,10 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface,
@@ -268,6 +268,10 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface,
GSupplicantInterfaceCallback callback,
void *user_data);

Expand All @@ -43,7 +44,7 @@ index 26fd2ca..eae1e26 100644
int g_supplicant_interface_set_apscan(GSupplicantInterface *interface,
unsigned int ap_scan);

@@ -352,6 +356,7 @@ struct _GSupplicantCallbacks {
@@ -357,6 +361,7 @@ struct _GSupplicantCallbacks {
void (*peer_changed) (GSupplicantPeer *peer,
GSupplicantPeerState state);
void (*peer_request) (GSupplicantPeer *peer);
Expand All @@ -52,10 +53,10 @@ index 26fd2ca..eae1e26 100644
void (*disconnect_reasoncode)(GSupplicantInterface *interface,
int reasoncode);
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 4cb533d..4161ec4 100644
index 4f79012..736cee3 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -686,6 +686,17 @@ static void remove_group(gpointer data)
@@ -699,6 +699,17 @@ static void remove_group(gpointer data)
g_free(group);
}

Expand All @@ -73,7 +74,7 @@ index 4cb533d..4161ec4 100644
static void remove_interface(gpointer data)
{
GSupplicantInterface *interface = data;
@@ -2780,6 +2791,8 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter)
@@ -2907,6 +2918,8 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter)
dbus_message_iter_next(iter);

supplicant_dbus_property_foreach(iter, wps_event_args, interface);
Expand All @@ -82,7 +83,7 @@ index 4cb533d..4161ec4 100644
}

static void create_peer_identifier(GSupplicantPeer *peer)
@@ -4869,6 +4882,59 @@ int g_supplicant_interface_connect(GSupplicantInterface *interface,
@@ -5028,6 +5041,59 @@ int g_supplicant_interface_connect(GSupplicantInterface *interface,
return -EINPROGRESS;
}

Expand Down Expand Up @@ -156,7 +157,7 @@ index 9ac800a..140f9bc 100644

int connman_device_driver_register(struct connman_device_driver *driver);
diff --git a/include/technology.h b/include/technology.h
index d7fcdde..240006a 100644
index 97db660..54f3b4d 100644
--- a/include/technology.h
+++ b/include/technology.h
@@ -46,6 +46,8 @@ bool connman_technology_get_wifi_tethering(const char **ssid,
Expand All @@ -169,7 +170,7 @@ index d7fcdde..240006a 100644
const char *name;
enum connman_service_type type;
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 148131d..2798de3 100644
index 2b28c50..5d6cbb9 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -61,6 +61,7 @@
Expand All @@ -189,7 +190,7 @@ index 148131d..2798de3 100644
enum wifi_ap_capability{
WIFI_AP_UNKNOWN = 0,
WIFI_AP_SUPPORTED = 1,
@@ -149,6 +152,11 @@ struct wifi_data {
@@ -153,6 +156,11 @@ struct wifi_data {
int servicing;
int disconnect_code;
int assoc_code;
Expand All @@ -201,7 +202,7 @@ index 148131d..2798de3 100644
};

static GList *iface_list = NULL;
@@ -195,6 +203,17 @@ static bool is_p2p_connecting(void)
@@ -199,6 +207,17 @@ static bool is_p2p_connecting(void)
return false;
}

Expand All @@ -219,7 +220,7 @@ index 148131d..2798de3 100644
static void add_pending_wifi_device(struct wifi_data *wifi)
{
if (g_list_find(pending_wifi_device, wifi))
@@ -773,6 +792,9 @@ static int wifi_probe(struct connman_device *device)
@@ -779,6 +798,9 @@ static int wifi_probe(struct connman_device *device)

wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
wifi_newlink, device);
Expand All @@ -229,7 +230,7 @@ index 148131d..2798de3 100644
if (is_p2p_connecting())
add_pending_wifi_device(wifi);
else
@@ -1932,6 +1954,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
@@ -1938,6 +1960,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
return ret;
}

Expand Down Expand Up @@ -447,7 +448,7 @@ index 148131d..2798de3 100644
static struct connman_device_driver wifi_ng_driver = {
.name = "wifi",
.type = CONNMAN_DEVICE_TYPE_WIFI,
@@ -1942,6 +2175,8 @@ static struct connman_device_driver wifi_ng_driver = {
@@ -1948,6 +2181,8 @@ static struct connman_device_driver wifi_ng_driver = {
.disable = wifi_disable,
.scan = wifi_scan,
.set_regdom = wifi_set_regdom,
Expand All @@ -456,7 +457,7 @@ index 148131d..2798de3 100644
};

static void system_ready(void)
@@ -1966,6 +2201,23 @@ static int network_probe(struct connman_network *network)
@@ -1972,6 +2207,23 @@ static int network_probe(struct connman_network *network)
return 0;
}

Expand All @@ -480,7 +481,7 @@ index 148131d..2798de3 100644
static void network_remove(struct connman_network *network)
{
struct connman_device *device = connman_network_get_device(network);
@@ -1979,6 +2231,10 @@ static void network_remove(struct connman_network *network)
@@ -1985,6 +2237,10 @@ static void network_remove(struct connman_network *network)

if (wifi->network != network)
return;
Expand All @@ -491,7 +492,7 @@ index 148131d..2798de3 100644

wifi->network = NULL;
}
@@ -2088,6 +2344,9 @@ static int network_connect(struct connman_network *network)
@@ -2102,6 +2358,9 @@ static int network_connect(struct connman_network *network)
if (!wifi)
return -ENODEV;

Expand All @@ -502,8 +503,8 @@ index 148131d..2798de3 100644
if (!ssid)
return -ENOMEM;
@@ -2145,12 +2404,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,

wifi->disconnecting = false;
wifi->connected = false;

- if (wifi->pending_network) {
- network_connect(wifi->pending_network);
Expand Down Expand Up @@ -679,7 +680,7 @@ index 148131d..2798de3 100644
break;

case G_SUPPLICANT_STATE_DISCONNECTED:
@@ -2451,7 +2792,12 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2464,7 +2805,12 @@ static void interface_state(GSupplicantInterface *interface)
connman_network_set_associating(network, false);
wifi->disconnecting = false;

Expand All @@ -693,7 +694,7 @@ index 148131d..2798de3 100644

break;

@@ -3021,6 +3367,7 @@ static const GSupplicantCallbacks callbacks = {
@@ -3076,6 +3422,7 @@ static const GSupplicantCallbacks callbacks = {
.peer_lost = peer_lost,
.peer_changed = peer_changed,
.peer_request = peer_request,
Expand All @@ -702,10 +703,10 @@ index 148131d..2798de3 100644
.disconnect_reasoncode = disconnect_reasoncode,
.assoc_status_code = assoc_status_code,
diff --git a/src/connman.h b/src/connman.h
index e849ed8..eafafcb 100644
index da4446a..2622825 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -553,6 +553,8 @@ void __connman_device_list(DBusMessageIter *iter, void *user_data);
@@ -560,6 +560,8 @@ void __connman_device_list(DBusMessageIter *iter, void *user_data);
enum connman_service_type __connman_device_get_service_type(struct connman_device *device);
struct connman_device *__connman_device_find_device(enum connman_service_type type);
int __connman_device_request_scan(enum connman_service_type type);
Expand All @@ -715,10 +716,10 @@ index e849ed8..eafafcb 100644
const char *ssid, unsigned int ssid_len,
const char *identity, const char *passphrase,
diff --git a/src/device.c b/src/device.c
index 742b3c4..2a6f505 100644
index a563f46..874e21f 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1112,6 +1112,122 @@ int __connman_device_request_hidden_scan(struct connman_device *device,
@@ -1108,6 +1108,122 @@ int __connman_device_request_hidden_scan(struct connman_device *device,
passphrase, security, user_data);
}

Expand Down Expand Up @@ -842,7 +843,7 @@ index 742b3c4..2a6f505 100644
{
struct ifreq ifr;
diff --git a/src/service.c b/src/service.c
index 768426b..84ab2e3 100644
index 02cd51f..13902ba 100644
--- a/src/service.c
+++ b/src/service.c
@@ -49,6 +49,8 @@ static unsigned int vpn_autoconnect_timeout = 0;
Expand All @@ -855,10 +856,10 @@ index 768426b..84ab2e3 100644
bool valid;
bool enabled;
diff --git a/src/technology.c b/src/technology.c
index 660af52..5a8c59c 100644
index d2f0ae2..b735011 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -1069,6 +1069,50 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
@@ -1092,6 +1092,50 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
return NULL;
}

Expand Down Expand Up @@ -909,7 +910,7 @@ index 660af52..5a8c59c 100644
static const GDBusMethodTable technology_methods[] = {
{ GDBUS_DEPRECATED_METHOD("GetProperties",
NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
@@ -1077,12 +1121,17 @@ static const GDBusMethodTable technology_methods[] = {
@@ -1100,12 +1144,17 @@ static const GDBusMethodTable technology_methods[] = {
GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
NULL, set_property) },
{ GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) },
Expand All @@ -927,6 +928,3 @@ index 660af52..5a8c59c 100644
{ },
};

--
1.9.1

2 changes: 1 addition & 1 deletion meta-webos/recipes-connectivity/connman/connman_1.33.bbappend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"

EXTENDPRAUTO_append = "webos2"
EXTENDPRAUTO_append = "webos3"

SRC_URI += " \
file://0004-Support-WPS-PBC-and-PIN-mode.patch \
Expand Down

0 comments on commit 16a5dcd

Please sign in to comment.