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/busybox/busybox.inc | 8 ++++---- recipes/busybox/busybox_1.11.3.bb | 10 +++++----- recipes/busybox/busybox_1.13.2.bb | 34 +++++++++++++++++----------------- recipes/busybox/busybox_1.14.3.bb | 10 +++++----- recipes/busybox/busybox_1.15.3.bb | 14 +++++++------- recipes/busybox/busybox_1.2.1.bb | 6 +++--- recipes/busybox/busybox_1.2.2.bb | 2 +- recipes/busybox/busybox_1.7.2.bb | 12 ++++++------ recipes/busybox/busybox_1.9.2.bb | 10 +++++----- 9 files changed, 53 insertions(+), 53 deletions(-) (limited to 'recipes/busybox') diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 5e0c5a42bd..8abda7c964 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -18,17 +18,17 @@ SRC_URI = "\ file://busybox-httpd \ file://busybox-udhcpd \ file://default.script file://simple.script \ - file://dhcp-hostname.patch;apply=yes \ + file://dhcp-hostname.patch \ file://hwclock.sh \ - file://ifupdown-spurious-environ.patch;apply=yes \ + file://ifupdown-spurious-environ.patch \ file://mount.busybox \ file://syslog \ file://syslog.conf \ - file://udhcpscript.patch;apply=yes \ + file://udhcpscript.patch \ file://umount.busybox \ " -SRC_URI_append_nylon = " file://xargs-double-size.patch;apply=yes" +SRC_URI_append_nylon = " file://xargs-double-size.patch" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb index 643b169751..fa169efd9c 100644 --- a/recipes/busybox/busybox_1.11.3.bb +++ b/recipes/busybox/busybox_1.11.3.bb @@ -4,11 +4,11 @@ PR = "${INC_PR}.1" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ - file://udhcpscript.patch;apply=yes \ - file://B921600.patch;apply=yes \ - file://fdisk_lineedit_segfault.patch;apply=yes \ - file://iptunnel.patch;apply=yes \ - file://busybox-appletlib-dependency.patch;apply=yes \ + file://udhcpscript.patch \ + file://B921600.patch \ + file://fdisk_lineedit_segfault.patch \ + file://iptunnel.patch \ + file://busybox-appletlib-dependency.patch \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index 96087a22ca..57815f68af 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -3,24 +3,24 @@ PR = "${INC_PR}.1" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://busybox-1.13.2-awk.patch;apply=yes \ - file://busybox-1.13.2-depmod.patch;apply=yes \ - file://busybox-1.13.2-init.patch;apply=yes \ - file://busybox-1.13.2-killall.patch;apply=yes \ - file://busybox-1.13.2-mdev.patch;apply=yes \ - file://busybox-1.13.2-modprobe.patch;apply=yes \ - file://busybox-1.13.2-printf.patch;apply=yes \ - file://busybox-1.13.2-syslogd.patch;apply=yes \ - file://busybox-1.13.2-tar.patch;apply=yes \ - file://busybox-1.13.2-top24.patch;apply=yes \ - file://busybox-1.13.2-unzip.patch;apply=yes \ - file://busybox-1.13.2-wget.patch;apply=yes \ + file://busybox-1.13.2-awk.patch \ + file://busybox-1.13.2-depmod.patch \ + file://busybox-1.13.2-init.patch \ + file://busybox-1.13.2-killall.patch \ + file://busybox-1.13.2-mdev.patch \ + file://busybox-1.13.2-modprobe.patch \ + file://busybox-1.13.2-printf.patch \ + file://busybox-1.13.2-syslogd.patch \ + file://busybox-1.13.2-tar.patch \ + file://busybox-1.13.2-top24.patch \ + file://busybox-1.13.2-unzip.patch \ + file://busybox-1.13.2-wget.patch \ \ - file://udhcpscript.patch;apply=yes \ - file://udhcpc-fix-nfsroot.patch;apply=yes \ - file://B921600.patch;apply=yes \ - file://get_header_tar.patch;apply=yes \ - file://busybox-appletlib-dependency.patch;apply=yes \ + file://udhcpscript.patch \ + file://udhcpc-fix-nfsroot.patch \ + file://B921600.patch \ + file://get_header_tar.patch \ + file://busybox-appletlib-dependency.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ diff --git a/recipes/busybox/busybox_1.14.3.bb b/recipes/busybox/busybox_1.14.3.bb index 49ad8b3084..ebe018cc78 100644 --- a/recipes/busybox/busybox_1.14.3.bb +++ b/recipes/busybox/busybox_1.14.3.bb @@ -6,11 +6,11 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ - file://udhcpscript.patch;apply=yes \ - file://udhcpc-fix-nfsroot.patch;apply=yes \ - file://B921600.patch;apply=yes \ - file://get_header_tar.patch;apply=yes \ - file://busybox-appletlib-dependency.patch;apply=yes \ + file://udhcpscript.patch \ + file://udhcpc-fix-nfsroot.patch \ + file://B921600.patch \ + file://get_header_tar.patch \ + file://busybox-appletlib-dependency.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ diff --git a/recipes/busybox/busybox_1.15.3.bb b/recipes/busybox/busybox_1.15.3.bb index 5cb909ae87..07103e855f 100644 --- a/recipes/busybox/busybox_1.15.3.bb +++ b/recipes/busybox/busybox_1.15.3.bb @@ -4,13 +4,13 @@ PR = "${INC_PR}.1" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ - file://udhcpscript.patch;apply=yes \ - file://udhcpc-fix-nfsroot.patch;apply=yes \ - file://B921600.patch;apply=yes \ - file://get_header_tar.patch;apply=yes \ - file://busybox-appletlib-dependency.patch;apply=yes \ - file://0000-wget-no-check-certificate.patch;apply=yes \ - file://run-parts.in.usr-bin.patch;apply=yes \ + file://udhcpscript.patch \ + file://udhcpc-fix-nfsroot.patch \ + file://B921600.patch \ + file://get_header_tar.patch \ + file://busybox-appletlib-dependency.patch \ + file://0000-wget-no-check-certificate.patch \ + file://run-parts.in.usr-bin.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ diff --git a/recipes/busybox/busybox_1.2.1.bb b/recipes/busybox/busybox_1.2.1.bb index 7599e4e56d..c3ab626f2f 100644 --- a/recipes/busybox/busybox_1.2.1.bb +++ b/recipes/busybox/busybox_1.2.1.bb @@ -5,12 +5,12 @@ PR = "${INC_PR}.1" SRC_URI += "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ - file://wget-long-options.patch;apply=yes \ - file://df_rootfs.patch;apply=yes \ + file://wget-long-options.patch \ + file://df_rootfs.patch \ file://defconfig" SRC_URI[tarball.md5sum] = "362b3dc0f2023ddfda901dc1f1a74391" SRC_URI[tarball.sha256sum] = "c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410" -SRC_URI_append_avr32 = " file://install-should-unlink-dest-if-it-exists.patch;apply=yes" +SRC_URI_append_avr32 = " file://install-should-unlink-dest-if-it-exists.patch" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe diff --git a/recipes/busybox/busybox_1.2.2.bb b/recipes/busybox/busybox_1.2.2.bb index dca729a202..2a373ae823 100644 --- a/recipes/busybox/busybox_1.2.2.bb +++ b/recipes/busybox/busybox_1.2.2.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ - file://wget-long-options.patch;apply=yes \ + file://wget-long-options.patch \ file://defconfig" SRC_URI[tarball.md5sum] = "ae8a4c65b9464c8ece3483a3d3b9544c" SRC_URI[tarball.sha256sum] = "4de9fb2bb018e381e64199b38d90cb25e71366c37a8995e9ab5ed206ebcb972f" diff --git a/recipes/busybox/busybox_1.7.2.bb b/recipes/busybox/busybox_1.7.2.bb index 74775af436..5887fbb7fd 100644 --- a/recipes/busybox/busybox_1.7.2.bb +++ b/recipes/busybox/busybox_1.7.2.bb @@ -11,17 +11,17 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://mountall \ file://syslog \ file://syslog.conf \ - file://udhcpscript.patch;apply=yes \ - file://busybox-appletlib-dependency.patch;apply=yes \ + file://udhcpscript.patch \ + file://busybox-appletlib-dependency.patch \ file://umount.busybox \ file://run_parts.c" SRC_URI[tarball.md5sum] = "c91ec9756e2000073a9dd8fa9fc3f89e" SRC_URI[tarball.sha256sum] = "83c4cc813124a43f13e2ebb83cea9da9909d63891b824bf4bc7006f0567db7cf" -SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;apply=yes;name=patch1 \ - http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch;apply=yes;name=patch2 \ - http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch;apply=yes;name=patch3 \ - http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch;apply=yes;name=patch4 \ +SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;name=patch1 \ + http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch;name=patch2 \ + http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch;name=patch3 \ + http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch;name=patch4 \ file://defconfig" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" diff --git a/recipes/busybox/busybox_1.9.2.bb b/recipes/busybox/busybox_1.9.2.bb index d4efdcd0ae..065cabf66b 100644 --- a/recipes/busybox/busybox_1.9.2.bb +++ b/recipes/busybox/busybox_1.9.2.bb @@ -2,11 +2,11 @@ require busybox.inc PR = "${INC_PR}.1" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://udhcpscript.patch;apply=yes \ - file://adduser-longops.patch;apply=yes \ - file://sort-z-nul.patch;apply=yes;status=upstream \ - file://topmem.patch;apply=yes \ - file://busybox-appletlib-dependency.patch;apply=yes \ + file://udhcpscript.patch \ + file://adduser-longops.patch \ + file://sort-z-nul.patch;status=upstream \ + file://topmem.patch \ + file://busybox-appletlib-dependency.patch \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ -- cgit 1.2.3-korg