[OE-core] [PATCH] dropbear: don't use IMAGE_FEATURES
Richard Purdie
richard.purdie at linuxfoundation.org
Mon Jan 7 11:36:13 UTC 2013
On Mon, 2013-01-07 at 12:15 +0100, Martin Jansa wrote:
> * IMAGE_FEATURES are image specific, but dropbear recipe isn't
> * if you have debug-tweaks in EXTRA_IMAGE_FEATURES or added to
> IMAGE_FEATURES in distro config, then it will set DISTRO_TYPE
> to debug as expected, but if you add debug-tweaks only in
> your-own-debug-image, then dropbear never sees debug-tweaks and
> your-own-debug-image won't allow empty password login.
> * best way would be to patch dropbear to enable empty password by
> runtime config or argument and enable it in ROOTFS_POSTPROCESS_COMMAND
> like openssh_allow_empty_password does, see
> http://permalink.gmane.org/gmane.network.ssh.dropbear/845
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
> meta/recipes-core/dropbear/dropbear.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
> index aa313df..2c170c6 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"
> HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
> SECTION = "console/network"
>
> -INC_PR = "r0"
> +INC_PR = "r1"
>
> # some files are from other projects and have others license terms:
> # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
> @@ -40,7 +40,7 @@ EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
> EXTRA_OECONF += "\
> ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
>
> -DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
> +DISTRO_TYPE ?= "debug"
>
> do_install() {
> install -d ${D}${sysconfdir} \
How about we ditch DISTRO_TYPE entirely and check for "debug-tweaks" in
DISTRO_FEATURES? This would bring it more into line with the other
places we do things like this.
FWIW I agree this should ideally be runtime configured and we should
really add an enhancement request to the bugzilla for that (or patches
welcome).
Cheers,
Richard
More information about the Openembedded-core
mailing list