make kexclude explicit again in pkgs file

diff --git a/build.common b/build.common
index 1b00ea8..4c52b0a 100644 (file)
--- a/build.common
+++ b/build.common
@@ -229,7 +229,7 @@ function pl_root_mkfedora () {
     pkgs_precious=$(pl_parsePkgs precious $fcdistro $pldistro $pkgsfile)
     # formerly related to mkfedora -k : packages to take from our own build 
     # and thus need be excluded frem the stock repos
-    pkgs_kexcludes="$pl_KEXCLUDES"
+    pkgs_excludes=$(pl_parsePkgs kexclude $fcdistro $pldistro $pkgsfile | sed -e s,@KEXCLUDE@,"$pl_KEXCLUDES",)
     # get mirrors if not specified with -l
     if [ -z "$mirrors" ] ; then
        mirrorsfile=$(pl_locateDistroFile ../build/ $pldistro "$pldistro.mirrors")

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index 748ce5c..36163c5 100644 (file)
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -1,6 +1,8 @@
 groupname: PlanetLabBootcd
 groupdesc: PlanetLab BootCD
-# define packages - kecludes are defined in build.common
+# packages to exclude from stock repositories
+kexclude: @KEXCLUDE@
+# define packages
 package: filesystem
 package: udev
 package: dhclient

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index d4c6d27..88b8dbf 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -2,7 +2,9 @@
 # groupname: Bootstrapfs
 groupname: PlanetLab
 groupdesc: PlanetLab Node Root
-# define packages - kecludes are defined in build.common
+# packages to exclude from stock repositories
+kexclude: @KEXCLUDE@
+# define packages
 package: kernel
 package: udev
 package: basesystem

diff --git a/config.planetlab/vserver.pkgs b/config.planetlab/vserver.pkgs
index 2dabedc..998b15d 100644 (file)
--- a/config.planetlab/vserver.pkgs
+++ b/config.planetlab/vserver.pkgs
@@ -1,6 +1,8 @@
 groupname: PlanetLabSlice
 groupdesc: PlanetLab Slice Reference Image
-# define packages - kecludes are defined in build.common
+# packages to exclude from stock repositories
+kexclude: @KEXCLUDE@
+# define packages
 package: bash
 package: coreutils
 package: iputils