From 9bd083b32c6e1e7114aa97edf751eec3c2fe5e6d Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 23 Jun 2008 13:50:32 +0000
Subject: [PATCH] - wireless-tools package NOT REBUILT anymore - iproute
excluded from stock fedora repos when creating images, so ours is actually
used - incorporated changeset 9559 from trunk, no need to maintain
build-SVNPATH in tags file anymore
---
Makefile | 13 +++++++++++++
config.planetlab/bootcd.pkgs | 2 +-
config.planetlab/bootstrapfs.pkgs | 2 +-
config.planetlab/vserver.pkgs | 2 +-
modules.list | 1 -
onelab-tags-4.2.mk | 3 ---
onelab.mk | 10 ----------
planetlab-tags-4.2.mk | 3 ---
planetlab.mk | 9 ---------
vbuild-nightly.sh | 1 +
10 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/Makefile b/Makefile
index 23b07e31..4ddedc80 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,19 @@ include $(PLDISTROCONTENTS)
PLDISTROTAGS := $(PLDISTRO)-tags.mk
include $(PLDISTROTAGS)
+# this used to be set in the -tags.mk files, but that turned out to require
+# error-prone duplicate changes
+# so now the nightly build script sets this to what it is currently using
+# we set a default in case we run the build manually:
+# if the local directory was svn checked out, then use the corresponding URL
+default-build-SVNPATH := $(shell svn info 2> /dev/null | grep URL: | awk '{print $2;}')
+# otherwise, use this hard-coded default
+ifeq "$(default-build-SVNPATH)" ""
+default-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk
+endif
+# use default if necessary
+build-SVNPATH ?= $(default-build-SVNPATH)
+
########## stage1 and stage1iter
# extract specs and compute .mk files by running
# make stage1=true
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 9231cb1c..0d98e9dd 100644
--- a/modules.list
+++ b/modules.list
@@ -26,4 +26,3 @@ pypcilib
util-vserver-pl
util-vserver:scholz
vsys
-wireless-tools
diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 163b505a..f50ed5d4 100644
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -4,10 +4,8 @@
# but by modules.update to refresh modules.list
# that serves as the default for module-tools -a
-build-SVNPATH := http://svn.planet-lab.org/svn/build/tags/4.2-rc9
linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-8
madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
-wireless-tools-SVNPATH := http://svn.planet-lab.org/svn/wireless-tools/tags/wireless-tools-29-0
nozomi-SVNPATH := http://svn.one-lab.org/nozomi/tags/nozomi-2.21-1
comgt-SVNPATH := http://svn.one-lab.org/comgt/imports/0.3
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.0-11
@@ -44,4 +42,3 @@ MyPLC-SVNBRANCH := 4.2
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.2-15
# locating the right test directory - see make testsvnpath
TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.2-5
-BUILD_SVNPATH := http://svn.planet-lab.org/svn/build/tags/4.2-rc9
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-4.2.mk b/planetlab-tags-4.2.mk
index 7188f59d..e3edb3ef 100644
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -1,9 +1,7 @@
# $Id$
-build-SVNPATH := http://svn.planet-lab.org/svn/build/tags/4.2-rc9
linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-8
madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
-wireless-tools-SVNPATH := http://svn.planet-lab.org/svn/wireless-tools/tags/wireless-tools-29-0
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.0-11
util-vserver-SVNBRANCH := scholz
util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-4
@@ -37,4 +35,3 @@ MyPLC-SVNBRANCH := 4.2
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.2-15
# locating the right test directory - see make testsvnpath
TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.2-5
-BUILD_SVNPATH := http://svn.planet-lab.org/svn/build/tags/4.2-rc9
diff --git a/planetlab.mk b/planetlab.mk
index a7628867..6dd70bfb 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
#
diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index ec090670..03fa576a 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -146,6 +146,7 @@ function build () {
MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}")
MAKEVARS=("NIGHTLY_BASE=${BASE}" "${MAKEVARS[@]}")
MAKEVARS=("NIGHTLY_PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
+ MAKEVARS=("build-SVNPATH=${SVNPATH}" "${MAKEVARS[@]}")
# stage1
make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true
--
2.47.0