From 17c48b03f4cbef0e2b99f0932142bab9ac2caf04 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 12 Oct 2009 17:17:03 +0000 Subject: [PATCH] Reverted r1199: this revision was an attempt to eliminate the differences in patch order between the systems on which this script is run. Since the applied changes did not have any effect, I'm reverting this commit. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1203 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index dc10c9e3f..9eb9cd5c0 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -232,7 +232,7 @@ source_files_in_separate_patch="${scst_debug} ${scst_proc} ${scst_sgv} ${scst_us # Directory include/scst/ -for f in $(ls scst/include/*h 2>/dev/null | sort) +for f in $(ls scst/include/*h 2>/dev/null) do if ! in_separate_patch "${f}"; then add_file "${f}" "include/scst/${f#scst/include/}" @@ -260,7 +260,7 @@ add_file "scst/kernel/in-tree/Kconfig.scst" "drivers/scst/Kconfig" add_file "scst/kernel/in-tree/Makefile.scst" "drivers/scst/Makefile" -for f in $(ls scst/src/*.[ch] 2>/dev/null | sort) +for f in $(ls scst/src/*.[ch] 2>/dev/null) do if ! in_separate_patch "${f}"; then add_file "${f}" "drivers/scst/${f#scst/src/}" @@ -295,7 +295,7 @@ add_file "scst/kernel/in-tree/Makefile.dev_handlers" \ "drivers/scst/dev_handlers/Makefile" \ | process_patch "dev_handlers_makefile.diff" -for f in $(ls scst/src/dev_handlers/*.[ch] 2>/dev/null | sort) +for f in $(ls scst/src/dev_handlers/*.[ch] 2>/dev/null) do if ! in_separate_patch "${f}"; then add_file "${f}" "drivers/scst/dev_handlers/${f#scst/src/dev_handlers/}" @@ -311,7 +311,7 @@ done make -s -C iscsi-scst include/iscsi_scst_itf_ver.h ( -for f in $(ls iscsi-scst/include/*h 2>/dev/null | sort) +for f in $(ls iscsi-scst/include/*h 2>/dev/null) do if [ "${f}" != "iscsi-scst/include/iscsi_scst_itf_ver.h" ]; then add_file "${f}" "include/scst/${f#iscsi-scst/include/}" @@ -325,7 +325,7 @@ add_file "iscsi-scst/kernel/Makefile.in-kernel" \ add_file "iscsi-scst/kernel/Kconfig" "drivers/scst/iscsi-scst/Kconfig" -for f in $(ls iscsi-scst/kernel/*.[ch] 2>/dev/null | sort) +for f in $(ls iscsi-scst/kernel/*.[ch] 2>/dev/null) do add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/kernel/}" done @@ -345,7 +345,7 @@ if [ "${qla2x00t}" = "true" ]; then fi ( cd qla2x00t && ./generate-in-tree-patches "$1" ) - for f in $(ls qla2x00t/in-tree-patches/"$1"/*.patch 2>/dev/null | sort) + for f in $(ls qla2x00t/in-tree-patches/"$1"/*.patch 2>/dev/null) do g="${f#qla2x00t/in-tree-patches/$1/}" g="${g%.patch}" @@ -364,7 +364,7 @@ if [ "${qla2x00t}" = "true" ]; then add_file "qla2x00t/qla2x00-target/Kconfig" \ "drivers/scst/qla2xxx-target/Kconfig" - for f in $(ls qla2x00t/qla2x00-target/*.[ch] 2>/dev/null | sort) + for f in $(ls qla2x00t/qla2x00-target/*.[ch] 2>/dev/null) do add_file "${f}" "drivers/scst/qla2xxx-target/${f#qla2x00t/qla2x00-target/}" done @@ -391,7 +391,7 @@ if [ "$srpt" = "true" ]; then add_file "srpt/src/Makefile.in_kernel" "drivers/scst/srpt/Makefile" - for f in $(ls srpt/src/*.[ch] 2>/dev/null | sort) + for f in $(ls srpt/src/*.[ch] 2>/dev/null) do add_file "${f}" "drivers/scst/srpt/${f#srpt/src/}" done @@ -422,7 +422,7 @@ if [ "$mpt_scst" = "true" ]; then add_file "mpt/in-tree/Kconfig" "drivers/message/fusion/mpt_scst/Kconfig" - for f in $(ls mpt/*.[ch] 2>/dev/null | sort) + for f in $(ls mpt/*.[ch] 2>/dev/null) do add_file "${f}" "drivers/message/fusion/mpt_scst/${f#mpt/}" done