Patchwork [meta-networking] cifs-utils: add 5.9

login
register
mail settings
Submitter Koen Kooi
Date March 18, 2013, 7:40 a.m.
Message ID <1363592406-27335-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/46365/
State Accepted, archived
Headers show

Comments

Koen Kooi - March 18, 2013, 7:40 a.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-networking/recipes-support/cifs/cifs-utils_git.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-networking/recipes-support/cifs/cifs-utils_git.bb
Joe MacDonald - March 18, 2013, 6:33 p.m.
Hey Koen,

[[oe] [meta-networking][PATCH] cifs-utils: add 5.9] On 13.03.18 (Mon 08:40) Koen Kooi wrote:

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta-networking/recipes-support/cifs/cifs-utils_git.bb | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>  create mode 100644 meta-networking/recipes-support/cifs/cifs-utils_git.bb
> 
> diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
> new file mode 100644
> index 0000000..c78527e
> --- /dev/null
> +++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
> @@ -0,0 +1,15 @@
> +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem."
> +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils"
> +
> +LICENSE = "GPLv3 && LGPLv3"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> +
> +PV = "5.9"
> +
> +SRCREV = "353d491dcb5d69d31434abeb962c8e9a49c36867"
> +SRC_URI = "git://git.samba.org/cifs-utils.git"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit autotools
> +

I had to make two changes to this recipe to address the following QA:

WARNING: cifs-utils-5.9-r0: Failed to parse it's LICENSE field.
WARNING: QA Issue: cifs-utils: Files/directories were installed but not shipped
  /usr/bin
  /usr/sbin

First one's easy, I changed:

+LICENSE = "GPLv3 && LGPLv3"

to

+LICENSE = "GPLv3 & LGPLv3"

The second one I wasn't completely sure I was capturing what you
intended to do with this, but I added this to the bottom of your recipe:

+do_install_append() {
+	# Remove empty /usr/*bin directory since the mount helper is installed to /sbin
+	rmdir ${D}${bindir} ${D}${sbindir}
+}

This actually kind of seems like the wrong thing to do, but it also
looks like cifs-utils don't care what sbindir and bindir point at.

If you're okay with this, I'll merge the modified patch I have in tree
now, or you can send an updated patch, whichever you prefer.
Koen Kooi - March 18, 2013, 6:36 p.m.
Op 18 mrt. 2013 om 19:33 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven:

> Hey Koen,
> 
> [[oe] [meta-networking][PATCH] cifs-utils: add 5.9] On 13.03.18 (Mon 08:40) Koen Kooi wrote:
> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta-networking/recipes-support/cifs/cifs-utils_git.bb | 15 +++++++++++++++
>> 1 file changed, 15 insertions(+)
>> create mode 100644 meta-networking/recipes-support/cifs/cifs-utils_git.bb
>> 
>> diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
>> new file mode 100644
>> index 0000000..c78527e
>> --- /dev/null
>> +++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
>> @@ -0,0 +1,15 @@
>> +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem."
>> +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils"
>> +
>> +LICENSE = "GPLv3 && LGPLv3"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>> +
>> +PV = "5.9"
>> +
>> +SRCREV = "353d491dcb5d69d31434abeb962c8e9a49c36867"
>> +SRC_URI = "git://git.samba.org/cifs-utils.git"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +inherit autotools
>> +
> 
> I had to make two changes to this recipe to address the following QA:
> 
> WARNING: cifs-utils-5.9-r0: Failed to parse it's LICENSE field.
> WARNING: QA Issue: cifs-utils: Files/directories were installed but not shipped
>  /usr/bin
>  /usr/sbin
> 
> First one's easy, I changed:
> 
> +LICENSE = "GPLv3 && LGPLv3"
> 
> to
> 
> +LICENSE = "GPLv3 & LGPLv3"
> 
> The second one I wasn't completely sure I was capturing what you
> intended to do with this, but I added this to the bottom of your recipe:
> 
> +do_install_append() {
> +    # Remove empty /usr/*bin directory since the mount helper is installed to /sbin
> +    rmdir ${D}${bindir} ${D}${sbindir}
> +}
> 
> This actually kind of seems like the wrong thing to do, but it also
> looks like cifs-utils don't care what sbindir and bindir point at.
> 
> If you're okay with this, I'll merge the modified patch I have in tree
> now, or you can send an updated patch, whichever you prefer.

Yes, thanks for fixing that!


> 
> -- 
> -Joe MacDonald.
> :wq
Joe MacDonald - March 18, 2013, 7:18 p.m.
[Re: [oe] [meta-networking][PATCH] cifs-utils: add 5.9] On 13.03.18 (Mon 19:36) Koen Kooi wrote:

> 
> 
> Op 18 mrt. 2013 om 19:33 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven:
> 
> > Hey Koen,
> > 
> > [[oe] [meta-networking][PATCH] cifs-utils: add 5.9] On 13.03.18 (Mon 08:40) Koen Kooi wrote:
> > 
> >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> >> ---
> >> meta-networking/recipes-support/cifs/cifs-utils_git.bb | 15 +++++++++++++++
> >> 1 file changed, 15 insertions(+)
> >> create mode 100644 meta-networking/recipes-support/cifs/cifs-utils_git.bb
> >> 
> >> diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
> >> new file mode 100644
> >> index 0000000..c78527e
> >> --- /dev/null
> >> +++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
> >> @@ -0,0 +1,15 @@
> >> +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem."
> >> +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils"
> >> +
> >> +LICENSE = "GPLv3 && LGPLv3"
> >> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> >> +
> >> +PV = "5.9"
> >> +
> >> +SRCREV = "353d491dcb5d69d31434abeb962c8e9a49c36867"
> >> +SRC_URI = "git://git.samba.org/cifs-utils.git"
> >> +
> >> +S = "${WORKDIR}/git"
> >> +
> >> +inherit autotools
> >> +
> > 
> > I had to make two changes to this recipe to address the following QA:
> > 
> > WARNING: cifs-utils-5.9-r0: Failed to parse it's LICENSE field.
> > WARNING: QA Issue: cifs-utils: Files/directories were installed but not shipped
> >  /usr/bin
> >  /usr/sbin
> > 
> > First one's easy, I changed:
> > 
> > +LICENSE = "GPLv3 && LGPLv3"
> > 
> > to
> > 
> > +LICENSE = "GPLv3 & LGPLv3"
> > 
> > The second one I wasn't completely sure I was capturing what you
> > intended to do with this, but I added this to the bottom of your recipe:
> > 
> > +do_install_append() {
> > +    # Remove empty /usr/*bin directory since the mount helper is installed to /sbin
> > +    rmdir ${D}${bindir} ${D}${sbindir}
> > +}
> > 
> > This actually kind of seems like the wrong thing to do, but it also
> > looks like cifs-utils don't care what sbindir and bindir point at.
> > 
> > If you're okay with this, I'll merge the modified patch I have in tree
> > now, or you can send an updated patch, whichever you prefer.
> 
> Yes, thanks for fixing that!

No problem.  So, merged.  Thanks.

Patch

diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
new file mode 100644
index 0000000..c78527e
--- /dev/null
+++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
@@ -0,0 +1,15 @@ 
+DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem."
+HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils"
+
+LICENSE = "GPLv3 && LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+PV = "5.9"
+
+SRCREV = "353d491dcb5d69d31434abeb962c8e9a49c36867"
+SRC_URI = "git://git.samba.org/cifs-utils.git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+