From 05456a2c2c049a03bbf0738a813734bb07616604 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 27 Jan 2010 18:44:46 +0000 Subject: [PATCH] fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodeconfig/yum now known as the nodeyum package (might need some moer work for properly handling kexcludes in multi-fc plcs) cleaned up all uses of /etc/planetlab/{node,slice}family nodeconfig now does not need the build/ module anymore at build time --- getkexcludes.sh | 20 ++++++++++++++++++-- onelab-k27-tags.mk | 3 ++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/getkexcludes.sh b/getkexcludes.sh index bcb025a1..d45524c7 100755 --- a/getkexcludes.sh +++ b/getkexcludes.sh @@ -4,13 +4,29 @@ COMMAND=$(basename $0) . $(dirname $0)/build.common function usage () { - echo "Usage: $COMMAND" + echo "Usage: $COMMAND [-f fcdistro]" echo "outputs the list of packages to exclude from the stock repositories" echo "this is set in build.common, and needs to fit the set of packages" echo "that we override in the planetlab build" exit 1 } +while getopts "f:" opt ; do + case $opt in + f) FCDISTRO=$OPTARG ;; + h|*) usage ;; + esac +done + +toshift=$(($OPTIND - 1)) +shift $toshift + [[ -n "$@" ]] && usage -echo "$pl_KEXCLUDES" +# if the fcdistro is passed in argument +if [ -n "$FCDISTRO" ] ; then + pl_getKexcludes "$FCDISTRO" +# otherwise use the value for the current system +else + echo "$pl_KEXCLUDES" +fi diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 4758628e..7816581a 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -17,7 +17,7 @@ util-vserver-SVNBRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-21 -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 +NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/trunk PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 @@ -39,6 +39,7 @@ PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLE www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/trunk Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 +nodeconfig-MODULES := nodeconfig nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/trunk BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/trunk pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 -- 2.43.0