On Tuesday 10 November 2015 15:48:59 Mike Looijmans wrote:
> On 10-11-15 09:50, Ioan-Adrian Ratiu wrote:
> > Split runuser into its own package (previously provided by util-linux).
> > Since runuser is compiled only when DISTRO_FEATURES includes pam,
> > the creation of util-linux-runuser is also constrained by this.
> >
> > Signed-off-by: Ioan-Adrian Ratiu <adrian.ra...@ni.com>
> > ---
> >
> > meta/recipes-core/util-linux/util-linux.inc | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/util-linux/util-linux.inc
> > b/meta/recipes-core/util-linux/util-linux.inc index 594108f..dc460e7
> > 100644
> > --- a/meta/recipes-core/util-linux/util-linux.inc
> > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > @@ -34,6 +34,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk
> > util-linux-cfdisk util-linux-sfd>
> > util-linux-partx ${PN}-bash-completion util-linux-hwclock \
> > util-linux-findfs util-linux-getopt util-linux-sulogin"
> >
> > PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
> > 'util-linux-pylibmount', '', d)}">
> > +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam',
> > 'util-linux-runuser', '', d)}">
> > PACKAGES_DYNAMIC = "^util-linux-lib.*"
> >
> > @@ -85,6 +86,7 @@ FILES_util-linux-partx = "${sbindir}/partx"
> >
> > FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
> > FILES_util-linux-findfs = "${sbindir}/findfs"
> > FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
> >
> > +FILES_util-linux-runuser = "${sbindir}/runuser"
> >
> > FILES_util-linux-pylibmount =
> > "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \>
> > ${libdir}/${PYTHON_DIR}/dist-packages/lib
> > mount/__init__.*"
> >
> > @@ -106,7 +108,9 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
> >
> > # reset calls 'tput'
> > RDEPENDS_util-linux-reset += "ncurses"
> >
> > -RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff
> > util-linux-losetup util-linux-sulogin" +RDEPENDS_util-linux-runuser +=
> > "libpam"
> > +
> > +RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff
> > util-linux-losetup util-linux-sulogin util-linux-runuser"
>
> I think that will need to be conditional. Without pam, you won't be able to
> install util-linux because of the missing util-linux-runuser dependency.
Not to mention you'll get a build time warning because pam is being built
without the feature enabled.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
