From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 12 Jul 2015 20:59:52 +0000 (-0400)
Subject: gen-android-files: implement 'Add MODULE_LICENSE and NOTICE files"
X-Git-Tag: android-x86-8.1-r1~49^2^2^2^2~240
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1bf3f386f389dd16606b00d3920a1847f435b248;p=android-x86%2Fexternal-e2fsprogs.git

gen-android-files: implement 'Add MODULE_LICENSE and NOTICE files"

Sync up with aosp's e2fsprogs commits:

    e1b2879841453d799dc6077f857c5c9db5e83fee
    e64b83185148d359b9b6cc1310172a3c213a61fb
    b823193090c770fe79507df2413a825250b1dcd2
    9652dd6589d10675573c9a0acc90f6df5ac33397
    a5f85097aed09890d03dba31f9d18db75ce50cd7

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/util/gen-android-files b/util/gen-android-files
index 0be3c04f..6e36e3f8 100755
--- a/util/gen-android-files
+++ b/util/gen-android-files
@@ -9,7 +9,8 @@ ANDROID_GENERATED_FILES="lib/ext2fs/ext2_err.c lib/ext2fs/ext2_err.h \
 	lib/uuid/uuid.h lib/ext2fs/crc32c_table.h misc/default_profile.c \
 	lib/ss/std_rqs.c debugfs/debug_cmds.c debugfs/ro_debug_cmds.c \
 	debugfs/extent_cmds.c debugfs/e2freefrag.c debugfs/create_inode.c \
-	debugfs/plausible.c debugfs/recovery.c debugfs/revoke.c"
+	debugfs/plausible.c debugfs/recovery.c debugfs/revoke.c \
+	MODULE_LICENSE_GPL"
 
 SS_DIR=$(pwd)/lib/ss
 MK_CMDS=/tmp/mk_cmds$$.sh
@@ -56,5 +57,11 @@ awk -f misc/profile-to-c.awk < misc/mke2fs.conf.in > misc/default_profile.c
 
 rm -f ./gen_crc32table ./gen_crc32ctable lib/ext2fs/ext2_err.et
 
+touch MODULE_LICENSE_GPL
+
 git add -f $ANDROID_GENERATED_FILES
+if test -f COPYING
+then
+   git mv COPYING NOTICE
+fi
 git commit -m "Update generated files for Android"