Patchwork Simplify "SRC_URI_append +=" to "SRC_URI_append ="

login
register
mail settings
Submitter Robert P. J. Day
Date June 19, 2012, 8:54 p.m.
Message ID <alpine.DEB.2.02.1206191652560.3440@oneiric>
Download mbox | patch
Permalink /patch/30235/
State New
Headers show

Comments

Robert P. J. Day - June 19, 2012, 8:54 p.m.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---
Khem Raj - June 20, 2012, 12:37 a.m.
Thanks for doing this

On Tue, Jun 19, 2012 at 1:54 PM, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>
> +SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "

while you are at it can you remove apply=yes from there ?
since thats the default anyway for files ending in .patch
Robert P. J. Day - June 20, 2012, 1:09 a.m.
On Tue, 19 Jun 2012, Khem Raj wrote:

> Thanks for doing this
>
> On Tue, Jun 19, 2012 at 1:54 PM, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
> >
> > +SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "
>
> while you are at it can you remove apply=yes from there ?
> since thats the default anyway for files ending in .patch

  i can do that as a separate patch since they're logically two
different cleanups, and there's enough of the latter to justify
another patch.

$ grep -r "patch;apply=yes" *
meta/recipes-connectivity/portmap/portmap.inc:	file://make.patch;apply=yes"
meta/recipes-support/icu/icu-3.6.inc:           file://gccfix.patch;apply=yes \
meta/recipes-support/icu/icu-3.6.inc:           file://use-g++-for-linking.patch;apply=yes"
meta/recipes-support/icu/icu-3.6.inc:           file://noldlibpath.patch;apply=yes"
meta/recipes-support/libcroco/libcroco_0.6.3.bb:SRC_URI_append = " file://croco.patch;apply=yes \
meta/recipes-core/eggdbus/eggdbus_0.6.bb:          file://gtk-doc.patch;apply=yes \
meta/recipes-core/eggdbus/eggdbus_0.6.bb:           file://marshal.patch;apply=yes \
meta/recipes-graphics/xorg-proto/calibrateproto_git.bb:           file://fix.patch;apply=yes"
meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb:        file://link-x11.patch;apply=yes \
meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb:SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
meta/recipes-sato/pimlico/contacts.inc:SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
meta/recipes-sato/pimlico/dates.inc:SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
meta/recipes-sato/settings-daemon/settings-daemon_git.bb:           file://addsoundkeys.patch;apply=yes \
$


rday
Khem Raj - June 20, 2012, 1:34 a.m.
On Tuesday, June 19, 2012, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
> On Tue, 19 Jun 2012, Khem Raj wrote:
>
>> Thanks for doing this
>>
>> On Tue, Jun 19, 2012 at 1:54 PM, Robert P. J. Day <rpjday@crashcourse.ca>
wrote:
>> >
>> > +SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "
>>
>> while you are at it can you remove apply=yes from there ?
>> since thats the default anyway for files ending in .patch
>
>  i can do that as a separate patch since they're logically two
> different cleanups, and there's enough of the latter to justify
> another patch.
>

Fine by me



> $ grep -r "patch;apply=yes" *
> meta/recipes-connectivity/portmap/portmap.inc:
 file://make.patch;apply=yes"
> meta/recipes-support/icu/icu-3.6.inc:
file://gccfix.patch;apply=yes \
> meta/recipes-support/icu/icu-3.6.inc:
file://use-g++-for-linking.patch;apply=yes"
> meta/recipes-support/icu/icu-3.6.inc:
file://noldlibpath.patch;apply=yes"
> meta/recipes-support/libcroco/libcroco_0.6.3.bb:SRC_URI_append = "
file://croco.patch;apply=yes \
> meta/recipes-core/eggdbus/eggdbus_0.6.bb:
 file://gtk-doc.patch;apply=yes \
> meta/recipes-core/eggdbus/eggdbus_0.6.bb:
file://marshal.patch;apply=yes \
> meta/recipes-graphics/xorg-proto/calibrateproto_git.bb:
file://fix.patch;apply=yes"
> meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb:
     file://link-x11.patch;apply=yes \
> meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb:SRC_URI_append_poky += "
file://owl-menu.patch;apply=yes "
> meta/recipes-sato/pimlico/contacts.inc:SRC_URI_append_poky = "
file://contacts-owl-window-menu.patch;apply=yes "
> meta/recipes-sato/pimlico/dates.inc:SRC_URI_append_poky = "
file://dates-owl-window-menu.patch;apply=yes "
> meta/recipes-sato/settings-daemon/settings-daemon_git.bb:
file://addsoundkeys.patch;apply=yes \
> $
>
>
> rday
>
> --
>
> ========================================================================
> Robert P. J. Day                                 Ottawa, Ontario, CANADA
>                        http://crashcourse.ca
>
> Twitter:                                       http://twitter.com/rpjday
> LinkedIn:                               http://ca.linkedin.com/in/rpjday
> ========================================================================
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Richard Purdie - June 20, 2012, 7:17 a.m.
On Tue, 2012-06-19 at 16:54 -0400, Robert P. J. Day wrote:

> diff --git a/meta/recipes-support/gmp/gmp_5.0.4.bb b/meta/recipes-support/gmp/gmp_5.0.4.bb
> index cb2ca5b..0f72742 100644
> --- a/meta/recipes-support/gmp/gmp_5.0.4.bb
> +++ b/meta/recipes-support/gmp/gmp_5.0.4.bb
> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
>  		    file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
>  PR = "r1"
> 
> -SRC_URI_append += "file://use-includedir.patch \
> +SRC_URI_append = "file://use-includedir.patch \
>                     file://gmp_fix_for_x32.patch \
>                     file://gmp_fix_for_automake-1.12.patch \
>                     "

This last one will need a space before the first file:// to be correct.

Cheers,

Richard

Patch

diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
index 54ff3d4..2c4b325 100644
--- a/meta/recipes-graphics/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
@@ -21,8 +21,8 @@  SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \

 SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e"
 SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8"
-SRC_URI_append_qemumips += " file://32bitBE-support.patch"
-SRC_URI_append_qemuppc += " file://32bitBE-support.patch"
+SRC_URI_append_qemumips = " file://32bitBE-support.patch"
+SRC_URI_append_qemuppc = " file://32bitBE-support.patch"


 inherit autotools pkgconfig
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 3d1bc43..273cc72 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
@@ -15,7 +15,7 @@  SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
 SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
 PR = "r2"

-SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
+SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "

 inherit autotools pkgconfig

diff --git a/meta/recipes-support/gmp/gmp_5.0.4.bb b/meta/recipes-support/gmp/gmp_5.0.4.bb
index cb2ca5b..0f72742 100644
--- a/meta/recipes-support/gmp/gmp_5.0.4.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.4.bb
@@ -4,7 +4,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 		    file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
 PR = "r1"

-SRC_URI_append += "file://use-includedir.patch \
+SRC_URI_append = "file://use-includedir.patch \
                    file://gmp_fix_for_x32.patch \
                    file://gmp_fix_for_automake-1.12.patch \
                    "