1*4882a593SmuzhiyunFrom e284ceac2b10133ca916bbae8055f040607b506c Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Etienne Cordonnier <ecordonnier@snap.com> 3*4882a593SmuzhiyunDate: Fri, 3 Mar 2023 13:21:49 +0100 4*4882a593SmuzhiyunSubject: [PATCH 1/2] libext4_utils.mk: modifications to make it build in yocto 5*4882a593Smuzhiyun environment 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunAdding an include file that is setting the common flags. 8*4882a593SmuzhiyunChanged the cppflag to include the headers from other components 9*4882a593Smuzhiyunof android-tools 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunModified LDflags so that the libraries that are coming from other android-tools 12*4882a593Smuzhiyunare searched in the output folder. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunModified the build rule so that it outputs the binary and header to the OUT_DIR 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun debian/libext4_utils.mk | 13 ++++++++----- 19*4882a593Smuzhiyun 1 file changed, 8 insertions(+), 5 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/debian/libext4_utils.mk b/debian/libext4_utils.mk 22*4882a593Smuzhiyunindex 868e790..2e93158 100644 23*4882a593Smuzhiyun--- a/debian/libext4_utils.mk 24*4882a593Smuzhiyun+++ b/debian/libext4_utils.mk 25*4882a593Smuzhiyun@@ -1,3 +1,4 @@ 26*4882a593Smuzhiyun+include ../../rules_yocto.mk 27*4882a593Smuzhiyun NAME = libext4_utils 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun ext4_utils_SOURCES := \ 30*4882a593Smuzhiyun@@ -17,14 +18,16 @@ CPPFLAGS += \ 31*4882a593Smuzhiyun -Iext4_utils/include \ 32*4882a593Smuzhiyun -Ilibfec/include \ 33*4882a593Smuzhiyun -Isquashfs_utils \ 34*4882a593Smuzhiyun- -I/usr/include/android \ 35*4882a593Smuzhiyun+ -I/usr/include/android -I$(OUT_DIR)/usr/include \ 36*4882a593Smuzhiyun -D_GNU_SOURCE -DFEC_NO_KLOG -DSQUASHFS_NO_KLOG -D_LARGEFILE64_SOURCE 37*4882a593Smuzhiyun LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \ 38*4882a593Smuzhiyun -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ 39*4882a593Smuzhiyun- -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \ 40*4882a593Smuzhiyun+ -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ \ 41*4882a593Smuzhiyun -lbase -lsparse -lselinux 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun build: $(SOURCES) 44*4882a593Smuzhiyun- mkdir --parents $(OUT_DIR) 45*4882a593Smuzhiyun- $(CC) $^ -o $(OUT_DIR)/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) 46*4882a593Smuzhiyun- ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so 47*4882a593Smuzhiyun+ mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ 48*4882a593Smuzhiyun+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) 49*4882a593Smuzhiyun+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so 50*4882a593Smuzhiyun+ cp -r ext4_utils/include/* $(OUT_DIR)/usr/include/ 51*4882a593Smuzhiyun+ 52*4882a593Smuzhiyun-- 53*4882a593Smuzhiyun2.36.1.vfs.0.0 54*4882a593Smuzhiyun 55