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:
@@ -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