From 5d3284cb14c9c97fcd6bdb71e0c7a525ae5d83c8 Mon Sep 17 00:00:00 2001
From: Filip Stedronsky
Date: Thu, 1 Feb 2018 12:35:34 +0100
Subject: [PATCH 1/3] Fix compatibility with Boost 1.66
Do not use deprecated native() method.
---
src/anbox/network/base_socket_messenger.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/anbox/network/base_socket_messenger.cpp b/src/anbox/network/base_socket_messenger.cpp
index fb093f3..23efc78 100644
--- a/src/anbox/network/base_socket_messenger.cpp
+++ b/src/anbox/network/base_socket_messenger.cpp
@@ -138,7 +138,7 @@ unsigned short BaseSocketMessenger::local_port() const {
template
void BaseSocketMessenger::set_no_delay() {
- const auto fd = socket->native();
+ const auto fd = socket->native_handle();
int flag = 1;
const auto ret =
::setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
From 633b4ddb374eeef2af25d991c4a7af8b03d55616 Mon Sep 17 00:00:00 2001
From: Mustafa Kuscu
Date: Sun, 11 Feb 2018 01:44:08 +0300
Subject: [PATCH 2/3] fix argument in binder_set_stop_on_user_error
binder_set_stop_on_user_error second argument breaks build.
---
kernel/binder/binder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/binder/binder.c b/kernel/binder/binder.c
index fb939e6..f904646 100644
--- a/kernel/binder/binder.c
+++ b/kernel/binder/binder.c
@@ -137,7 +137,7 @@ static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
static int binder_stop_on_user_error;
static int binder_set_stop_on_user_error(const char *val,
- struct kernel_param *kp)
+ const struct kernel_param *kp)
{
int ret;
From f17433117097222298f4f68a16da90b596265fbb Mon Sep 17 00:00:00 2001
From: Mustafa Kuscu
Date: Mon, 12 Feb 2018 11:17:06 +0300
Subject: [PATCH 3/3] make the patch specific to kernel 4.15 and later
The change starts with kernel 4.15.
---
kernel/binder/binder.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/binder/binder.c b/kernel/binder/binder.c
index f904646..9ccadf1 100644
--- a/kernel/binder/binder.c
+++ b/kernel/binder/binder.c
@@ -137,7 +137,11 @@ static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
static int binder_stop_on_user_error;
static int binder_set_stop_on_user_error(const char *val,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
const struct kernel_param *kp)
+#else
+ struct kernel_param *kp)
+#endif
{
int ret;