0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 3c4319da20fab4e48ec02e28f5b013b4a33b5fe4 Mon Sep 17 00:00:00 2001
  2. From: Alex Kaplan <kaplan2539@gmail.com>
  3. Date: Sat, 10 Nov 2018 19:50:51 -0800
  4. Subject: [PATCH] Fix makefiles for out-of-tree ext4_utils build
  5. Signed-off-by: Alex Kaplan <kaplan2539@gmail.com>
  6. ---
  7. debian/makefiles/ext4_utils.mk | 10 +++++-----
  8. 1 file changed, 5 insertions(+), 5 deletions(-)
  9. diff --git a/debian/makefiles/ext4_utils.mk b/debian/makefiles/ext4_utils.mk
  10. index cb64916..c5904bf 100644
  11. --- a/debian/makefiles/ext4_utils.mk
  12. +++ b/debian/makefiles/ext4_utils.mk
  13. @@ -1,6 +1,7 @@
  14. # Makefile for ext4_utils; based on https://heiher.info/2227.html
  15. # Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
  16. +VPATH+=$(SRCDIR)/extras/ext4_utils
  17. SRCS+=make_ext4fs.c
  18. SRCS+=ext4fixup.c
  19. SRCS+=ext4_utils.c
  20. @@ -13,7 +14,7 @@ SRCS+=sha1.c
  21. SRCS+=wipe.c
  22. SRCS+=crc16.c
  23. -VPATH+=../../core/libsparse
  24. +VPATH+=$(SRCDIR)/core/libsparse
  25. SRCS+= backed_block.c
  26. SRCS+= sparse_crc32.c
  27. SRCS+= sparse.c
  28. @@ -31,10 +32,9 @@ SRCS+=img2simg.c
  29. SRCS+=simg2img.c
  30. SRCS+=simg2simg.c
  31. -CPPFLAGS+= -I.
  32. -CPPFLAGS+= -I/usr/include
  33. -CPPFLAGS+= -I../../core/include
  34. -CPPFLAGS+= -I../../core/libsparse/include/
  35. +CPPFLAGS+= -I$(SRCDIR)
  36. +CPPFLAGS+= -I$(SRCDIR)/core/include
  37. +CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include/
  38. LIBS+= -lz -lselinux
  39. --
  40. 2.47.0