From 585d4452b2fe5fa2c65f21f643a963ea98d74fac Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier Date: Mon, 6 Mar 2023 11:10:11 +0100 Subject: android-tools: allow removing fastboot from TOOLS_TO_BUILD The fastboot makefile is creating the directory $(OUT_DIR)/usr/bin, so removing fastboot from TOOLS_TO_BUILD in a bbappend resulted in a build failure because of the missing directory $(OUT_DIR)/usr/bin. Signed-off-by: Etienne Cordonnier --- .../core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch | 3 ++- .../core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'dynamic-layers/selinux') diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch index 4ecfa6f..ad9b8dd 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch @@ -27,7 +27,7 @@ diff --git a/debian/img2simg.mk b/debian/img2simg.mk index f1036cef..94772381 100644 --- a/debian/img2simg.mk +++ b/debian/img2simg.mk -@@ -1,13 +1,14 @@ +@@ -1,13 +1,15 @@ +include ../../rules_yocto.mk NAME = img2simg SOURCES = img2simg.cpp @@ -42,6 +42,7 @@ index f1036cef..94772381 100644 build: $(SOURCES) - $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) ++ mkdir --parents $(OUT_DIR)/usr/bin + $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) clean: diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch index aa60058..b7a72b8 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch @@ -27,7 +27,7 @@ diff --git a/debian/simg2img.mk b/debian/simg2img.mk index 07fb56b4..d319c87e 100644 --- a/debian/simg2img.mk +++ b/debian/simg2img.mk -@@ -1,13 +1,14 @@ +@@ -1,13 +1,15 @@ +include ../../rules_yocto.mk NAME = simg2img SOURCES = simg2img.cpp sparse_crc32.cpp @@ -42,6 +42,7 @@ index 07fb56b4..d319c87e 100644 build: $(SOURCES) - $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) ++ mkdir --parents $(OUT_DIR)/usr/bin + $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) clean: -- cgit v1.2.3-54-g00ecf