iproute2: sync with poky

diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
index 7162231..8c8519f 100644 (file)
--- 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 ed5f3a1..d442a09 100644 (file)
--- 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"