diff options
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/simg2img_change_out_dir.patch')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/simg2img_change_out_dir.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/simg2img_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/simg2img_change_out_dir.patch new file mode 100644 index 0000000..d17adff --- /dev/null +++ b/dynamic-layers/selinux/android-tools/android-tools/simg2img_change_out_dir.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | patching simg2img.mk to build in yocto environment. | ||
2 | |||
3 | Changes include: | ||
4 | Introduced an output folder which will keep all the outputs from the | ||
5 | android-tools. | ||
6 | |||
7 | Adding an include file that is setting the common flags. | ||
8 | Changed the cppflag to include the headers from other components | ||
9 | of android-tools | ||
10 | |||
11 | Modified LDflags so that the libraries that are coming from other android-tools | ||
12 | are searched in the output folder. | ||
13 | |||
14 | Modified the build rule so that it outputs the binary to the OUT_DIR | ||
15 | |||
16 | Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | |||
20 | --- git/system/core/debian/simg2img.mk 2021-05-12 09:47:52.577840520 +0000 | ||
21 | +++ git/system/core/debian/simg2img.mk 2021-05-12 09:51:43.525678276 +0000 | ||
22 | @@ -1,13 +1,14 @@ | ||
23 | +include ../../rules_yocto.mk | ||
24 | NAME = simg2img | ||
25 | SOURCES = simg2img.cpp sparse_crc32.cpp | ||
26 | SOURCES := $(foreach source, $(SOURCES), libsparse/$(source)) | ||
27 | CPPFLAGS += -Ilibsparse/include -Iinclude -std=gnu++17 | ||
28 | -LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ | ||
29 | - -Wl,-rpath-link=. \ | ||
30 | - -L. -lsparse | ||
31 | +LDFLAGS += -Wl,-rpath=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \ | ||
32 | + -Wl,-rpath-link=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \ | ||
33 | + -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android -lsparse | ||
34 | |||
35 | build: $(SOURCES) | ||
36 | - $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) | ||
37 | + $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) | ||
38 | |||
39 | clean: | ||
40 | - $(RM) libsparse/$(NAME) | ||
41 | + $(RM) $(OUT_DIR)/usr/bin/$(NAME) | ||