diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch deleted file mode 100644 index 7facd61b9..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch +++ /dev/null @@ -1,62 +0,0 @@ -Subject: adb: Use local sockets where appropriate -Author: Hilko Bengen <bengen@debian.org> - -Upstream-Status: Inappropriate ---- - system/core/adb/adb.c | 6 +++++- - system/core/adb/adb_client.c | 5 +++-- - system/core/adb/transport_local.c | 3 ++- - 3 files changed, 10 insertions(+), 4 deletions(-) - ---- a/system/core/adb/adb.c -+++ b/system/core/adb/adb.c -@@ -1230,7 +1230,11 @@ int launch_server(int server_port) - */ - void build_local_name(char* target_str, size_t target_size, int server_port) - { -- snprintf(target_str, target_size, "tcp:%d", server_port); -+ if (gListenAll > 0) { -+ snprintf(target_str, target_size, "tcp:%d", server_port); -+ } else { -+ snprintf(target_str, target_size, "local:%d", server_port); -+ } - } - - #if !ADB_HOST ---- a/system/core/adb/adb_client.c -+++ b/system/core/adb/adb_client.c -@@ -185,12 +185,12 @@ int _adb_connect(const char *service) - strcpy(__adb_error, "service name too long"); - return -1; - } -- snprintf(tmp, sizeof tmp, "%04x", len); -+ snprintf(tmp, sizeof tmp, "%d", __adb_server_port); - - if (__adb_server_name) - fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM); - else -- fd = socket_loopback_client(__adb_server_port, SOCK_STREAM); -+ fd = socket_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); - - if(fd < 0) { - strcpy(__adb_error, "cannot connect to daemon"); -@@ -201,6 +201,7 @@ int _adb_connect(const char *service) - return -1; - } - -+ snprintf(tmp, sizeof tmp, "%04x", len); - if(writex(fd, tmp, 4) || writex(fd, service, len)) { - strcpy(__adb_error, "write failure during connection"); - adb_close(fd); ---- a/system/core/adb/transport_local.c -+++ b/system/core/adb/transport_local.c -@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int co - } - #endif - if (fd < 0) { -- fd = socket_loopback_client(adb_port, SOCK_STREAM); -+ snprintf(buf, sizeof buf, "%d", adb_port); -+ fd = socket_local_client(buf, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); - } - - if (fd >= 0) { |