Synchronise with 3.6-rc6

[kconfig-frontends] / scripts / ksync.sh

diff --git a/scripts/ksync.sh b/scripts/ksync.sh
index 74aad8cb9c345dc52e3d2e5c7063e08caa2c3cd0..97fb3fe4df63b157e4e9aae56ea90b1cdfda0bac 100755 (executable)
--- a/scripts/ksync.sh
+++ b/scripts/ksync.sh
@@ -15,6 +15,9 @@ if [ ! \( -n "${k_dir}" -a -d "${k_dir}/kernel" \) ]; then
     exit 1
 fi
 
+# Save current version
+k_cset_old=$( head -n 1 .version |awk '{ print $(2); }' )
+
 # Get the kernel version
 eval $( head -n 5 "${k_dir}/Makefile"                       \
         |sed -r -e 's/^/K_/; s/"//g; s/ = ?/="/; s/$/"/;'   \
@@ -37,11 +40,22 @@ printf "%d.%d.%d%s %s %s\n%s\n"             \
        "${kf_version}"                      \
        >.version
 
-exec <scripts/kernel2kfrontends.list
+# Sync-up the files
+k_files=""
 while read k_file trash kf_file; do
+    k_files="${k_files} ${k_file}"
     mkdir -p "${kf_file%/*}"
     cp -v "${k_dir}/${k_file}" "${kf_file}"
     if [ -f "${kf_file}.patch" ]; then
         patch --no-backup-if-mismatch -g0 -F1 -p1 -f <"${kf_file}.patch"
     fi
-done
+done <scripts/ksync.list
+
+# Save the changelog between the old cset and now
+printf "Synced-up these changes:\n"
+( cd "${k_dir}"
+  git log --no-merges --pretty='tformat:%s'     \
+    "${k_cset_old}..${k_cset}"                  \
+    ${k_files}                                  \
+)|tee -a "scripts/ksync.log"                    \
+ |sed -r -e 's/^/    /;'