diff options
2 files changed, 4 insertions, 2 deletions
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 | |||
| 27 | index f1036cef..94772381 100644 | 27 | index f1036cef..94772381 100644 |
| 28 | --- a/debian/img2simg.mk | 28 | --- a/debian/img2simg.mk |
| 29 | +++ b/debian/img2simg.mk | 29 | +++ b/debian/img2simg.mk |
| 30 | @@ -1,13 +1,14 @@ | 30 | @@ -1,13 +1,15 @@ |
| 31 | +include ../../rules_yocto.mk | 31 | +include ../../rules_yocto.mk |
| 32 | NAME = img2simg | 32 | NAME = img2simg |
| 33 | SOURCES = img2simg.cpp | 33 | SOURCES = img2simg.cpp |
| @@ -42,6 +42,7 @@ index f1036cef..94772381 100644 | |||
| 42 | 42 | ||
| 43 | build: $(SOURCES) | 43 | build: $(SOURCES) |
| 44 | - $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) | 44 | - $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) |
| 45 | + mkdir --parents $(OUT_DIR)/usr/bin | ||
| 45 | + $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) | 46 | + $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) |
| 46 | 47 | ||
| 47 | clean: | 48 | 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 | |||
| 27 | index 07fb56b4..d319c87e 100644 | 27 | index 07fb56b4..d319c87e 100644 |
| 28 | --- a/debian/simg2img.mk | 28 | --- a/debian/simg2img.mk |
| 29 | +++ b/debian/simg2img.mk | 29 | +++ b/debian/simg2img.mk |
| 30 | @@ -1,13 +1,14 @@ | 30 | @@ -1,13 +1,15 @@ |
| 31 | +include ../../rules_yocto.mk | 31 | +include ../../rules_yocto.mk |
| 32 | NAME = simg2img | 32 | NAME = simg2img |
| 33 | SOURCES = simg2img.cpp sparse_crc32.cpp | 33 | SOURCES = simg2img.cpp sparse_crc32.cpp |
| @@ -42,6 +42,7 @@ index 07fb56b4..d319c87e 100644 | |||
| 42 | 42 | ||
| 43 | build: $(SOURCES) | 43 | build: $(SOURCES) |
| 44 | - $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) | 44 | - $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) |
| 45 | + mkdir --parents $(OUT_DIR)/usr/bin | ||
| 45 | + $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) | 46 | + $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) |
| 46 | 47 | ||
| 47 | clean: | 48 | clean: |