diff options
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear.inc')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index aa313df316..3e430f22bf 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation" | |||
2 | HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" | 2 | HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" |
3 | SECTION = "console/network" | 3 | SECTION = "console/network" |
4 | 4 | ||
5 | INC_PR = "r0" | 5 | INC_PR = "r1" |
6 | 6 | ||
7 | # some files are from other projects and have others license terms: | 7 | # some files are from other projects and have others license terms: |
8 | # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY | 8 | # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY |
@@ -18,7 +18,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ | |||
18 | file://dropbear-0.53.1-static_build_fix.patch \ | 18 | file://dropbear-0.53.1-static_build_fix.patch \ |
19 | file://configure.patch \ | 19 | file://configure.patch \ |
20 | file://fix-2kb-keys.patch \ | 20 | file://fix-2kb-keys.patch \ |
21 | ${@base_contains("DISTRO_TYPE", "debug", "file://allow-nopw.patch", "",d)} \ | 21 | file://nopw-option.patch \ |
22 | file://init \ | 22 | file://init \ |
23 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " | 23 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " |
24 | 24 | ||
@@ -40,8 +40,6 @@ EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' | |||
40 | EXTRA_OECONF += "\ | 40 | EXTRA_OECONF += "\ |
41 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" | 41 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" |
42 | 42 | ||
43 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" | ||
44 | |||
45 | do_install() { | 43 | do_install() { |
46 | install -d ${D}${sysconfdir} \ | 44 | install -d ${D}${sysconfdir} \ |
47 | ${D}${sysconfdir}/init.d \ | 45 | ${D}${sysconfdir}/init.d \ |