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/bluez/bcm2035-tool_0.0.bb | 2 +- recipes/bluez/bluez-cups-backend_3.33.bb | 2 +- recipes/bluez/bluez-gnome_1.8.bb | 4 ++-- recipes/bluez/bluez-gnome_git.bb | 2 +- recipes/bluez/bluez-gstreamer-plugin_3.33.bb | 2 +- recipes/bluez/bluez-utils-alsa_3.33.bb | 2 +- recipes/bluez/bluez-utils.inc | 6 +++--- recipes/bluez/bluez-utils3.inc | 2 +- recipes/bluez/bluez-utils_3.33.bb | 2 +- recipes/bluez/bluez4-libs.inc | 2 +- recipes/bluez/bluez4.inc | 4 ++-- recipes/bluez/bluez4_4.31.bb | 6 +++--- recipes/bluez/bluez4_4.35.bb | 4 ++-- recipes/bluez/bluez4_4.37.bb | 4 ++-- recipes/bluez/obexd_0.22.bb | 2 +- recipes/bluez/ussp-push_0.11.bb | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) (limited to 'recipes/bluez') diff --git a/recipes/bluez/bcm2035-tool_0.0.bb b/recipes/bluez/bcm2035-tool_0.0.bb index 156c7e1295..30d0037395 100644 --- a/recipes/bluez/bcm2035-tool_0.0.bb +++ b/recipes/bluez/bcm2035-tool_0.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" PR = "r1" SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \ - file://addr-as-arg.patch;patch=1 \ + file://addr-as-arg.patch;apply=yes \ " S = "${WORKDIR}/${PN}" diff --git a/recipes/bluez/bluez-cups-backend_3.33.bb b/recipes/bluez/bluez-cups-backend_3.33.bb index 0a0e26c69b..9ca1172597 100644 --- a/recipes/bluez/bluez-cups-backend_3.33.bb +++ b/recipes/bluez/bluez-cups-backend_3.33.bb @@ -6,7 +6,7 @@ DEPENDS += "cups" # TI patch landed upstream sometime between 3.35 and 3.36, # albeit in a somewhat different form -SRC_URI += "file://hciattach-ti-bts.patch;patch=1" +SRC_URI += "file://hciattach-ti-bts.patch;apply=yes" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ diff --git a/recipes/bluez/bluez-gnome_1.8.bb b/recipes/bluez/bluez-gnome_1.8.bb index 57629b37c9..2ab45c1ee9 100644 --- a/recipes/bluez/bluez-gnome_1.8.bb +++ b/recipes/bluez/bluez-gnome_1.8.bb @@ -6,8 +6,8 @@ DEPENDS = "dbus-glib gconf libnotify gtk+" RRECOMMENDS = "gnome-icon-theme" SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/${P}.tar.gz \ - file://add-device-from-rfcomm-crash.patch;patch=1 \ - file://cs-typo.patch;patch=1" + file://add-device-from-rfcomm-crash.patch;apply=yes \ + file://cs-typo.patch;apply=yes" inherit autotools pkgconfig gconf mime diff --git a/recipes/bluez/bluez-gnome_git.bb b/recipes/bluez/bluez-gnome_git.bb index 267f3f9e5d..0f28cedf9a 100644 --- a/recipes/bluez/bluez-gnome_git.bb +++ b/recipes/bluez/bluez-gnome_git.bb @@ -7,7 +7,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+" SRCREV = "c4ccbf7c4d0aa55e234d30e6daee494e496c7c7f" SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/bluez-gnome.git;protocol=git;branch=master " -# file://pkgconfig-add-gthread.patch;patch=1 " +# file://pkgconfig-add-gthread.patch;apply=yes " PV = "0.10+gitr${SRCREV}" S = "${WORKDIR}/git" diff --git a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb index e1dff24044..fa76c9a0ee 100644 --- a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb +++ b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb @@ -6,7 +6,7 @@ DEPENDS += "gstreamer gst-plugins-base " # TI patch landed upstream sometime between 3.35 and 3.36, # albeit in a somewhat different form -SRC_URI += "file://hciattach-ti-bts.patch;patch=1" +SRC_URI += "file://hciattach-ti-bts.patch;apply=yes" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ diff --git a/recipes/bluez/bluez-utils-alsa_3.33.bb b/recipes/bluez/bluez-utils-alsa_3.33.bb index 407fcd954c..0e967a2260 100644 --- a/recipes/bluez/bluez-utils-alsa_3.33.bb +++ b/recipes/bluez/bluez-utils-alsa_3.33.bb @@ -6,7 +6,7 @@ DEPENDS += "alsa-lib" # TI patch landed upstream sometime between 3.35 and 3.36, # albeit in a somewhat different form -SRC_URI += "file://hciattach-ti-bts.patch;patch=1" +SRC_URI += "file://hciattach-ti-bts.patch;apply=yes" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ diff --git a/recipes/bluez/bluez-utils.inc b/recipes/bluez/bluez-utils.inc index 7c84f4e1d5..ff6180b205 100644 --- a/recipes/bluez/bluez-utils.inc +++ b/recipes/bluez/bluez-utils.inc @@ -10,14 +10,14 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ - file://hciattach-ti-bts.patch;patch=1 \ - file://handle-eintr.patch;patch=1;status=applied" + file://hciattach-ti-bts.patch;apply=yes \ + file://handle-eintr.patch;apply=yes;status=applied" SRC_URI_append_r1000 = " file://hciattach.sh" SRC_URI_append_ghi270 = " file://hciattach.sh" # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol # Let's default to that instead of 'any' until further notice... -SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;apply=yes" S = "${WORKDIR}/bluez-utils-${PV}" diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc index df071b76d9..1c540a4a8a 100644 --- a/recipes/bluez/bluez-utils3.inc +++ b/recipes/bluez/bluez-utils3.inc @@ -12,7 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ - file://sbc-thumb.patch;patch=1" + file://sbc-thumb.patch;apply=yes" S = "${WORKDIR}/bluez-utils-${PV}" diff --git a/recipes/bluez/bluez-utils_3.33.bb b/recipes/bluez/bluez-utils_3.33.bb index d7ae808abc..2335eec75d 100644 --- a/recipes/bluez/bluez-utils_3.33.bb +++ b/recipes/bluez/bluez-utils_3.33.bb @@ -4,7 +4,7 @@ PR = "r3" # TI patch landed upstream sometime between 3.35 and 3.36, # albeit in a somewhat different form -SRC_URI += "file://hciattach-ti-bts.patch;patch=1" +SRC_URI += "file://hciattach-ti-bts.patch;apply=yes" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ diff --git a/recipes/bluez/bluez4-libs.inc b/recipes/bluez/bluez4-libs.inc index 4da389cdbb..adf30478de 100644 --- a/recipes/bluez/bluez4-libs.inc +++ b/recipes/bluez/bluez4-libs.inc @@ -6,7 +6,7 @@ LICENSE = "GPL" INC_PR = "r1" SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ - file://avinfo-link.patch;patch=1;pnum=0" + file://avinfo-link.patch;apply=yes;striplevel=0" S = "${WORKDIR}/bluez-${PV}" diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc index 7a200b6cb0..a398781829 100644 --- a/recipes/bluez/bluez4.inc +++ b/recipes/bluez/bluez4.inc @@ -13,8 +13,8 @@ RPROVIDES_bluez4-dev = "bluez-libs-dev" SRC_URI = "\ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ - file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ - file://sbc-thumb.patch;patch=1 \ + file://fix-dfutool-usb-declaration-mismatch.patch;apply=yes \ + file://sbc-thumb.patch;apply=yes \ file://bluetooth.conf \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/recipes/bluez/bluez4_4.31.bb b/recipes/bluez/bluez4_4.31.bb index 6f32474166..3d91a86c1e 100644 --- a/recipes/bluez/bluez4_4.31.bb +++ b/recipes/bluez/bluez4_4.31.bb @@ -8,10 +8,10 @@ PR = "r7" SRC_URI = "\ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ - file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ - file://sbc-thumb.patch;patch=1 \ + file://fix-dfutool-usb-declaration-mismatch.patch;apply=yes \ + file://sbc-thumb.patch;apply=yes \ file://bluetooth.conf \ -# file://hid2hci_usb_init.patch;patch=1 \ +# file://hid2hci_usb_init.patch;apply=yes \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4_4.35.bb index 5c10cfad1d..757a0e6e6b 100644 --- a/recipes/bluez/bluez4_4.35.bb +++ b/recipes/bluez/bluez4_4.35.bb @@ -15,8 +15,8 @@ PR = "r2" SRC_URI = "\ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ - file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ - file://sbc-thumb.patch;patch=1 \ + file://fix-dfutool-usb-declaration-mismatch.patch;apply=yes \ + file://sbc-thumb.patch;apply=yes \ file://bluetooth.conf \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/recipes/bluez/bluez4_4.37.bb b/recipes/bluez/bluez4_4.37.bb index 6ec1b1c282..0d0c3a4645 100644 --- a/recipes/bluez/bluez4_4.37.bb +++ b/recipes/bluez/bluez4_4.37.bb @@ -15,8 +15,8 @@ PR = "r1" SRC_URI = "\ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ - file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ - file://sbc-thumb.patch;patch=1 \ + file://fix-dfutool-usb-declaration-mismatch.patch;apply=yes \ + file://sbc-thumb.patch;apply=yes \ file://bluetooth.conf \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/recipes/bluez/obexd_0.22.bb b/recipes/bluez/obexd_0.22.bb index 1731cd2a94..2b2c7e3be0 100644 --- a/recipes/bluez/obexd_0.22.bb +++ b/recipes/bluez/obexd_0.22.bb @@ -5,7 +5,7 @@ DEPENDS_append_shr = " libframeworkd-glib " LICENSE = "GPLv2" SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz;name=archive" -SRC_URI_append_shr = " file://obexd-add-fso-support.patch;patch=1 " +SRC_URI_append_shr = " file://obexd-add-fso-support.patch;apply=yes " SRC_URI[archive.md5sum] = "ed59a0e357b56d2a2ba0d1de6a0cc109" SRC_URI[archive.sha256sum] = "b6a0217abafd2fd78c33ef8b9d64bb83da014c67c1ed594c475129a1b326e137" diff --git a/recipes/bluez/ussp-push_0.11.bb b/recipes/bluez/ussp-push_0.11.bb index 0ad2e1bea9..e60534ef7b 100644 --- a/recipes/bluez/ussp-push_0.11.bb +++ b/recipes/bluez/ussp-push_0.11.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" PR = "r1" SRC_URI = "http://www.xmailserver.org/ussp-push-${PV}.tar.gz \ - file://hci_remote_name.patch;patch=1" + file://hci_remote_name.patch;apply=yes" S = "${WORKDIR}/ussp-push-${PV}" -- cgit 1.2.3-korg