From 1bbe8fd6fbd243dad10257ab64026e7a50b186a8 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 23 Aug 2011 18:35:16 +0200
Subject: [PATCH] build our own iproute with 2.6.27 only, that is to say with
fedora8 only
---
build.common | 9 ++++-----
onelab-k32-tags.mk | 4 +++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build.common b/build.common
index 45facd1b..9dd1e6ae 100644
--- a/build.common
+++ b/build.common
@@ -1,8 +1,5 @@
# -*-Shell-script-*-
#
-# $Id$
-# $URL$
-#
# Common functions for build scripts used by various packages
# incorporated (e.g., build, myplc, myplc-devel, vserver-reference)
#
@@ -73,9 +70,11 @@ function pl_getReleaseName () {
function pl_getKexcludes () {
distroname=$1; shift
case $distroname in
- ### assuming all distros run at least 2.6.32
- f*)
+ ### we need our own cooked iproute only with 2.6.27
+ f8)
echo 'kernel* util-vserver* iptables iptables-ipv6 iproute drupal' ;;
+ f*)
+ echo 'kernel* util-vserver* iptables iptables-ipv6 drupal' ;;
centos5)
echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;;
sl*)
diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 5dfde099..e0b3f0ea 100644
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -12,7 +12,9 @@ kernel-DEVEL-RPMS += elfutils-libelf-devel
madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2
iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
-iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.37-2
+# we use the stock iproute2 with 2.6.32, since our gre patch is not needed
+#iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.37-2
+ALL := $(subst $(ALL),iproute,)
###
ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-21
###
--
2.47.0