summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-08-31 10:48:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-31 19:56:00 +0100
commit48dcb8fc7b669b27160dde33079f40551853702b (patch)
treebb3b0779e36801a72a0c4e1e0fcfa881e6a53afb
parente21e8b502ab2f982836cf1f7a30e33bff1bd5b7b (diff)
downloadopenembedded-core-48dcb8fc7b669b27160dde33079f40551853702b.tar.gz
openembedded-core-48dcb8fc7b669b27160dde33079f40551853702b.tar.bz2
openembedded-core-48dcb8fc7b669b27160dde33079f40551853702b.tar.xz
openembedded-core-48dcb8fc7b669b27160dde33079f40551853702b.zip
dropbear: Change the path to find configuration file and add a configuration file for dropbear
dropbear will check "/etc/pam.d/sshd" which comes from package "openssh" \ When enabling pam supporting. But if we only install dropbear \ package without package "openssh", then "dropbear" will not \ find a configuration file. The changes are as follow for fixing this bug: - Change the path to find configuration file (/etc/pam.d/sshd --> /etc/pam.d/dropbear) - Add a configuration file "/etc/pam.d/dropbear" Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 5af9ebd4d..1582f2e70 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -19,7 +19,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
file://init \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
-PAM_SRC_URI = "file://dropbear-enable-pam.patch"
+PAM_SRC_URI = "file://dropbear-enable-pam.patch \
+ file://dropbear-configuration-file.patch \
+ file://dropbear"
inherit autotools update-rc.d
@@ -68,6 +70,14 @@ do_install() {
-e 's,/usr/bin,${bindir},g' \
-e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
chmod 755 ${D}${sysconfdir}/init.d/dropbear
+ for i in ${DISTRO_FEATURES};
+ do
+ if [ ${i} = "pam" ]; then
+ install -d ${D}${sysconfdir}/pam.d
+ install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/
+ fi
+ done
+
}
pkg_postinst_${PN} () {