4 files changed, 10 insertions, 12 deletions
diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
index 7162231ec5..8c8519f230 100644
--- a/packages/iproute2/iproute2.inc
+++ b/packages/iproute2/iproute2.inc
@@ -7,7 +7,7 @@ DEPENDS = "flex-native bison-native"
 # Set the DATE in the .bb file
 SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
 
-# Set S in the .bb files
+S = "${WORKDIR}/iproute2-${PV}-${DATE}"
 
 inherit update-alternatives
 
diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index ed5f3a11c6..d442a091db 100644
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,10 +1,8 @@
-PR = "r2"
+PR = "r3"
 
-DATE = "061002"
-
-SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
-                   file://new-flex-fix.patch;patch=1"
+require iproute2.inc
 
-S = "${WORKDIR}/iproute2-${PV}-${DATE}"
+SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
+            file://new-flex-fix.patch;patch=1"
 
-require iproute2.inc
+DATE = "061002"
diff --git a/packages/iproute2/iproute2_2.6.20.bb b/packages/iproute2/iproute2_2.6.20.bb
index 9894bf0567..e72dfccdde 100644
--- a/packages/iproute2/iproute2_2.6.20.bb
+++ b/packages/iproute2/iproute2_2.6.20.bb
@@ -1,5 +1,6 @@
-PR = "r2"
+require iproute2.inc
 
+PR = "r2"
 DATE = "070313"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
@@ -9,4 +10,3 @@ SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
 
 S = "${WORKDIR}/iproute-${PV}-${DATE}"
 
-require iproute2.inc
diff --git a/packages/iproute2/iproute2_2.6.22.bb b/packages/iproute2/iproute2_2.6.22.bb
index f7347395f6..1ee0ce7ab2 100644
--- a/packages/iproute2/iproute2_2.6.22.bb
+++ b/packages/iproute2/iproute2_2.6.22.bb
@@ -1,5 +1,6 @@
-PR = "r1"
+require iproute2.inc
 
+PR = "r1"
 DATE = "070710"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
@@ -8,4 +9,3 @@ SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
 
 S = "${WORKDIR}"
 
-require iproute2.inc