Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Brown (2c32b1b1a9f8f6e78d8e617c8aae6f8931fcd309)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (2c32b1b1a9f8f6e78d8e617c8aae6f8931fcd309)
  • Date: Wed, 28 Jun 2006 23:39:25 -0500

GIT changes to master grimoire by David Brown <dmlb2000 AT gmail.com>:

kernels/linux/HISTORY | 3 +
kernels/linux/PREPARE | 100
+++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 101 insertions(+), 2 deletions(-)

New commits:
commit 2c32b1b1a9f8f6e78d8e617c8aae6f8931fcd309
Merge: 45d1fcc16a04c8f1b72a1aac875a35896fdcc46c
3b7aaa09c2b3f11dcedc666041a23f99ce422531
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit 45d1fcc16a04c8f1b72a1aac875a35896fdcc46c
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

forgot about sleeps when generating output

commit 31526ace6354267cbfa14659ca2f4848a00a3ae6
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux added conflicts to linux patches

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 5c5b766..f66e79e 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 David Brown <dmlb2000 AT gmail.com>
+ * PREPARE: added patch conflicts
+
2006-06-27 David Brown <dmlb2000 AT gmail.com>
* latest.defaults: updated latest to 2.6.17-mm3
* info/patches/mm_patches/2.6.17-mm3: added
diff --git a/kernels/linux/PREPARE b/kernels/linux/PREPARE
index a018188..0489b28 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -838,7 +838,7 @@ function calculate_depends()
echo ".PHONY : ${makefile_targets}"
) > $DEPENDS_MAKEFILE
# this doesn't work with persistent vars don't know why?
- CANONICAL_PATCHES=$(make -sf $DEPENDS_MAKEFILE all)
+ CANONICAL_PATCHES=$(make -sf $DEPENDS_MAKEFILE all
2>/dev/null)
echo $CANONICAL_PATCHES
fi
}
@@ -1044,6 +1044,101 @@ function create_details()
esac
}

+function linux_sort_list()
+{
+ local upvar=$1
+ local list="$2"
+ local new_list=""
+ local elem
+ for elem in $list
+ do
+ if [[ ${elem/LATEST_/} == ${elem} ]]
+ then
+ new_list="${new_list}${elem} "
+ else
+ new_list="${elem} ${new_list}"
+ fi
+ done
+ eval "$upvar=\"${new_list}\""
+}
+
+function fix_conflicts_dialog()
+{
+ local list="$@"
+ local new_list
+ local menu_list=""
+ local elem
+ local retval
+ for elem in $list
+ do
+ menu_list="${menu_list}$elem patch off "
+ done
+ while true
+ do
+ new_list=$( "${dialog[@]}" --title "Fix Conflicting Patches" \
+ --cancel-label "Commit" --ok-label "Okay" --checklist \
+ "You have conflicting
patches.\nSelected patches will be removed." \
+ 0 0 0 ${menu_list} )
+ retval=$?
+ if [[ $retval == 0 ]]
+ then
+ echo "${new_list//\"}"
+ for elem in ${new_list//\"}
+ do
+ SELECTED_PATCHES="${SELECTED_PATCHES//$elem }"
+ SELECTED_PATCHES="${SELECTED_PATCHES%%$elem}"
+ done
+ break
+ else
+ break
+ fi
+ done
+}
+
+function run_conflicts()
+{
+ local patch
+ local conflicting_patch
+ local conflicting_list=""
+ message "${MESSAGE_COLOR}Generating Conflicts${DEFAULT_COLOR}"
+ echo $SELECTED_PATCHES
+ for patch in $SELECTED_PATCHES
+ do
+ source_patch ${patch}
+ for conflicting_patch in $SELECTED_PATCHES
+ do
+# duplicate patches conflict
+# just remove it...
+ if [[ ${patch} == ${conflicting_patch} ]]
+ then
+ SELECTED_PATCHES="${SELECTED_PATCHES//$patch
} ${patch}"
+ fi
+
+# built in conflicts between LATEST_<patches>
+ if [[ ${patch/LATEST_} != ${patch} &&
${conflicting_patch/LATEST_} != ${conflicting_patch} && ${patch} !=
${conflicting_patch} ]]
+ then
+ conflicting_list="${conflicting_list//$patch
}${patch} "
+ fi
+
+# same directory patches also conflict
+ if [[ -f
$KPATCHES_DIRECTORY/${patch/LATEST_}/${conflicting_patch} ||
+ -f
$KPATCHES_DIRECTORY/${conflicting_patch/LATEST_}/${patch} ]]
+ then
+
conflicting_list="${conflicting_list//$conflicting_patch
}${conflicting_patch} "
+ conflicting_list="${conflicting_list//$patch
}${patch} "
+ fi
+ done
+ done
+ linux_sort_list conflicting_list "${conflicting_list}"
+ message "${MESSAGE_COLOR}Conflicting Patches${DEFAULT_COLOR}"
+ message "${PROBLEM_COLOR}${conflicting_list}${DEFAULT_COLOR}"
+ if [[ ${conflicting_list} ]]
+ then
+ fix_conflicts_dialog ${conflicting_list} &&
+ run_conflicts
+ fi
+}
+
# Start of the execution

# if it's not there create it
@@ -1069,5 +1164,6 @@ then
done
else
echo "No Reconfigure, using ${SPELL_CONFIG}.p for defaults"
-fi
+fi &&
+run_conflicts &&
create_details



  • [SM-Commit] GIT changes to master grimoire by David Brown (2c32b1b1a9f8f6e78d8e617c8aae6f8931fcd309), David Brown, 06/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page