Merge pull request #199 from hclee/for-next

For next
namjaejeon · Sep 9, 2022 · 2b84172 · 2b84172
2 parents 322d5fe + d45d4da
commit 2b84172
Show file tree

Hide file tree

Showing 35 changed files with 3,429 additions and 1,232 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ notifications:
 
 before_script:
  - sudo apt-get install linux-headers-$(uname -r)
+ - sudo apt-get install xz-utils
  - git clone --branch=exfat-next https://github.com/namjaejeon/exfat_oot
  - ./.travis_get_mainline_kernel
  - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
@@ -21,11 +22,16 @@ script:
  - ./configure > /dev/null
  - make -j$((`nproc`+1)) > /dev/null
  - sudo make install > /dev/null
+ # build & install exfat
  - cd exfat_oot
  - make > /dev/null
  - sudo make install > /dev/null
  - sudo modprobe exfat
  - sudo mkdir -p /mnt/test
+ - cd ..
+ # run fsck repair testcases
+ - cd tests
+ - sudo ./test_fsck.sh
  # create file/director test
  - truncate -s 10G test.img
  - sudo losetup /dev/loop22 test.img

diff --git a/Android.bp b/Android.bp
@@ -9,6 +9,7 @@ cc_library_headers {
         "tune",
         "label",
         "dump",
+	"exfat2img",
     ],
 }
 

diff --git a/Makefile.am b/Makefile.am
@@ -2,15 +2,16 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib mkfs fsck tune label dump
+SUBDIRS = lib mkfs fsck tune label dump exfat2img
 
 # manpages
 dist_man8_MANS =		\
 	manpages/fsck.exfat.8	\
 	manpages/tune.exfat.8	\
 	manpages/mkfs.exfat.8	\
 	manpages/exfatlabel.8	\
-	manpages/dump.exfat.8
+	manpages/dump.exfat.8	\
+	manpages/exfat2img.8
 
 # other stuff
 EXTRA_DIST =			\
@@ -22,4 +23,5 @@ EXTRA_DIST =			\
 	fsck/Android.bp		\
 	label/Android.bp	\
 	dump/Android.bp		\
+	exfat2img/Android.bp	\
 	README.md
diff --git a/configure.ac b/configure.ac
@@ -32,6 +32,7 @@ AC_CONFIG_FILES([
 	tune/Makefile
 	label/Makefile
 	dump/Makefile
+	exfat2img/Makefile
 ])
 
 AC_OUTPUT
diff --git a/exfat2img/Makefile.am b/exfat2img/Makefile.am
@@ -0,0 +1,6 @@
+AM_CFLAGS = -Wall -Wextra -include $(top_builddir)/config.h -I$(top_srcdir)/include -fno-common
+exfat2img_LDADD = $(top_builddir)/lib/libexfat.a
+
+sbin_PROGRAMS = exfat2img
+
+exfat2img_SOURCES = exfat2img.c
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ cc_library_headers { @@
             "tune",
             "label",
             "dump",
+    	"exfat2img",
         ],
     }
@@ Expand Down @@