Re: [PATCH 1/1] dropbear: Change the path to find configuration file and add a configuration file for dropbear

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Mon, 2011-08-29 at 18:48 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> 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>
> ---
>  meta/recipes-core/dropbear/dropbear.inc            |    6 +++++-
>  meta/recipes-core/dropbear/dropbear/dropbear       |    4 ++++
>  .../dropbear/dropbear-configuration-file.patch     |   18 ++++++++++++++++++
>  3 files changed, 27 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear
>  create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch
> 
> diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
> index 5af9ebd..577b288 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
>  
> @@ -51,6 +53,7 @@ do_install() {
>  		   ${D}${sysconfdir}/init.d \
>  		   ${D}${sysconfdir}/default \
>  		   ${D}${sysconfdir}/dropbear \
> +		   ${D}${sysconfdir}/pam.d \
>                     ${D}${bindir} \
>  		   ${D}${sbindir} \
>  		   ${D}${localstatedir}
> @@ -68,6 +71,7 @@ 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
> +	install -m 0644 ${WORKDIR}/dropbear  ${D}${sysconfdir}/pam.d/

I suspect this won't build in the DISTRO_FEATURES not containing pam
case due to the above file not existing. Please put a check in there to
see if it exists.

Cheers,

Richard