recipes: Punt use of patch=1 and use striplevel=n instead of pnum

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/binutils/binutils_2.18.atmel.1.0.1.bb b/recipes/binutils/binutils_2.18.atmel.1.0.1.bb
index d08e61c..8f52c08 100644 (file)
--- a/recipes/binutils/binutils_2.18.atmel.1.0.1.bb
+++ b/recipes/binutils/binutils_2.18.atmel.1.0.1.bb
@@ -6,17 +6,17 @@ LICENSE = "GPLv3"
 
 SRC_URI = "\
      http://avr32linux.org/twiki/pub/Main/BinutilsPatches/binutils-${PV}.tar.bz2;name=archive \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-configure-texinfo-version.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
-     file://binutils-section-in-segment.patch;patch=1;pnum=0 \
-     file://parse-neon-vmov.diff;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-configure-texinfo-version.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-x86_64_i386_biarch.patch \
+     file://binutils-section-in-segment.patch;striplevel=0 \
+     file://parse-neon-vmov.diff \
      "
 SRC_URI[archive.md5sum] = "71fb723a456fd902ee785328f0d09cd5"
 SRC_URI[archive.sha256sum] = "ea614e9fbec6cb9af08a911660a30991918df44e0328046341f7866ffd2f68d8"

diff --git a/recipes/clamav/clamav_0.96.1.bb b/recipes/clamav/clamav_0.96.1.bb
index bf1aa1c..6124652 100644 (file)
--- a/recipes/clamav/clamav_0.96.1.bb
+++ b/recipes/clamav/clamav_0.96.1.bb
@@ -1,6 +1,6 @@
 require clamav.inc
 
-SRC_URI += " file://fix-llvm-cross-configure.patch;patch=1"
+SRC_URI += " file://fix-llvm-cross-configure.patch"
 
 SRC_URI[clamav-0.96.1.md5sum] = "38e7870db6e9ad0e569518499a6f3651"
 SRC_URI[clamav-0.96.1.sha256sum] = "413dd25907059068da2a367d2b330fbc37d5d2764eb3b047214ce754a9ca74ea"
@@ -17,4 +17,4 @@ do_configure() {
        oe_runconf
 }
 
-FILES_${PN}_append = " ${bindir}/clambc"
\ No newline at end of file
+FILES_${PN}_append = " ${bindir}/clambc"

diff --git a/recipes/eds/eds-dbus_git.bb b/recipes/eds/eds-dbus_git.bb
index 88a4da5..e72da9c 100644 (file)
--- a/recipes/eds/eds-dbus_git.bb
+++ b/recipes/eds/eds-dbus_git.bb
@@ -11,7 +11,7 @@ PR_append = "+gitr${SRCREV}"
 
 SRC_URI = "git://git.o-hand.com/eds-dbus;branch=master;protocol=git \
            file://iconv-detect.h \
-           file://libxml2-for-libedataserverui.patch;patch=1 \
+           file://libxml2-for-libedataserverui.patch \
            file://gtk-doc.make"
 
 S = "${WORKDIR}/git"

diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
index 78512f5..298aa7e 100644 (file)
--- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
@@ -21,7 +21,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 \
            file://Makefile-codec-cfg.patch \
            file://w100-configure-svn.patch \
            file://w100-video_out.patch \
-           file://w100-mplayer.patch;patch= \
+           file://w100-mplayer.patch \
            file://pld-onlyarm5.patch \
            file://makefile-nostrip-rc2.patch \
            file://mplayer-imageon-svn.patch \

diff --git a/recipes/scummvm/scummvm_1.1.1.bb b/recipes/scummvm/scummvm_1.1.1.bb
index 4ee3031..93ceb28 100644 (file)
--- a/recipes/scummvm/scummvm_1.1.1.bb
+++ b/recipes/scummvm/scummvm_1.1.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
 SRC_URI += " file://scummvm.desktop \
-             file://no-strip.patch;patch=1 \
+             file://no-strip.patch \
            "
 PR = "${INC_PR}.0"
 

diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb
index 36dd002..ab785e9 100644 (file)
--- a/recipes/shr/libphone-ui_git.bb
+++ b/recipes/shr/libphone-ui_git.bb
@@ -11,7 +11,7 @@ DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libfso-glib libfsoframework libph
 inherit pkgconfig autotools autotools_stage
 
 SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master \
-           file://0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch;patch=1"
+           file://0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch"
 
 S="${WORKDIR}/git"
 

diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb
index 8cb1527..bb314ed 100644 (file)
--- a/recipes/ti/gstreamer-ti_svn.bb
+++ b/recipes/ti/gstreamer-ti_svn.bb
@@ -27,6 +27,6 @@ SRC_URI_append_omapl138 = " file://loadmodules.sh "
 SRC_URI_append_omap3 = " file://loadmodules.sh "
 # apply omapdmaifbsink patch on omap3 platform
 # NOTE: this patch need's X11 header/libs
-SRC_URI_append_omap3 = " file://0007-add-omapdmaifbsink.patch;patch=1"
+SRC_URI_append_omap3 = " file://0007-add-omapdmaifbsink.patch"
 
 

diff --git a/recipes/ti/ti-dmai_2.10.00.10.bb b/recipes/ti/ti-dmai_2.10.00.10.bb
index 66cc424..4c80b9c 100644 (file)
--- a/recipes/ti/ti-dmai_2.10.00.10.bb
+++ b/recipes/ti/ti-dmai_2.10.00.10.bb
@@ -5,7 +5,7 @@ PR = "r2"
  
 COMPATIBLE_MACHINE = "(dm365-evm|dm355-evm|dm6467-evm)"
 
-SRC_URI_append = "file://0001-Correct-DMAI-s-Resize-module-for-DM365.patch;patch=3 \
+SRC_URI_append = "file://0001-Correct-DMAI-s-Resize-module-for-DM365.patch;striplevel=3 \
        file://doxygen_templates.tar.gz \
         file://arago-tdox"
 

diff --git a/recipes/ti/ti-dvsdk-demos_3.10.00.14.bb b/recipes/ti/ti-dvsdk-demos_3.10.00.14.bb
index b9f1aff..e91276e 100644 (file)
--- a/recipes/ti/ti-dvsdk-demos_3.10.00.14.bb
+++ b/recipes/ti/ti-dvsdk-demos_3.10.00.14.bb
@@ -3,9 +3,9 @@ require ti-dvsdk-demos.inc
 PV = "3_10_00_14"
 PR = "${INC_PR}.1"
 
-SRC_URI_append_dm365 = " file://dm365-demos-with-new-data-paths.patch;patch=1 \
-    file://changed_insmod_to_modprobe_in_loadmodules_3.10.00.14.patch;patch=1 \
-    file://remove-loadmodules_hd.sh-from-make-install_3.10.00.14.patch;patch=1"
+SRC_URI_append_dm365 = " file://dm365-demos-with-new-data-paths.patch \
+    file://changed_insmod_to_modprobe_in_loadmodules_3.10.00.14.patch \
+    file://remove-loadmodules_hd.sh-from-make-install_3.10.00.14.patch"
 
 SRC_URI[dvsdkdemostarball.md5sum] = "36cd08c21a95a60ca6916f029f875bea"
 SRC_URI[dvsdkdemostarball.sha256sum] = "a39bbb08e85fd0131dc725cd9c01586e14b58bc361401dfd122f23c5f5d8db71"