49 lines
2 KiB
Diff
49 lines
2 KiB
Diff
--- ./python/undertaker-kconfigdump.orig 2014-11-26 07:04:53.000000000 -0700
|
|
+++ ./python/undertaker-kconfigdump 2014-12-10 20:00:00.000000000 -0700
|
|
@@ -130,7 +130,7 @@ elif [ "$MODE" = "rsf" ] || [ "$MODE" =
|
|
fi
|
|
echo "Generating Format 1.0 (RSF) models"
|
|
else
|
|
- if ! which satyr > /dev/null; then
|
|
+ if ! which undertaker-satyr > /dev/null; then
|
|
echo "No satyr binary found."
|
|
exit 1
|
|
fi
|
|
@@ -140,7 +140,7 @@ fi
|
|
debug "undertaker: $(which undertaker)"
|
|
debug "rsf2model: $(which rsf2model)"
|
|
debug "dumpconf: $(which dumpconf)"
|
|
-debug "satyr: $(which satyr)"
|
|
+debug "satyr: $(which undertaker-satyr)"
|
|
debug "undertaker-kconfigpp: $(which undertaker-kconfigpp)"
|
|
|
|
function all_linux_archs () {
|
|
@@ -208,7 +208,7 @@ function do_convert() {
|
|
if [ $MODE = "cnf" ]; then
|
|
echo "Calculating CNF model for $ARCH"
|
|
# Run satyr to generate CNF models.
|
|
- SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH satyr $KCONFIG_FILE -c "$MODELS/$ARCH.cnf"
|
|
+ SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH undertaker-satyr $KCONFIG_FILE -c "$MODELS/$ARCH.cnf"
|
|
fi
|
|
}
|
|
|
|
@@ -309,7 +309,7 @@ function do_rsf_or_satyr_call() {
|
|
done
|
|
|
|
echo "Calculating CNF model for '$1'"
|
|
- satyr $2 -c "$MODELS/$1.cnf"
|
|
+ undertaker-satyr $2 -c "$MODELS/$1.cnf"
|
|
|
|
# Create inferences (or at least an empty file).
|
|
do_inference $1
|
|
--- ./undertaker/satyr.cpp.orig 2014-11-26 07:04:53.000000000 -0700
|
|
+++ ./undertaker/satyr.cpp 2014-12-10 20:00:00.000000000 -0700
|
|
@@ -39,7 +39,7 @@ using namespace kconfig;
|
|
|
|
|
|
void usage(std::ostream &out) {
|
|
- out << "usage: satyr [-V] [-a <assumtion.config> | -c <out.cnf>] <model>" << std::endl;
|
|
+ out << "usage: undertaker-satyr [-V] [-a <assumtion.config> | -c <out.cnf>] <model>" << std::endl;
|
|
out << " model: a Kconfig file / translated cnf file" << std::endl;
|
|
out << " -a <assumtion> a .config file to be validated" << std::endl;
|
|
out << " (may be incomplete)" << std::endl;
|