From d0cb964c626ffa2c8f288eb3cbc21048ee79d5e4 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 27 Mar 2008 14:29:07 -0400 Subject: [PATCH] [linux-base] Changed to use lib/sde-config/pkgseldir_compile.sh to process pkgsel.d/ --- config.in | 14 ++++++++++++++ pkgsel.in | 13 +++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/config.in b/config.in index 34b8923..0c996c5 100644 --- a/config.in +++ b/config.in @@ -13,3 +13,17 @@ # --- SDE-COPYRIGHT-NOTE-END --- #Description: LSB Compliant Base + +if [ ! -s "$cfgtmpdir/$target.config.in" ]; then + # render files just once + lib/sde-config/pkgseldir_compile.sh \ + "CFGTEMP_TRG_LSB_PKGSEL" "SDECFG_TRG_LSB_" \ + "$cfgtmpdir/$target." \ + "target/$target/pkgsel.d" +fi + +if [ -s "$cfgtmpdir/$target.config.in" ]; then + . "$cfgtmpdir/$target.config.in" +else + comment "--- Failed to process pkgsel.d ---" +fi diff --git a/pkgsel.in b/pkgsel.in index fb46f73..1e3e87b 100644 --- a/pkgsel.in +++ b/pkgsel.in @@ -14,15 +14,8 @@ # generate pkgsel.awk file # -if [ ! -s $cfgtmpdir/$target.pkgsel.awk ]; then - cat <<-EOT > $cfgtmpdir/$target.pkgsel.awk - # Generated for target/$target/pkgsel.d/*.all - # +if [ -s "$cfgtmpdir/$target.pkgsel.in" ]; then + . "$cfgtmpdir/$target.pkgsel.in" - EOT - - lib/sde-config/pkgsel2awk.sh $( ls -1d target/$target/pkgsel.d/*.all ) \ - >> $cfgtmpdir/$target.pkgsel.awk + pkgfilter awk -f $cfgtmpdir/$target.pkgsel.awk fi - -pkgfilter awk -f $cfgtmpdir/$target.pkgsel.awk