- dont build wireless-tools anymore

- exclude iproute from the stock fedora repo

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index 63cab0a..8690a34 100644 (file)
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -2,7 +2,7 @@ groupname: PlanetLabBootcd
 groupdesc: PlanetLab BootCD
 # This is the replacement for the former mkfedora -k. The following packages
 # will get excluded from the stock fedora repos, as we need to use ours
-kexclude: kernel* iptables
+kexclude: kernel* iptables iproute
 # from prep.sh, was hardwired as packagelist
 package: filesystem
 package: udev

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 4c7cd58..6dedaf9 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -4,7 +4,7 @@ groupname: PlanetLab
 groupdesc: PlanetLab Node Root
 # This is the replacement for the former mkfedora -k. The following packages
 # will get excluded from the stock fedora repos, as we need to use ours
-kexclude: kernel* iptables
+kexclude: kernel* iptables iproute
 #
 package: kernel
 package: udev

diff --git a/config.planetlab/vserver.pkgs b/config.planetlab/vserver.pkgs
index 8e922c6..219dd6e 100644 (file)
--- a/config.planetlab/vserver.pkgs
+++ b/config.planetlab/vserver.pkgs
@@ -2,7 +2,7 @@ groupname: PlanetLabSlice
 groupdesc: PlanetLab Slice Reference Image
 # This is the replacement for the former mkfedora -k. The following packages
 # will get excluded from the stock fedora repos, as we need to use ours
-kexclude: kernel* iptables
+kexclude: kernel* iptables iproute
 # define packages
 package: bash
 package: coreutils

diff --git a/modules.list b/modules.list
index b7f08ea..2273a60 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -25,4 +25,3 @@ pypcilib
 util-vserver-pl
 util-vserver:scholz
 vsys
-wireless-tools

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 5841495..3d1955d 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -3,7 +3,6 @@
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
-wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/trunk
 comgt-SVNPATH                  := http://svn.one-lab.org/comgt/imports/0.3
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk

diff --git a/onelab.mk b/onelab.mk
index 0583c42..b059711 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -64,19 +64,9 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# wireless-tools
-# 
-wireless-tools-MODULES := wireless-tools
-wireless-tools-SPEC := wireless-tools.spec
-wireless-tools-BUILD-FROM-SRPM := yes
-ALL += wireless-tools
-IN_BOOTSTRAPFS += wireless-tools
-
 # 
 # nozomi
 # 
-# does not compile against new kernel - waiting for Napoli & Vimercate
 nozomi-MODULES := nozomi
 nozomi-SPEC := nozomi.spec
 nozomi-DEPEND-DEVEL-RPMS := kernel-devel

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 1e19da8..4913786 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -3,7 +3,6 @@
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
-wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz

diff --git a/planetlab.mk b/planetlab.mk
index b182538..00119bf 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -63,15 +63,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# wireless-tools
-# 
-wireless-tools-MODULES := wireless-tools
-wireless-tools-SPEC := wireless-tools.spec
-wireless-tools-BUILD-FROM-SRPM := yes
-ALL += wireless-tools
-IN_BOOTSTRAPFS += wireless-tools
-
 #
 # libnl
 #