[RESEND PATCH v3] util-linux: create util-linux-runuser package

[RESEND PATCH v3] util-linux: create util-linux-runuser package

[Ioan-Adrian Ratiu]

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.ratiu@ni.com>
---
 meta/recipes-core/util-linux/util-linux.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 318c74b..0493935 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/libmount/__init__.*"
@@ -106,7 +108,11 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
 # reset calls 'tput'
 RDEPENDS_util-linux-reset += "ncurses"
 
+RDEPENDS_util-linux-runuser += "libpam"
+
 RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin"
+RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
+
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
 
 RRECOMMENDS_${PN}_class-native = ""
-- 
2.1.4

Re: [RESEND PATCH v3] util-linux: create util-linux-runuser package

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 644 bytes --]

On 15 December 2015 at 09:49, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> 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.
>

What's the rationale for pulling this out into a separate package?


>  PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
> 'util-linux-pylibmount', '', d)}"
> +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam',
> 'util-linux-runuser', '', d)}"
>

No need for conditionals: empty packages are not created.

Ross

[-- Attachment #2: Type: text/html, Size: 1203 bytes --]

Re: [RESEND PATCH v3] util-linux: create util-linux-runuser package

[Ioan-Adrian Ratiu]

On Tue, 22 Dec 2015 17:34:12 +0000
"Burton, Ross" <ross.burton@intel.com> wrote:

> On 15 December 2015 at 09:49, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> 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.
> >
> 
> What's the rationale for pulling this out into a separate package?

I need runuser on a busybox image and can't install the entire util-linux package.

> 
> 
> >  PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
> > 'util-linux-pylibmount', '', d)}"
> > +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam',
> > 'util-linux-runuser', '', d)}"
> >
> 
> No need for conditionals: empty packages are not created.

Thank you for this tip, I've modified and sent v4.

> 
> Ross

[PATCH v4] util-linux: create util-linux-runuser package

[Ioan-Adrian Ratiu]

Split runuser into its own package (previously provided by util-linux).
runuser is compiled only when DISTRO_FEATURES includes pam and also the
package is created only when runuser exists.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
---
 meta/recipes-core/util-linux/util-linux.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index cf321c6..551ffbb 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
              util-linux-swaponoff util-linux-losetup util-linux-umount \
              util-linux-mount util-linux-readprofile util-linux-uuidd \
              util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
-             util-linux-mkfs util-linux-mcookie util-linux-reset \
+             util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-runuser \
              util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
              util-linux-partx ${PN}-bash-completion util-linux-hwclock \
              util-linux-findfs util-linux-getopt util-linux-sulogin"
@@ -84,6 +84,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/libmount/__init__.*"
@@ -105,7 +106,11 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
 # reset calls 'tput'
 RDEPENDS_util-linux-reset += "ncurses"
 
+RDEPENDS_util-linux-runuser += "libpam"
+
 RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin"
+RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
+
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
 
 RRECOMMENDS_${PN}_class-native = ""
-- 
2.1.4

Re: [PATCH v4] util-linux: create util-linux-runuser package

[Ioan-Adrian Ratiu]

On Wed, 23 Dec 2015 12:21:06 +0200
Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:

> Split runuser into its own package (previously provided by util-linux).
> runuser is compiled only when DISTRO_FEATURES includes pam and also the
> package is created only when runuser exists.
> 
> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
> ---
>  meta/recipes-core/util-linux/util-linux.inc | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index cf321c6..551ffbb 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -29,7 +29,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
>               util-linux-swaponoff util-linux-losetup util-linux-umount \
>               util-linux-mount util-linux-readprofile util-linux-uuidd \
>               util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
> -             util-linux-mkfs util-linux-mcookie util-linux-reset \
> +             util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-runuser \
>               util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
>               util-linux-partx ${PN}-bash-completion util-linux-hwclock \
>               util-linux-findfs util-linux-getopt util-linux-sulogin"
> @@ -84,6 +84,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/libmount/__init__.*"
> @@ -105,7 +106,11 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
>  # reset calls 'tput'
>  RDEPENDS_util-linux-reset += "ncurses"
>  
> +RDEPENDS_util-linux-runuser += "libpam"
> +
>  RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin"
> +RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
> +
>  RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
>  
>  RRECOMMENDS_${PN}_class-native = ""

ping?

Re: [RESEND PATCH v3] util-linux: create util-linux-runuser package

[Paul Eggleton]

