From cb0c921da4fce8d28d18a7e828913b590ae464d7 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 23 Jun 2008 13:59:05 +0000 Subject: [PATCH] - dont build wireless-tools anymore - exclude iproute from the stock fedora repo --- config.planetlab/bootcd.pkgs | 2 +- config.planetlab/bootstrapfs.pkgs | 2 +- config.planetlab/vserver.pkgs | 2 +- modules.list | 1 - onelab-tags.mk | 1 - onelab.mk | 10 ---------- planetlab-tags.mk | 1 - planetlab.mk | 9 --------- 8 files changed, 3 insertions(+), 25 deletions(-) diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs index 63cab0a0..8690a341 100644 --- 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 4c7cd584..6dedaf94 100644 --- 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 8e922c69..219dd6ec 100644 --- 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 b7f08eaa..2273a60b 100644 --- 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 5841495c..3d1955d6 100644 --- 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 0583c429..b059711b 100644 --- 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 1e19da84..4913786a 100644 --- 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 b1825384..00119bfa 100644 --- 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 # -- 2.43.0