From a0dc330b4abbb31c3c131a4cb1762555e5e109a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 18 Aug 2011 00:17:52 +0000 Subject: recipes: Delete patch=1, its default and replace pnum with striplevel Some place pnum=1 is used which is removed as well since striplevel=1 is default (From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-sato/eds/eds-dbus_2.20.0.bb | 4 ++-- meta/recipes-sato/eds/eds-dbus_git.bb | 10 +++++----- .../matchbox-config-gtk/matchbox-config-gtk_git.bb | 2 +- meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | 4 ++-- meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | 2 +- meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb | 4 ++-- meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb | 2 +- meta/recipes-sato/puzzles/oh-puzzles_svn.bb | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb index 2acc5b5833..d129a64d91 100644 --- a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb +++ b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb @@ -9,8 +9,8 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/mobile/2.23/2.23.92/sources/evolution-data-server-dbus-${PV}.tar.gz \ - file://oh-contact.patch;patch=1;pnum=0 \ - file://no_iconv_test.patch;patch=1 \ + file://oh-contact.patch;striplevel=0 \ + file://no_iconv_test.patch \ file://iconv-detect.h" S = "${WORKDIR}/evolution-data-server-dbus-${PV}" diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb index 0d920cdc60..7fa8311062 100644 --- a/meta/recipes-sato/eds/eds-dbus_git.bb +++ b/meta/recipes-sato/eds/eds-dbus_git.bb @@ -15,11 +15,11 @@ PV = "2.30+git${SRCPV}" PR = "r1" SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ - file://oh-contact.patch;patch=1;pnum=0 \ - file://nossl.patch;patch=1 \ - file://optional_imapx_provider.patch;patch=1 \ - file://new-contact-fix.patch;patch=1 \ - file://old-gdk-api.patch;patch=1 \ + file://oh-contact.patch;striplevel=0 \ + file://nossl.patch \ + file://optional_imapx_provider.patch \ + file://new-contact-fix.patch \ + file://old-gdk-api.patch \ file://iconv-detect.h" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb index d3873ad366..1d93b73f37 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb @@ -16,7 +16,7 @@ PR = "r0" S = "${WORKDIR}/git" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ - file://no-handed.patch;patch=1;pnum=0" + file://no-handed.patch;striplevel=0" inherit autotools pkgconfig diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb index 7d7a1b9a31..97b40d4777 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb @@ -15,8 +15,8 @@ PV = "0.0+git${SRCPV}" PR = "r0" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ - file://configure_fix.patch;patch=1;maxrev=1819 \ - file://single-instance.patch;patch=1 \ + file://configure_fix.patch;maxrev=1819 \ + file://single-instance.patch \ file://80matchboxkeyboard.shbg" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb index 46473a04fb..98b3447a71 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb @@ -21,7 +21,7 @@ RCONFLICTS_${PN} = "matchbox-panel" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ file://gcc-4.6.0-compile.patch \ - file://startup_fix.diff;patch=1" + file://startup_fix.diff" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb index 94ccd3fe13..10388f4c71 100644 --- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb +++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb @@ -12,8 +12,8 @@ PV = "0.0+git${SRCPV}" PR = "r0" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ - file://single-instance.patch;patch=1 \ - file://configure_fix.patch;patch=1;maxrev=1819 \ + file://single-instance.patch \ + file://configure_fix.patch;maxrev=1819 \ file://dso_linking_change_build_fix.patch " S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb index 5eb5480d96..49252313b8 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb @@ -22,7 +22,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ file://emblem-symbolic-link.png \ file://cross-compile-fix.patch" -SRC_URI_append_poky = " file://owl-window-menu.patch;patch=1" +SRC_URI_append_poky = " file://owl-window-menu.patch" SRC_URI[md5sum] = "4a7fdc0526ed14e3293d784c0ce27dea" SRC_URI[sha256sum] = "a9335baf127d133da1b2873b3065545bd278fadd4b33e4b91e3d10b165961b68" diff --git a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb index 616fb0e244..b5e5b91b65 100644 --- a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb +++ b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb @@ -20,7 +20,7 @@ bindir = "/usr/games" inherit autotools pkgconfig SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http" -SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;patch=1;pnum=0 " +SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 " S = "${WORKDIR}/${BPN}" -- cgit v1.2.3-54-g00ecf