aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2015-07-12 18:05:40 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-07-12 21:39:31 -0400
commit1dc16b0b95622c5d44cde86e6ab8a835f88ae522 (patch)
tree3d12a785ba18b22d43f095af308943bdba6657f3 /util
parent273c2c5dfdd0d42736d8c57d0ba10e15e6c694cd (diff)
downloadandroid_external_e2fsprogs-1dc16b0b95622c5d44cde86e6ab8a835f88ae522.tar.gz
android_external_e2fsprogs-1dc16b0b95622c5d44cde86e6ab8a835f88ae522.tar.bz2
android_external_e2fsprogs-1dc16b0b95622c5d44cde86e6ab8a835f88ae522.zip
Move the profile parsing functions from e2fsck to lib/support
The profile functions started as something specific to e2fsck. It's now used by mke2fs and e2fsck, so it's better to move it into libsupport.a. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'util')
-rwxr-xr-xutil/gen-android-files9
1 files changed, 3 insertions, 6 deletions
diff --git a/util/gen-android-files b/util/gen-android-files
index 6e36e3f8..731788e7 100755
--- a/util/gen-android-files
+++ b/util/gen-android-files
@@ -1,8 +1,8 @@
#!/bin/sh
ANDROID_GENERATED_FILES="lib/ext2fs/ext2_err.c lib/ext2fs/ext2_err.h \
- lib/ss/ss_err.c lib/ss/ss_err.h e2fsck/prof_err.c \
- e2fsck/prof_err.h misc/prof_err.c misc/prof_err.h \
+ lib/ss/ss_err.c lib/ss/ss_err.h lib/support/prof_err.c \
+ lib/support/prof_err.h \
e2fsck/nls-enable.h e2fsck/plausible.c e2fsck/plausible.h \
lib/blkid/blkid_types.h lib/uuid/uuid_types.h \
lib/ext2fs/ext2_types.h lib/config.h lib/blkid/blkid.h \
@@ -20,7 +20,7 @@ sed -e "s;@SS_DIR@;$SS_DIR;" < $SS_DIR/mk_cmds.sh.in \
sed -e "s/@E2FSPROGS_VERSION@/$(git describe)/" < lib/ext2fs/ext2_err.et.in > lib/ext2fs/ext2_err.et
-for i in lib/ss/ss_err e2fsck/prof_err lib/ext2fs/ext2_err
+for i in lib/ss/ss_err lib/support/prof_err lib/ext2fs/ext2_err
do
rm -f $i.c $i.h
awk -f lib/et/et_c.awk outfile=$i.c outfn=$(basename $i.c) $i.et
@@ -36,9 +36,6 @@ done
rm -f $MK_CMDS
-rm -f misc/prof_err.[ch]
-cp e2fsck/prof_err.[ch] misc/
-
cp lib/blkid/blkid.h.in lib/blkid/blkid.h
cp lib/uuid/uuid.h.in lib/uuid/uuid.h
cp util/android_types.h lib/ext2fs/ext2_types.h