Patchwork [v2] usbutils: Upgrade usbutils to upstream v006

login
register
mail settings
Submitter Radu Moisan
Date Aug. 2, 2012, 12:06 p.m.
Message ID <1343909173-2161-1-git-send-email-radu.moisan@intel.com>
Download mbox | patch
Permalink /patch/33667/
State New
Headers show

Comments

Radu Moisan - Aug. 2, 2012, 12:06 p.m.
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
 .../usbutils/{usbutils_0.91.bb => usbutils_006.bb} |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-bsp/usbutils/{usbutils_0.91.bb => usbutils_006.bb} (80%)
Koen Kooi - Aug. 2, 2012, 1:50 p.m.
Op 2 aug. 2012, om 14:06 heeft Radu Moisan <radu.moisan@intel.com> het volgende geschreven:

> Signed-off-by: Radu Moisan <radu.moisan@intel.com>
> ---
> .../usbutils/{usbutils_0.91.bb => usbutils_006.bb} |    7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
> rename meta/recipes-bsp/usbutils/{usbutils_0.91.bb => usbutils_006.bb} (80%)
> 
> diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bb b/meta/recipes-bsp/usbutils/usbutils_006.bb
> similarity index 80%
> rename from meta/recipes-bsp/usbutils/usbutils_0.91.bb
> rename to meta/recipes-bsp/usbutils/usbutils_006.bb
> index abe807c..c1c9fc0 100644
> --- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
> +++ b/meta/recipes-bsp/usbutils/usbutils_006.bb
> @@ -7,19 +7,18 @@ LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> 
> DEPENDS = "libusb zlib"
> -PR = "r5"
> +PR = "r0"

That's the default value, so you can drop this hunk

> 
> SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
>            file://usb-devices-avoid-dependency-on-bash.patch \
>            file://Fix-NULL-pointer-crash.patch"
> 
> -SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb"
> -SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46"
> +SRC_URI[md5sum] = "850790442f5eb487cdc7e35f8ee03e11"
> +SRC_URI[sha256sum] = "553270b4030f0844cb70aed57e61c7f10a7ed6641c3bed20249201cec9bcf122"
> 
> inherit autotools
> 
> do_install_append() {
> -	ln -s ../sbin/lsusb ${D}${bindir}/lsusb
> 	# We only need the compressed copy, remove the uncompressed version
> 	rm -f ${D}${datadir}/usb.ids
> }
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Ross Burton - Aug. 2, 2012, 1:55 p.m.
On 2 August 2012 14:50, Koen Kooi <koen@dominion.thruhere.net> wrote:
> That's the default value, so you can drop this hunk

Can we settle this once and for all?  Sure, it's the default, but it's
also going to be added back in again the moment there's a change...
I'm a fan of leaving a PR in there, even at r0, so its not constantly
being added and removed.

Ross
Koen Kooi - Aug. 2, 2012, 2:14 p.m.
Op 2 aug. 2012, om 15:55 heeft "Burton, Ross" <ross.burton@intel.com> het volgende geschreven:

> On 2 August 2012 14:50, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> That's the default value, so you can drop this hunk
> 
> Can we settle this once and for all?  Sure, it's the default, but it's
> also going to be added back in again the moment there's a change...
> I'm a fan of leaving a PR in there, even at r0, so its not constantly
> being added and removed.

The complete PR field is scheduled to get removed, so the more recipes without it being said to that stupid default value, the better.
Andrei Gherzan - Aug. 2, 2012, 3:24 p.m.
On Thu, Aug 2, 2012 at 5:14 PM, Koen Kooi <koen@dominion.thruhere.net>wrote:

>
> Op 2 aug. 2012, om 15:55 heeft "Burton, Ross" <ross.burton@intel.com> het
> volgende geschreven:
>
> > On 2 August 2012 14:50, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >> That's the default value, so you can drop this hunk
> >
> > Can we settle this once and for all?  Sure, it's the default, but it's
> > also going to be added back in again the moment there's a change...
> > I'm a fan of leaving a PR in there, even at r0, so its not constantly
> > being added and removed.
>
> The complete PR field is scheduled to get removed, so the more recipes
> without it being said to that stupid default value, the better.
>
>
Agreed.

ag
Andrei Gherzan - Aug. 2, 2012, 3:25 p.m.
On Thu, Aug 2, 2012 at 3:06 PM, Radu Moisan <radu.moisan@intel.com> wrote:

