replacing pldistro-fcdistro-*.lst with a pldistro-*.lst with variants embedded

diff --git a/build.functions b/build.functions
index 5214ba2..ab03be8 100644 (file)
--- a/build.functions
+++ b/build.functions
@@ -50,10 +50,11 @@ set -x
 # configuration.
 make_chroot_from_lst() {
     root=$1
+    fcdistro=1; shift
     lst=$2
 
-    packages=$(pl_getPackagesOptions $lst)
-    groups=$(pl_getGroupsOptions $lst) 
+    packages=$(pl_getPackagesOptions2 $fcdistro $lst)
+    groups=$(pl_getGroupsOptions2 $fcdistro $lst) 
 
     pl_setup_chroot $root $packages $groups
 }

diff --git a/build.sh b/build.sh
index a43f3f0..c9e8cd3 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -50,8 +50,8 @@ pl_fixdirs root "${datadirs[@]}"
 echo "* myplc: Installing base filesystem"
 mkdir -p root data
 
-lst=${pldistro}-${pl_DISTRO_NAME}-plc.lst
-make_chroot_from_lst root $lst
+lst=${pldistro}-plc.lst
+make_chroot_from_lst root $pldistro ${pl_DISTRO_NAME} $lst
 
 # Install configuration scripts
 echo "* myplc: Installing configuration scripts"

diff --git a/planetlab-f7-plc.lst b/planetlab-f7-plc.lst
deleted file mode 100644 (file)
index 542ce0e..0000000
--- a/planetlab-f7-plc.lst
+++ /dev/null
@@ -1,49 +0,0 @@
-# first draft, extracted from plc_config.xml with --packages
-# the groups list was 'PlanetLab Central' but turned out to be an unknown group
-package:bzip2
-package:sendmail-cf
-package:tar
-package:less
-package:perl-GD
-package:sudo
-package:openssl
-package:xmlsec1
-package:kernel-vserver
-package:PLCWWW
-package:gd
-package:expect
-package:php-pgsql
-package:curl
-package:rpm
-package:httpd
-package:rsync
-package:mod_python
-package:mod_ssl
-package:bootmanager
-package:python-devel
-package:SOAPpy
-package:vixie-cron
-package:yum
-package:php-gd
-package:PLCAPI
-package:vim-minimal
-package:PyXML
-package:sendmail
-package:python
-package:createrepo
-package:postgresql-python
-package:cpio
-package:postgresql-server
-package:wget
-package:php
-package:xmlsec1-openssl
-package:postgresql
-package:openssh
-package:cvs
-package:dev
-package:python-imaging
-package:bootcd
-package:dnsmasq
-package:diffutils
-package:gzip
-package:findutils

diff --git a/planetlab-fc4-plc.lst b/planetlab-fc4-plc.lst
deleted file mode 100644 (file)
index 542ce0e..0000000
--- a/planetlab-fc4-plc.lst
+++ /dev/null
@@ -1,49 +0,0 @@
-# first draft, extracted from plc_config.xml with --packages
-# the groups list was 'PlanetLab Central' but turned out to be an unknown group
-package:bzip2
-package:sendmail-cf
-package:tar
-package:less
-package:perl-GD
-package:sudo
-package:openssl
-package:xmlsec1
-package:kernel-vserver
-package:PLCWWW
-package:gd
-package:expect
-package:php-pgsql
-package:curl
-package:rpm
-package:httpd
-package:rsync
-package:mod_python
-package:mod_ssl
-package:bootmanager
-package:python-devel
-package:SOAPpy
-package:vixie-cron
-package:yum
-package:php-gd
-package:PLCAPI
-package:vim-minimal
-package:PyXML
-package:sendmail
-package:python
-package:createrepo
-package:postgresql-python
-package:cpio
-package:postgresql-server
-package:wget
-package:php
-package:xmlsec1-openssl
-package:postgresql
-package:openssh
-package:cvs
-package:dev
-package:python-imaging
-package:bootcd
-package:dnsmasq
-package:diffutils
-package:gzip
-package:findutils

diff --git a/planetlab-fc6-plc.lst b/planetlab-plc.lst
similarity index 100%
rename from planetlab-fc6-plc.lst
rename to planetlab-plc.lst