567928e5ad
This patch adds an option to build and install the ext4_utils for the host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg, simg2img and simg2simg. Signed-off-by: Alex Kaplan <kaplan2539@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: - simplify a bit the installation logic by using a single HOST_ANDROID_TOOLS_INSTALL_TARGETS variable, instead of having one specific for ext4 tools - drop "default n" from Config.in.host] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
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
|
|
|