> Signed-off-by: Radu Moisan <radu.moisan@intel.com>
> ---
>  .../usbutils/{usbutils_0.91.bb => usbutils_006.bb} |    7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>  rename meta/recipes-bsp/usbutils/{usbutils_0.91.bb => usbutils_006.bb}
> (80%)
>
> diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bbb/meta/recipes-bsp/usbutils/
> usbutils_006.bb
> similarity index 80%
> rename from meta/recipes-bsp/usbutils/usbutils_0.91.bb
> rename to meta/recipes-bsp/usbutils/usbutils_006.bb
> index abe807c..c1c9fc0 100644
> --- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
> +++ b/meta/recipes-bsp/usbutils/usbutils_006.bb
> @@ -7,19 +7,18 @@ LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>
>  DEPENDS = "libusb zlib"
> -PR = "r5"
> +PR = "r0"
>
>  SRC_URI =
> "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
>             file://usb-devices-avoid-dependency-on-bash.patch \
>             file://Fix-NULL-pointer-crash.patch"
>
> -SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb"
> -SRC_URI[sha256sum] =
> "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46"
> +SRC_URI[md5sum] = "850790442f5eb487cdc7e35f8ee03e11"
> +SRC_URI[sha256sum] =
> "553270b4030f0844cb70aed57e61c7f10a7ed6641c3bed20249201cec9bcf122"
>
>  inherit autotools
>
>  do_install_append() {
> -       ln -s ../sbin/lsusb ${D}${bindir}/lsusb


This is not needed anymore?

ag
Paul Eggleton - Aug. 2, 2012, 3:28 p.m.
On Thursday 02 August 2012 16:14:07 Koen Kooi wrote:
> Op 2 aug. 2012, om 15:55 heeft "Burton, Ross" <ross.burton@intel.com> het 
volgende geschreven:
> > On 2 August 2012 14:50, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >> That's the default value, so you can drop this hunk
> > 
> > Can we settle this once and for all?  Sure, it's the default, but it's
> > also going to be added back in again the moment there's a change...
> > I'm a fan of leaving a PR in there, even at r0, so its not constantly
> > being added and removed.
> 
> The complete PR field is scheduled to get removed, so the more recipes
> without it being said to that stupid default value, the better.

Since such a removal will just be a blanket search and replace, what difference 
does it make?

Cheers,
Paul
Radu Moisan - Aug. 3, 2012, 5:33 a.m.
On 08/02/2012 06:25 PM, Andrei Gherzan wrote:
> On Thu, Aug 2, 2012 at 3:06 PM, Radu Moisan <radu.moisan@intel.com 
> <mailto:radu.moisan@intel.com>> wrote:
>
>     Signed-off-by: Radu Moisan <radu.moisan@intel.com
>     <mailto:radu.moisan@intel.com>>
>     ---
>      .../usbutils/{usbutils_0.91.bb <http://usbutils_0.91.bb> =>
>     usbutils_006.bb <http://usbutils_006.bb>} |    7 +++----
>      1 file changed, 3 insertions(+), 4 deletions(-)
>      rename meta/recipes-bsp/usbutils/{usbutils_0.91.bb
>     <http://usbutils_0.91.bb> => usbutils_006.bb
>     <http://usbutils_006.bb>} (80%)
>
>     diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
>     <http://usbutils_0.91.bb>
>     b/meta/recipes-bsp/usbutils/usbutils_006.bb <http://usbutils_006.bb>
>     similarity index 80%
>     rename from meta/recipes-bsp/usbutils/usbutils_0.91.bb
>     <http://usbutils_0.91.bb>
>     rename to meta/recipes-bsp/usbutils/usbutils_006.bb
>     <http://usbutils_006.bb>
>     index abe807c..c1c9fc0 100644
>     --- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
>     <http://usbutils_0.91.bb>
>     +++ b/meta/recipes-bsp/usbutils/usbutils_006.bb
>     <http://usbutils_006.bb>
>     @@ -7,19 +7,18 @@ LICENSE = "GPLv2+"
>      LIC_FILES_CHKSUM =
>     "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>
>      DEPENDS = "libusb zlib"
>     -PR = "r5"
>     +PR = "r0"
>
>      SRC_URI =
>     "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
>                 file://usb-devices-avoid-dependency-on-bash.patch \
>                 file://Fix-NULL-pointer-crash.patch"
>
>     -SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb"
>     -SRC_URI[sha256sum] =
>     "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46"
>     +SRC_URI[md5sum] = "850790442f5eb487cdc7e35f8ee03e11"
>     +SRC_URI[sha256sum] =
>     "553270b4030f0844cb70aed57e61c7f10a7ed6641c3bed20249201cec9bcf122"
>
>      inherit autotools
>
>      do_install_append() {
>     -       ln -s ../sbin/lsusb ${D}${bindir}/lsusb
>
>
> This is not needed anymore?
>
No, it's already in place.

radu
Koen Kooi - Aug. 3, 2012, 10:22 a.m.
Op 2 aug. 2012, om 17:28 heeft Paul Eggleton <paul.eggleton@linux.intel.com> het volgende geschreven:

> On Thursday 02 August 2012 16:14:07 Koen Kooi wrote:
>> Op 2 aug. 2012, om 15:55 heeft "Burton, Ross" <ross.burton@intel.com> het 
> volgende geschreven:
>>> On 2 August 2012 14:50, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>> That's the default value, so you can drop this hunk
>>> 
>>> Can we settle this once and for all?  Sure, it's the default, but it's
>>> also going to be added back in again the moment there's a change...
>>> I'm a fan of leaving a PR in there, even at r0, so its not constantly
>>> being added and removed.
>> 
>> The complete PR field is scheduled to get removed, so the more recipes
>> without it being said to that stupid default value, the better.
> 
> Since such a removal will just be a blanket search and replace, what difference 
> does it make?

It allows a more gradual change, which is good for upgrade paths. Insisting on adding default values will just artificially bloat the removal patch.

Patch

diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bb b/meta/recipes-bsp/usbutils/usbutils_006.bb
similarity index 80%
rename from meta/recipes-bsp/usbutils/usbutils_0.91.bb
rename to meta/recipes-bsp/usbutils/usbutils_006.bb
index abe807c..c1c9fc0 100644
--- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_006.bb
@@ -7,19 +7,18 @@  LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "libusb zlib"
-PR = "r5"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
            file://usb-devices-avoid-dependency-on-bash.patch \
            file://Fix-NULL-pointer-crash.patch"
 
-SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb"
-SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46"
+SRC_URI[md5sum] = "850790442f5eb487cdc7e35f8ee03e11"
+SRC_URI[sha256sum] = "553270b4030f0844cb70aed57e61c7f10a7ed6641c3bed20249201cec9bcf122"
 
 inherit autotools
 
 do_install_append() {
-	ln -s ../sbin/lsusb ${D}${bindir}/lsusb
 	# We only need the compressed copy, remove the uncompressed version
 	rm -f ${D}${datadir}/usb.ids
 }