summaryrefslogtreecommitdiff
path: root/recipes/openssh
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-24 13:01:00 -0700
committerChris Larson <chris_larson@mentor.com>2010-05-25 12:54:52 -0700
commit6fe7cef27069415f2eba36bc640cf59013d4979b (patch)
treeb0cb8845ddc6b8bcffc50e08a2eeae98e049be98 /recipes/openssh
parentbf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 (diff)
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 <chris_larson@mentor.com> Acked-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/openssh')
-rw-r--r--recipes/openssh/openssh_3.7.1p1.bb4
-rw-r--r--recipes/openssh/openssh_3.7.1p2.bb4
-rw-r--r--recipes/openssh/openssh_3.8p1.bb4
-rw-r--r--recipes/openssh/openssh_4.0p1.bb2
-rw-r--r--recipes/openssh/openssh_4.6p1.bb2
-rw-r--r--recipes/openssh/openssh_5.2p1.bb2
6 files changed, 9 insertions, 9 deletions
diff --git a/recipes/openssh/openssh_3.7.1p1.bb b/recipes/openssh/openssh_3.7.1p1.bb
index 9f2e690b32..f63c7fa252 100644
--- a/recipes/openssh/openssh_3.7.1p1.bb
+++ b/recipes/openssh/openssh_3.7.1p1.bb
@@ -10,8 +10,8 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
used to provide applications with a secure communication channel."
LICENSE = "openssh"
SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
- file://configure.patch;apply=yes \
- file://scp-nossl.patch;apply=yes \
+ file://configure.patch \
+ file://scp-nossl.patch \
file://sshd_config"
inherit autotools
diff --git a/recipes/openssh/openssh_3.7.1p2.bb b/recipes/openssh/openssh_3.7.1p2.bb
index 8ee7a9e941..7d8671c980 100644
--- a/recipes/openssh/openssh_3.7.1p2.bb
+++ b/recipes/openssh/openssh_3.7.1p2.bb
@@ -10,8 +10,8 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
used to provide applications with a secure communication channel."
SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
- file://configure.patch;apply=yes \
- file://scp-nossl.patch;apply=yes \
+ file://configure.patch \
+ file://scp-nossl.patch \
file://sshd_config"
inherit autotools
diff --git a/recipes/openssh/openssh_3.8p1.bb b/recipes/openssh/openssh_3.8p1.bb
index 70d1ee4c6f..fe5a623365 100644
--- a/recipes/openssh/openssh_3.8p1.bb
+++ b/recipes/openssh/openssh_3.8p1.bb
@@ -13,8 +13,8 @@ LICENSE = "BSD"
PR ="r3"
SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
- file://configure.patch;apply=yes \
- file://scp-nossl.patch;apply=yes \
+ file://configure.patch \
+ file://scp-nossl.patch \
file://ssh_config \
file://sshd_config \
file://init"
diff --git a/recipes/openssh/openssh_4.0p1.bb b/recipes/openssh/openssh_4.0p1.bb
index 92bf1cd1e0..4e595bf615 100644
--- a/recipes/openssh/openssh_4.0p1.bb
+++ b/recipes/openssh/openssh_4.0p1.bb
@@ -17,7 +17,7 @@ LICENSE = "BSD"
PR = "r10"
SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
- file://configure.patch;apply=yes \
+ file://configure.patch \
file://sshd_config \
file://ssh_config \
file://init"
diff --git a/recipes/openssh/openssh_4.6p1.bb b/recipes/openssh/openssh_4.6p1.bb
index 3adcc21f78..dba3785dcb 100644
--- a/recipes/openssh/openssh_4.6p1.bb
+++ b/recipes/openssh/openssh_4.6p1.bb
@@ -1,6 +1,6 @@
require openssh.inc
SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
- file://sftp-server-nolibcrypto.patch;apply=yes \
+ file://sftp-server-nolibcrypto.patch \
file://sshd_config \
file://ssh_config \
file://init \
diff --git a/recipes/openssh/openssh_5.2p1.bb b/recipes/openssh/openssh_5.2p1.bb
index ccf8a8e702..66eff25928 100644
--- a/recipes/openssh/openssh_5.2p1.bb
+++ b/recipes/openssh/openssh_5.2p1.bb
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://sshd_config \
file://ssh_config \
file://init \
- file://openssh-5.2-sftp-server-nolibcrypto.patch;apply=yes \
+ file://openssh-5.2-sftp-server-nolibcrypto.patch \
"
SRC_URI[md5sum] = "ada79c7328a8551bdf55c95e631e7dad"