On Thu, Jul 21, 2011 at 7:41 PM, Kang Kai <kai.k...@windriver.com> wrote: > On 2011年07月22日 03:10, Khem Raj wrote: >> >> On Thu, Jul 21, 2011 at 1:54 AM, Koen Kooi<k...@dominion.thruhere.net> >> wrote: >>> >>> Op 21 jul. 2011, om 10:00 heeft Kang Kai het volgende geschreven: >>> >>>> From: Xiaofeng Yan<xiaofeng....@windriver.com> >>>> >>>> I make a patch and some changes in dropbear.inc for supporting pam. >>>> - Enable pam in configure >>>> - Modify file option.h to open pam supporting >>>> >>>> Signed-off-by: Xiaofeng Yan<xiaofeng....@windriver.com> >>>> --- >>>> meta/recipes-core/dropbear/dropbear.inc | 6 ++++- >>>> .../dropbear/dropbear/dropbear-enable-pam.patch | 21 >>>> ++++++++++++++++++++ >>>> 2 files changed, 26 insertions(+), 1 deletions(-) >>>> create mode 100644 >>>> meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch >>>> >>>> diff --git a/meta/recipes-core/dropbear/dropbear.inc >>>> b/meta/recipes-core/dropbear/dropbear.inc >>>> index 1b51e1a..48cefb6 100644 >>>> --- a/meta/recipes-core/dropbear/dropbear.inc >>>> +++ b/meta/recipes-core/dropbear/dropbear.inc >>>> @@ -9,13 +9,15 @@ LIC_FILES_CHKSUM = >>>> "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c" >>>> >>>> DEPENDS = "zlib" >>>> RPROVIDES = "ssh sshd" >>>> +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', >>>> d)}" >>>> >>>> SRC_URI = >>>> "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ >>>> file://urandom-xauth-changes-to-options.h.patch \ >>>> file://configure.patch \ >>>> file://fix-2kb-keys.patch \ >>>> file://allow-nopw.patch;apply=no \ >>>> - file://init" >>>> + file://init \ >>>> + file://dropbear-enable-pam.patch " >>>> >>>> inherit autotools update-rc.d >>>> >>>> @@ -28,6 +30,8 @@ LD = "${CC}" >>>> SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" >>>> BINCOMMANDS = "dbclient ssh scp" >>>> 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)}" >>> >>> That one is missing a PR bump >> >> And does this mean that it also needs libpam in DEPENDS ? > > Yes, I think so. So add the > > +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
and to all recipes which are modified > > >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >>> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core