From cd636a607df7b40c55649037f44c37557bc7d439 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 14 Sep 2005 22:32:34 +0000 Subject: [PATCH] * improved mnemosyne to set (and use) SDECFG_TRG_MNEMOSYNE with it's target id --- config.in | 4 ++-- mnemosyne.pl | 3 ++- parse-config | 5 ++--- pkg_conf/dropbear.conf | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config.in b/config.in index be45f9d..5102f66 100644 --- a/config.in +++ b/config.in @@ -13,11 +13,11 @@ # GNU General Public License can be found in the file COPYING. # --- T2-COPYRIGHT-NOTE-END --- -CFGTEMP_TRG_MNEMOSYNE_TRGDIR=./target/mnemosyne2 +const SDECFG_TRG_MNEMOSYNE ${target:-$SDECFG_TARGET} if [ ! -s $cfgtmpdir/mnemosyne.config.in ]; then - if ! perl $CFGTEMP_TRG_MNEMOSYNE_TRGDIR/mnemosyne.pl "$CFGTEMP_TRG_MNEMOSYNE_TRGDIR/pkgsel" TRG_MNEMOSYNE \ + if ! perl ./target/$SDECFG_TRG_MNEMOSYNE/mnemosyne.pl "./target/$SDECFG_TRG_MNEMOSYNE/pkgsel" TRG_MNEMOSYNE \ $cfgtmpdir/mnemosyne.{config,rules,awkgen}.in; then echo "mnemosyne.pl failed!" rm -f $cfgtmpdir/mnemosyne.{config,rules,awkgen}.in diff --git a/mnemosyne.pl b/mnemosyne.pl index 81e9b41..3b9147f 100644 --- a/mnemosyne.pl +++ b/mnemosyne.pl @@ -573,11 +573,12 @@ sub render_rules_nomodule { sub render_rules { open(my $FILE,'>',$_[0]); + my $root="CFGTEMP_$_[1]"; select $FILE; # clean folder enablers print "#\n# folder enablers\n#\n\n"; - for (@$::FOLDERS) { print "$_=\n"; } + for (@$::FOLDERS) { print "$_=\n" unless /^$root$/; } # pkgsel list for (@$::MODULES) { diff --git a/parse-config b/parse-config index 9b67a3f..081f506 100644 --- a/parse-config +++ b/parse-config @@ -13,7 +13,6 @@ # GNU General Public License can be found in the file COPYING. # --- T2-COPYRIGHT-NOTE-END --- -target=mnemosyne2 -if [ -f $base/target/$target/pkg_conf/$pkg.conf ]; then - . $base/target/$target/pkg_conf/$pkg.conf +if [ -f $base/target/$SDECFG_TRG_MNEMOSYNE/pkg_conf/$pkg.conf ]; then + . $base/target/$SDECFG_TRG_MNEMOSYNE/pkg_conf/$pkg.conf fi diff --git a/pkg_conf/dropbear.conf b/pkg_conf/dropbear.conf index e580a0f..d65d078 100644 --- a/pkg_conf/dropbear.conf +++ b/pkg_conf/dropbear.conf @@ -13,4 +13,4 @@ # GNU General Public License can be found in the file COPYING. # --- T2-COPYRIGHT-NOTE-END --- -. $base/target/$target/pkg_conf/openssh.conf +. $base/target/$SDECFG_TRG_MNEMOSYNE/openssh.conf