Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
Pascal Vizeli
@@ -0,0 +1,35 @@
|
||||
makefiles: use pkgconf to get libs deps
|
||||
|
||||
LIBS lists library dependencies without taking into account static linking
|
||||
that need ordered listing and more libraries listed since differently from
|
||||
shared linking dependency is not transparent(i.e. -lcrypto could need
|
||||
-latomic etc.).
|
||||
|
||||
Replace -lcrypto with `pkg-config --libs libcrypto` command to be sure all
|
||||
needed libraries are listed during linking.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
diff -urpN android-tools-4.2.2+git20130218.orig/debian/makefiles/adbd.mk android-tools-4.2.2+git20130218/debian/makefiles/adbd.mk
|
||||
--- android-tools-4.2.2+git20130218.orig/debian/makefiles/adbd.mk 2019-04-08 16:05:02.967710428 +0200
|
||||
+++ android-tools-4.2.2+git20130218/debian/makefiles/adbd.mk 2019-04-08 16:30:42.463084426 +0200
|
||||
@@ -44,7 +44,7 @@ CPPFLAGS+= -DADBD_NON_ANDROID
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/adbd
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
|
||||
-LIBS+= -lc -lpthread -lz -lcrypto -lcrypt
|
||||
+LIBS+= -lc -lpthread -lz `pkg-config --libs libcrypto` -lcrypt
|
||||
|
||||
OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
|
||||
|
||||
diff -urpN android-tools-4.2.2+git20130218.orig/debian/makefiles/adb.mk android-tools-4.2.2+git20130218/debian/makefiles/adb.mk
|
||||
--- android-tools-4.2.2+git20130218.orig/debian/makefiles/adb.mk 2019-04-08 16:05:02.959701400 +0200
|
||||
+++ android-tools-4.2.2+git20130218/debian/makefiles/adb.mk 2019-04-08 16:31:06.529426250 +0200
|
||||
@@ -41,7 +41,7 @@ CPPFLAGS+= -DHAVE_TERMIO_H
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/adb
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
|
||||
-LIBS+= -lc -lpthread -lz -lcrypto
|
||||
+LIBS+= -lc -lpthread -lz `pkg-config --libs libcrypto`
|
||||
|
||||
OBJS= $(SRCS:.c=.o)
|
||||
@@ -1,36 +0,0 @@
|
||||
Fix static linking of adb/adbd
|
||||
|
||||
Both adb and adbd use OpenSSL, which indirectly uses zlib. Since
|
||||
adb/adbd also use zlib directly -lz is included in the linker flags,
|
||||
but not at the right position to ensure that static linking works: to
|
||||
make it possible for OpenSSL symbols to see zlib symbols, -lz must
|
||||
appear after -lcrypto.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/debian/makefiles/adb.mk
|
||||
===================================================================
|
||||
--- a/debian/makefiles/adb.mk
|
||||
+++ b/debian/makefiles/adb.mk
|
||||
@@ -41,7 +41,7 @@
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/adb
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
|
||||
-LIBS+= -lc -lpthread -lz -lcrypto
|
||||
+LIBS+= -lc -lpthread -lcrypto -lz
|
||||
|
||||
OBJS= $(SRCS:.c=.o)
|
||||
|
||||
Index: b/debian/makefiles/adbd.mk
|
||||
===================================================================
|
||||
--- a/debian/makefiles/adbd.mk
|
||||
+++ b/debian/makefiles/adbd.mk
|
||||
@@ -44,7 +44,7 @@
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/adbd
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
|
||||
-LIBS+= -lc -lpthread -lz -lcrypto -lcrypt
|
||||
+LIBS+= -lc -lpthread -lcrypto -lz -lcrypt
|
||||
|
||||
OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
From d24abbec201975a5eb7f8589614cfb424b8c80b6 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Kaplan <kaplan2539@gmail.com>
|
||||
Date: Sat, 10 Nov 2018 19:50:51 -0800
|
||||
Subject: [PATCH] Fix makefiles for out-of-tree ext4_utils build
|
||||
|
||||
Signed-off-by: Alex Kaplan <kaplan2539@gmail.com>
|
||||
---
|
||||
debian/makefiles/ext4_utils.mk | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/debian/makefiles/ext4_utils.mk b/debian/makefiles/ext4_utils.mk
|
||||
index cb64916..c5904bf 100644
|
||||
--- a/debian/makefiles/ext4_utils.mk
|
||||
+++ b/debian/makefiles/ext4_utils.mk
|
||||
@@ -1,6 +1,7 @@
|
||||
# Makefile for ext4_utils; based on https://heiher.info/2227.html
|
||||
# Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
|
||||
|
||||
+VPATH+=$(SRCDIR)/extras/ext4_utils
|
||||
SRCS+=make_ext4fs.c
|
||||
SRCS+=ext4fixup.c
|
||||
SRCS+=ext4_utils.c
|
||||
@@ -13,7 +14,7 @@ SRCS+=sha1.c
|
||||
SRCS+=wipe.c
|
||||
SRCS+=crc16.c
|
||||
|
||||
-VPATH+=../../core/libsparse
|
||||
+VPATH+=$(SRCDIR)/core/libsparse
|
||||
SRCS+= backed_block.c
|
||||
SRCS+= sparse_crc32.c
|
||||
SRCS+= sparse.c
|
||||
@@ -31,10 +32,9 @@ SRCS+=img2simg.c
|
||||
SRCS+=simg2img.c
|
||||
SRCS+=simg2simg.c
|
||||
|
||||
-CPPFLAGS+= -I.
|
||||
-CPPFLAGS+= -I/usr/include
|
||||
-CPPFLAGS+= -I../../core/include
|
||||
-CPPFLAGS+= -I../../core/libsparse/include/
|
||||
+CPPFLAGS+= -I$(SRCDIR)
|
||||
+CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
+CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include/
|
||||
|
||||
LIBS+= -lz -lselinux
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From bb3da0e32be4f2260940edf3ee0f88103dfd0dcc Mon Sep 17 00:00:00 2001
|
||||
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
||||
Date: Tue, 5 Feb 2019 01:12:19 +0200
|
||||
Subject: [PATCH] adb: added patch for openssl 1.1.0 compatibility
|
||||
|
||||
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
||||
|
||||
[Vadim: took only adb related part from
|
||||
https://github.com/lede-project/source/commit/f63f20fb93c7e67775cb01d97fc88b5b29452b81]
|
||||
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
|
||||
---
|
||||
core/adb/adb_auth_host.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/core/adb/adb_auth_host.c b/core/adb/adb_auth_host.c
|
||||
index 9039d42..debd2ef 100644
|
||||
--- a/core/adb/adb_auth_host.c
|
||||
+++ b/core/adb/adb_auth_host.c
|
||||
@@ -79,7 +79,13 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
|
||||
}
|
||||
|
||||
BN_set_bit(r32, 32);
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+ const BIGNUM *rsa_n, *rsa_e;
|
||||
+ RSA_get0_key(rsa, &rsa_n, &rsa_e, NULL);
|
||||
+ BN_copy(n, rsa_n);
|
||||
+#else
|
||||
BN_copy(n, rsa->n);
|
||||
+#endif
|
||||
BN_set_bit(r, RSANUMWORDS * 32);
|
||||
BN_mod_sqr(rr, r, n, ctx);
|
||||
BN_div(NULL, rem, n, r32, ctx);
|
||||
@@ -93,7 +99,11 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
|
||||
BN_div(n, rem, n, r32, ctx);
|
||||
pkey->n[i] = BN_get_word(rem);
|
||||
}
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+ pkey->exponent = BN_get_word(rsa_e);
|
||||
+#else
|
||||
pkey->exponent = BN_get_word(rsa->e);
|
||||
+#endif
|
||||
|
||||
out:
|
||||
BN_free(n0inv);
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -23,4 +23,11 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB
|
||||
host, which can be used to interact with target devices
|
||||
implementing the ADB protocol.
|
||||
|
||||
config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS
|
||||
bool "ext4 utils"
|
||||
help
|
||||
This option will build and install the ext4 utils for the
|
||||
host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg,
|
||||
simg2img and simg2simg.
|
||||
|
||||
endif
|
||||
|
||||
@@ -11,6 +11,8 @@ ANDROID_TOOLS_EXTRA_DOWNLOADS = android-tools_$(ANDROID_TOOLS_VERSION)-3ubuntu41
|
||||
HOST_ANDROID_TOOLS_EXTRA_DOWNLOADS = $(ANDROID_TOOLS_EXTRA_DOWNLOADS)
|
||||
ANDROID_TOOLS_LICENSE = Apache-2.0
|
||||
ANDROID_TOOLS_LICENSE_FILES = debian/copyright
|
||||
ANDROID_TOOLS_DEPENDENCIES = host-pkgconf
|
||||
HOST_ANDROID_TOOLS_DEPENDENCIES = host-pkgconf
|
||||
|
||||
# Extract the Debian tarball inside the sources
|
||||
define ANDROID_TOOLS_DEBIAN_EXTRACT
|
||||
@@ -31,15 +33,24 @@ HOST_ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
|
||||
ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT),y)
|
||||
HOST_ANDROID_TOOLS_TARGETS += fastboot
|
||||
HOST_ANDROID_TOOLS_BUILD_TARGETS += fastboot
|
||||
HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-fastboot/fastboot
|
||||
HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-libselinux
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB),y)
|
||||
HOST_ANDROID_TOOLS_TARGETS += adb
|
||||
HOST_ANDROID_TOOLS_BUILD_TARGETS += adb
|
||||
HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-adb/adb
|
||||
HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS),y)
|
||||
HOST_ANDROID_TOOLS_BUILD_TARGETS += ext4_utils
|
||||
HOST_ANDROID_TOOLS_INSTALL_TARGETS += \
|
||||
$(addprefix build-ext4_utils/,make_ext4fs ext4fixup ext2simg img2simg simg2img simg2simg)
|
||||
HOST_ANDROID_TOOLS_DEPENDENCIES += host-libselinux
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT),y)
|
||||
ANDROID_TOOLS_TARGETS += fastboot
|
||||
ANDROID_TOOLS_DEPENDENCIES += zlib libselinux
|
||||
@@ -58,7 +69,7 @@ endif
|
||||
# Build each tool in its own directory not to share object files
|
||||
|
||||
define HOST_ANDROID_TOOLS_BUILD_CMDS
|
||||
$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
|
||||
$(foreach t,$(HOST_ANDROID_TOOLS_BUILD_TARGETS),\
|
||||
mkdir -p $(@D)/build-$(t) && \
|
||||
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \
|
||||
-C $(@D)/build-$(t) -f $(@D)/debian/makefiles/$(t).mk$(sep))
|
||||
@@ -72,8 +83,8 @@ define ANDROID_TOOLS_BUILD_CMDS
|
||||
endef
|
||||
|
||||
define HOST_ANDROID_TOOLS_INSTALL_CMDS
|
||||
$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
|
||||
$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/bin/$(t)$(sep))
|
||||
$(foreach t,$(HOST_ANDROID_TOOLS_INSTALL_TARGETS),\
|
||||
$(INSTALL) -D -m 0755 $(@D)/$(t) $(HOST_DIR)/bin/$(notdir $(t))$(sep))
|
||||
endef
|
||||
|
||||
define ANDROID_TOOLS_INSTALL_TARGET_CMDS
|
||||
|
||||
Reference in New Issue
Block a user