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/dpkg/dpkg-native.inc | 2 +- recipes/dpkg/dpkg.inc | 4 ++-- recipes/dpkg/dpkg_1.13.22.bb | 2 +- recipes/dpkg/dpkg_1.13.25.bb | 2 +- recipes/dpkg/dpkg_1.14.19.bb | 2 +- recipes/dpkg/dpkg_1.14.23.bb | 2 +- recipes/dpkg/dpkg_1.14.29.bb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'recipes/dpkg') diff --git a/recipes/dpkg/dpkg-native.inc b/recipes/dpkg/dpkg-native.inc index 2f91e8b844..72db286d36 100644 --- a/recipes/dpkg/dpkg-native.inc +++ b/recipes/dpkg/dpkg-native.inc @@ -5,7 +5,7 @@ inherit native DEPENDS = "perl-native bzip2-native zlib-native virtual/update-alternatives-native" RDEPENDS = "" -SRC_URI += "file://noman.patch;apply=yes" +SRC_URI += "file://noman.patch" FILESPATH += "dpkg-${PV}" # We need to do this so our perl is picked up. diff --git a/recipes/dpkg/dpkg.inc b/recipes/dpkg/dpkg.inc index 8eda9290aa..c3c9a90ab7 100644 --- a/recipes/dpkg/dpkg.inc +++ b/recipes/dpkg/dpkg.inc @@ -3,8 +3,8 @@ LICENSE = "GPL" SECTION = "base" SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ - file://ignore_extra_fields.patch;apply=yes \ - file://noupdalt.patch;apply=yes" + file://ignore_extra_fields.patch \ + file://noupdalt.patch" S = "${WORKDIR}/dpkg-${PV}" diff --git a/recipes/dpkg/dpkg_1.13.22.bb b/recipes/dpkg/dpkg_1.13.22.bb index c9883afade..9d2771de6a 100644 --- a/recipes/dpkg/dpkg_1.13.22.bb +++ b/recipes/dpkg/dpkg_1.13.22.bb @@ -1,7 +1,7 @@ require dpkg.inc PR = "r6" DEPENDS += "zlib bzip2" -SRC_URI += "file://noman.patch;apply=yes" +SRC_URI += "file://noman.patch" EXTRA_OECONF = "--without-static-progs \ --without-dselect \ diff --git a/recipes/dpkg/dpkg_1.13.25.bb b/recipes/dpkg/dpkg_1.13.25.bb index dc950d36f5..0fa48e664d 100644 --- a/recipes/dpkg/dpkg_1.13.25.bb +++ b/recipes/dpkg/dpkg_1.13.25.bb @@ -1,7 +1,7 @@ require dpkg.inc PR = "r2" DEPENDS += "zlib bzip2" -SRC_URI += "file://noman.patch;apply=yes" +SRC_URI += "file://noman.patch" EXTRA_OECONF = "--without-static-progs \ --without-dselect \ diff --git a/recipes/dpkg/dpkg_1.14.19.bb b/recipes/dpkg/dpkg_1.14.19.bb index e35f362a75..556d317a28 100644 --- a/recipes/dpkg/dpkg_1.14.19.bb +++ b/recipes/dpkg/dpkg_1.14.19.bb @@ -2,7 +2,7 @@ require dpkg.inc PR = "r2" DEPENDS += "zlib bzip2" #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" -SRC_URI += "file://noman.patch;apply=yes" +SRC_URI += "file://noman.patch" EXTRA_OECONF = "--without-static-progs \ --without-dselect \ diff --git a/recipes/dpkg/dpkg_1.14.23.bb b/recipes/dpkg/dpkg_1.14.23.bb index 8482909ad1..0c23708562 100644 --- a/recipes/dpkg/dpkg_1.14.23.bb +++ b/recipes/dpkg/dpkg_1.14.23.bb @@ -2,7 +2,7 @@ require dpkg.inc PR = "r2" DEPENDS += "zlib bzip2" #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" -SRC_URI += "file://noman.patch;apply=yes" +SRC_URI += "file://noman.patch" EXTRA_OECONF = "--without-static-progs \ --without-dselect \ diff --git a/recipes/dpkg/dpkg_1.14.29.bb b/recipes/dpkg/dpkg_1.14.29.bb index 336210ba40..92c8a96d8d 100644 --- a/recipes/dpkg/dpkg_1.14.29.bb +++ b/recipes/dpkg/dpkg_1.14.29.bb @@ -2,7 +2,7 @@ require dpkg.inc PR = "r1" DEPENDS += "zlib bzip2" #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" -SRC_URI += "file://noman.patch;apply=yes" +SRC_URI += "file://noman.patch" SRC_URI[md5sum] = "4326172a959b5b6484b4bc126e9f628d" SRC_URI[sha256sum] = "ea7ec1c861af43ba534a0d7997774a5f1fd4e25a7eea4ff229c9c7bf89aed633" -- cgit 1.2.3-korg