From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 6 Dec 2007 08:55:20 +0000 (+0000)
Subject: (*) groups distro-dependent files in build/config.<distro>
X-Git-Tag: myplc-4.0-15~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c7e9ad5a295d1778355717f407b20d51cdf8ec47;p=myplc.git

(*) groups distro-dependent files in build/config.<distro>
(*) renamed .lst files into .pkgs (lst suffix commonly used for other/tmp purposes)
(*) distro-dependent files are (mostly) optional, defaults to planetlab
(*) mkfedora accepts new -f argument : to pass a pkgs file rather than -p .. -g ..
(*) mkfedora supports junk: and precious: in pkgs file
    this is from the former bootcd/prep.sh - to reduce footprint

Notes.
(*) this is untested
(*) mkfedora still supports -x (exclude) on the command line and in pkgs file
    however I suspect this feature is never used
(*) mkfedora is still a separate command - could/should be merged into buld.common
(*) myplc/build.functions could/should be merged into build.common as well
---

diff --git a/build.functions b/build.functions
index 44dd1f0..ce6751f 100644
--- a/build.functions
+++ b/build.functions
@@ -46,34 +46,6 @@ set -e
 # Be verbose
 set -x
 
-# Make a basic chroot at the specified location given the specified
-# configuration.
-make_chroot_from_lst() {
-    root=$1; shift
-    fcdistro=$1; shift
-
-    packages=$(pl_getPackagesOptions2 $fcdistro "$@")
-    groups=$(pl_getGroupsOptions2 $fcdistro "$@") 
-
-    pl_setup_chroot $root $packages $groups
-}
-
-# Move specified directories out of the chroot and into a "data"
-# directory that will be bind mounted on /data inside the chroot.
-#move_datadirs() {
-#    root=$1
-#    data=$2
-#    shift 2
-#    pl_move_dirs $root $data /data "$@"
-#}
-
-# Make loopback filesystem from specified location
-#make_image() {
-#    root=$1
-#    image=$2
-#    pl_make_image $root $image 100000000
-#}
-
 function yum_conf_to_build_host () {
    BUILD_HOST=$(hostname)
    cat <<EOF
diff --git a/build.sh b/build.sh
index 87f3bf6..7ce888d 100755
--- 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}-plc.lst
-make_chroot_from_lst root ${pl_DISTRO_NAME} $lst
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} myplc.pkgs)
+pl_setup_chroot root -f $pkgsfile
 
 # Install configuration scripts
 echo "* myplc: Installing configuration scripts"
diff --git a/planetlab-plc.lst b/planetlab-plc.lst
deleted file mode 100644
index cdfa0c2..0000000
--- a/planetlab-plc.lst
+++ /dev/null
@@ -1,56 +0,0 @@
-# first draft, extracted from plc_config.xml with --packages
-####
-# kernel-vserver is intended for the vserver-reference, but
-# serves the same useful purpose for MyPLC, namely, to
-# Provide: kernel without actually installing anything. 
-package:kernel-vserver
-package:dev
-# utilities
-package:bzip2
-package:cpio
-package:tar
-package:rsync
-package:diffutils
-package:gzip
-package:findutils
-package:less
-package:curl wget
-package:vim-minimal 
-# for mkpasswd
-package:expect
-# package management
-package:rpm
-package:yum createrepo
-# cron jobs
-package:vixie-cron
-# sendmail
-package:sendmail sendmail-cf
-# dns server
-package:dnsmasq
-# python
-package:python python-devel SOAPpy PyXML
-# add ons for plcapi
-package: python-pycurl python-psycopg2
-# but not on fc4 as we provide ours
-package-fc4: python-pycurl python-psycopg2
-# postgresql
-package:postgresql postgresql-server postgresql-python
-# apache
-package:httpd mod_python mod_ssl
-# ssl 
-package:openssl xmlsec1 xmlsec1-openssl
-# php
-package:php php-pgsql
-# apache user needs root access for building node-dependent images
-package:sudo
-# for ssh-keygen
-package:openssh 
-# ssh - easily reach nodes from the chroot/vserver context
-package:openssh-clients
-# for ImageCreate
-package:gd php-gd perl-GD
-# plc-map.py uses this
-package:python-imaging
-# planetlab stuff
-package:bootcd bootmanager bootstrapfs
-package:PLCAPI PLCWWW