dropbear: Change the path to find configuration file and add a configuration file...

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>

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 5af9ebd4d02459f364590fe1e6d720fcae092721..1582f2e703cbdec48609ed5f277789f8049f1dc8 100644 (file)
--- 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} () {