From bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 23 May 2010 20:23:53 -0700 Subject: Rename url params patch=/pnum= to apply={yes,no}/striplevel= I think this makes the behavior rather more clear. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/iproute2/iproute2_2.6.18.bb | 4 ++-- recipes/iproute2/iproute2_2.6.20.bb | 10 +++++----- recipes/iproute2/iproute2_2.6.22.bb | 8 ++++---- recipes/iproute2/iproute2_2.6.29.bb | 8 ++++---- recipes/iproute2/iproute2_2.6.31.bb | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'recipes/iproute2') diff --git a/recipes/iproute2/iproute2_2.6.18.bb b/recipes/iproute2/iproute2_2.6.18.bb index aafd44aaf6..07b3b1a15c 100644 --- a/recipes/iproute2/iproute2_2.6.18.bb +++ b/recipes/iproute2/iproute2_2.6.18.bb @@ -2,8 +2,8 @@ PR = "${INC_PR}.0" require iproute2.inc -SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ - file://new-flex-fix.patch;patch=1" +SRC_URI += "file://iproute2-2.6.15_no_strip.diff;apply=yes;striplevel=0 \ + file://new-flex-fix.patch;apply=yes" DATE = "061002" diff --git a/recipes/iproute2/iproute2_2.6.20.bb b/recipes/iproute2/iproute2_2.6.20.bb index 69e0c1a3c7..99750b676d 100644 --- a/recipes/iproute2/iproute2_2.6.20.bb +++ b/recipes/iproute2/iproute2_2.6.20.bb @@ -3,11 +3,11 @@ require iproute2.inc PR = "${INC_PR}.1" DATE = "070313" -SRC_URI_append = " file://new-flex-fix.patch;patch=1 \ - file://ip6tunnel.patch;patch=1 \ - file://man-pages-fix.patch;patch=1 \ - file://remove-bashisms.patch;patch=1 \ - file://no-strip.patch;patch=1" +SRC_URI_append = " file://new-flex-fix.patch;apply=yes \ + file://ip6tunnel.patch;apply=yes \ + file://man-pages-fix.patch;apply=yes \ + file://remove-bashisms.patch;apply=yes \ + file://no-strip.patch;apply=yes" S = "${WORKDIR}/iproute-${PV}-${DATE}" diff --git a/recipes/iproute2/iproute2_2.6.22.bb b/recipes/iproute2/iproute2_2.6.22.bb index 5c9bbc3e21..5c0236f615 100644 --- a/recipes/iproute2/iproute2_2.6.22.bb +++ b/recipes/iproute2/iproute2_2.6.22.bb @@ -3,10 +3,10 @@ require iproute2.inc PR = "${INC_PR}.1" DATE = "070710" -SRC_URI_append = " file://new-flex-fix.patch;patch=1 \ - file://ip6tunnel.patch;patch=1 \ - file://remove-bashisms.patch;patch=1 \ - file://no-strip.patch;patch=1" +SRC_URI_append = " file://new-flex-fix.patch;apply=yes \ + file://ip6tunnel.patch;apply=yes \ + file://remove-bashisms.patch;apply=yes \ + file://no-strip.patch;apply=yes" S = "${WORKDIR}" diff --git a/recipes/iproute2/iproute2_2.6.29.bb b/recipes/iproute2/iproute2_2.6.29.bb index 9afdc479ce..bf2ff4931b 100644 --- a/recipes/iproute2/iproute2_2.6.29.bb +++ b/recipes/iproute2/iproute2_2.6.29.bb @@ -3,10 +3,10 @@ require iproute2.inc PR = "${INC_PR}.1" SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ - file://new-flex-fix.patch;patch=1 \ - file://compilation-fix.patch;patch=1 \ - file://use-cross-compiler.patch;patch=1 \ - file://remove-bashisms.patch;patch=1 \ + file://new-flex-fix.patch;apply=yes \ + file://compilation-fix.patch;apply=yes \ + file://use-cross-compiler.patch;apply=yes \ + file://remove-bashisms.patch;apply=yes \ " S = "${WORKDIR}/iproute2-${PV}" diff --git a/recipes/iproute2/iproute2_2.6.31.bb b/recipes/iproute2/iproute2_2.6.31.bb index 543e1b1351..1801647703 100644 --- a/recipes/iproute2/iproute2_2.6.31.bb +++ b/recipes/iproute2/iproute2_2.6.31.bb @@ -3,7 +3,7 @@ require iproute2.inc PR = "${INC_PR}.0" SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ - file://new-flex-fix.patch;patch=1 \ + file://new-flex-fix.patch;apply=yes \ " S = "${WORKDIR}/iproute2-${PV}" -- cgit v1.2.3 From 6fe7cef27069415f2eba36bc640cf59013d4979b Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 24 May 2010 13:01:00 -0700 Subject: Make the do_patch apply=yes param implicit if extension is .diff/.patch For .diff/.patch you need to apply manually, you can specify apply=no. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/iproute2/iproute2_2.6.18.bb | 4 ++-- recipes/iproute2/iproute2_2.6.20.bb | 10 +++++----- recipes/iproute2/iproute2_2.6.22.bb | 8 ++++---- recipes/iproute2/iproute2_2.6.29.bb | 8 ++++---- recipes/iproute2/iproute2_2.6.31.bb | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'recipes/iproute2') diff --git a/recipes/iproute2/iproute2_2.6.18.bb b/recipes/iproute2/iproute2_2.6.18.bb index 07b3b1a15c..ac3d831fb2 100644 --- a/recipes/iproute2/iproute2_2.6.18.bb +++ b/recipes/iproute2/iproute2_2.6.18.bb @@ -2,8 +2,8 @@ PR = "${INC_PR}.0" require iproute2.inc -SRC_URI += "file://iproute2-2.6.15_no_strip.diff;apply=yes;striplevel=0 \ - file://new-flex-fix.patch;apply=yes" +SRC_URI += "file://iproute2-2.6.15_no_strip.diff;striplevel=0 \ + file://new-flex-fix.patch" DATE = "061002" diff --git a/recipes/iproute2/iproute2_2.6.20.bb b/recipes/iproute2/iproute2_2.6.20.bb index 99750b676d..193cd00f41 100644 --- a/recipes/iproute2/iproute2_2.6.20.bb +++ b/recipes/iproute2/iproute2_2.6.20.bb @@ -3,11 +3,11 @@ require iproute2.inc PR = "${INC_PR}.1" DATE = "070313" -SRC_URI_append = " file://new-flex-fix.patch;apply=yes \ - file://ip6tunnel.patch;apply=yes \ - file://man-pages-fix.patch;apply=yes \ - file://remove-bashisms.patch;apply=yes \ - file://no-strip.patch;apply=yes" +SRC_URI_append = " file://new-flex-fix.patch \ + file://ip6tunnel.patch \ + file://man-pages-fix.patch \ + file://remove-bashisms.patch \ + file://no-strip.patch" S = "${WORKDIR}/iproute-${PV}-${DATE}" diff --git a/recipes/iproute2/iproute2_2.6.22.bb b/recipes/iproute2/iproute2_2.6.22.bb index 5c0236f615..a0261c2da0 100644 --- a/recipes/iproute2/iproute2_2.6.22.bb +++ b/recipes/iproute2/iproute2_2.6.22.bb @@ -3,10 +3,10 @@ require iproute2.inc PR = "${INC_PR}.1" DATE = "070710" -SRC_URI_append = " file://new-flex-fix.patch;apply=yes \ - file://ip6tunnel.patch;apply=yes \ - file://remove-bashisms.patch;apply=yes \ - file://no-strip.patch;apply=yes" +SRC_URI_append = " file://new-flex-fix.patch \ + file://ip6tunnel.patch \ + file://remove-bashisms.patch \ + file://no-strip.patch" S = "${WORKDIR}" diff --git a/recipes/iproute2/iproute2_2.6.29.bb b/recipes/iproute2/iproute2_2.6.29.bb index bf2ff4931b..48317108ca 100644 --- a/recipes/iproute2/iproute2_2.6.29.bb +++ b/recipes/iproute2/iproute2_2.6.29.bb @@ -3,10 +3,10 @@ require iproute2.inc PR = "${INC_PR}.1" SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ - file://new-flex-fix.patch;apply=yes \ - file://compilation-fix.patch;apply=yes \ - file://use-cross-compiler.patch;apply=yes \ - file://remove-bashisms.patch;apply=yes \ + file://new-flex-fix.patch \ + file://compilation-fix.patch \ + file://use-cross-compiler.patch \ + file://remove-bashisms.patch \ " S = "${WORKDIR}/iproute2-${PV}" diff --git a/recipes/iproute2/iproute2_2.6.31.bb b/recipes/iproute2/iproute2_2.6.31.bb index 1801647703..b952fa53cb 100644 --- a/recipes/iproute2/iproute2_2.6.31.bb +++ b/recipes/iproute2/iproute2_2.6.31.bb @@ -3,7 +3,7 @@ require iproute2.inc PR = "${INC_PR}.0" SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ - file://new-flex-fix.patch;apply=yes \ + file://new-flex-fix.patch \ " S = "${WORKDIR}/iproute2-${PV}" -- cgit v1.2.3