iproute2: Move common parts of the recipes for 2.6.16 and 2.6.18 into

iproute2.inc.

diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
new file mode 100644 (file)
index 0000000..006b27b
--- /dev/null
+++ b/packages/iproute2/iproute2.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "kernel routing and traffic control utilities"
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "flex-native bison-native"
+
+# Set DATE in the .bb file
+SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
+
+S = "${WORKDIR}/${P}-${DATE}"
+
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+
+do_install () {
+        oe_runmake DESTDIR=${D} install
+}
+
+FILES_${PN} += "/usr/lib/tc/*"
+FILES_${PN}-dbg += "/usr/lib/tc/.debug"

diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb
index d71421d..ddd5ef7 100644 (file)
--- a/packages/iproute2/iproute2_2.6.16.bb
+++ b/packages/iproute2/iproute2_2.6.16.bb
@@ -1,20 +1,8 @@
-SECTION = "base"
-DESCRIPTION = "kernel routing and traffic control utilities"
-LICENSE = "GPL"
-DEPENDS = "flex-native bison-native"
+PR = "r1"
 
-DATE="060323"
-SRC_URI="http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz \
-       file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
-       file://new-flex-fix.patch;patch=1"
-PR="r1"
-S="${WORKDIR}/${P}-${DATE}"
-       
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
+            file://new-flex-fix.patch;patch=1"
 
-do_install () {
-       oe_runmake DESTDIR=${D} install
-}
+require iproute2.inc
 
-FILES_${PN} += "/usr/lib/tc/*"
-FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+DATE = "060323"

diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index f73c05e..ee3ff29 100644 (file)
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,21 +1,8 @@
-DESCRIPTION = "kernel routing and traffic control utilities"
-SECTION = "base"
-LICENSE = "GPL"
-DEPENDS = "flex-native bison-native"
 PR = "r0"
 
-DATE = "061002"
-SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz \
-           file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
-           file://new-flex-fix.patch;patch=1"
-
-S = "${WORKDIR}/${P}-${DATE}"
+SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
+            file://new-flex-fix.patch;patch=1"
 
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+require iproute2.inc
 
-do_install () {
-        oe_runmake DESTDIR=${D} install
-}
-
-FILES_${PN} += "/usr/lib/tc/*"
-FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+DATE = "061002"