On Wed, 23 Dec 2015 12:03:03 Ioan-Adrian Ratiu wrote:
> On Tue, 22 Dec 2015 17:34:12 +0000
> 
> "Burton, Ross" <ross.burton@intel.com> wrote:
> > On 15 December 2015 at 09:49, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> 
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.
> > 
> > What's the rationale for pulling this out into a separate package?
> 
> I need runuser on a busybox image and can't install the entire util-linux
> package.
> > >  PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
> > > 
> > > 'util-linux-pylibmount', '', d)}"
> > > +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam',
> > > 'util-linux-runuser', '', d)}"
> > 
> > No need for conditionals: empty packages are not created.
> 
> Thank you for this tip, I've modified and sent v4.

Unfortunately this wasn't right - the package being excluded from PACKAGES was 
serving to avoid the libpam dependency when pam was not in DISTRO_FEATURES; as 
of this patch we are now building it unconditionally leading to a warning.

Ioan-Adrian, could you please send a patch that changes it back to how you had 
it in v3?

Thanks,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [RESEND PATCH v3] util-linux: create util-linux-runuser package

[Ioan-Adrian Ratiu]

On Tue, 12 Jan 2016 15:52:50 +1300
Paul Eggleton <paul.eggleton@linux.intel.com> wrote:

> On Wed, 23 Dec 2015 12:03:03 Ioan-Adrian Ratiu wrote:
> > On Tue, 22 Dec 2015 17:34:12 +0000
> > 
> > "Burton, Ross" <ross.burton@intel.com> wrote:  
> > > On 15 December 2015 at 09:49, Ioan-Adrian Ratiu <adrian.ratiu@ni.com>   
> 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.  
> > > 
> > > What's the rationale for pulling this out into a separate package?  
> > 
> > I need runuser on a busybox image and can't install the entire util-linux
> > package.  
> > > >  PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
> > > > 
> > > > 'util-linux-pylibmount', '', d)}"
> > > > +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam',
> > > > 'util-linux-runuser', '', d)}"  
> > > 
> > > No need for conditionals: empty packages are not created.  
> > 
> > Thank you for this tip, I've modified and sent v4.  
> 
> Unfortunately this wasn't right - the package being excluded from PACKAGES was 
> serving to avoid the libpam dependency when pam was not in DISTRO_FEATURES; as 
> of this patch we are now building it unconditionally leading to a warning.
> 
> Ioan-Adrian, could you please send a patch that changes it back to how you had 
> it in v3?

Yes, I'll send v5 which will revert the change from v4.

> 
> Thanks,
> Paul
> 

Re: [RESEND PATCH v3] util-linux: create util-linux-runuser package

[Ioan-Adrian Ratiu]

On Tue, 12 Jan 2016 10:26:02 +0200
Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:

> On Tue, 12 Jan 2016 15:52:50 +1300
> Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> 
> > On Wed, 23 Dec 2015 12:03:03 Ioan-Adrian Ratiu wrote:  
> > > On Tue, 22 Dec 2015 17:34:12 +0000
> > > 
> > > "Burton, Ross" <ross.burton@intel.com> wrote:    
> > > > On 15 December 2015 at 09:49, Ioan-Adrian Ratiu <adrian.ratiu@ni.com>     
> > 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.    
> > > > 
> > > > What's the rationale for pulling this out into a separate package?    
> > > 
> > > I need runuser on a busybox image and can't install the entire util-linux
> > > package.    
> > > > >  PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
> > > > > 
> > > > > 'util-linux-pylibmount', '', d)}"
> > > > > +PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam',
> > > > > 'util-linux-runuser', '', d)}"    
> > > > 
> > > > No need for conditionals: empty packages are not created.    
> > > 
> > > Thank you for this tip, I've modified and sent v4.    
> > 
> > Unfortunately this wasn't right - the package being excluded from PACKAGES was 
> > serving to avoid the libpam dependency when pam was not in DISTRO_FEATURES; as 
> > of this patch we are now building it unconditionally leading to a warning.
> > 
> > Ioan-Adrian, could you please send a patch that changes it back to how you had 
> > it in v3?  
> 
> Yes, I'll send v5 which will revert the change from v4.
> 

Uh oh, I just rebased on origin/master and it looks like v4 was commited there a few hours ago.

So I'll just send a new patch to introduce the pam conditional on top of the already integrated change.

> > 
> > Thanks,
> > Paul
> >   
>