Re: [PATCH 12/18] pkgconfig: Move patches in prep for 0.28 update

Re: [PATCH 12/18] pkgconfig: Move patches in prep for 0.28 update

[Randy MacLeod]

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

On 13-04-24 05:37 PM, Saul Wold wrote:> Signed-off-by: Saul Wold <
sgw@linux.intel.com>
> ---
>   meta/recipes-devtools/pkgconfig/pkgconfig.inc     | 8 +-------
>   meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 7 +++++++
>   2 files changed, 8 insertions(+), 7 deletions(-)

Saul,

Any news on pkgconfig-0.28 ? I'm trying to compile c-i-m
using clang for the -native tools and glib-1.2.10 shipped with
pkgconfig-0.25 is causing the build error below.
pkgconfig-0.28 and later includes version of glib-2.32.4

If you are about to push this uprev, I'll wait a while and try
again. Do you want help?


BTW, I just set
  /usr/bin/gcc -> clang manually and used update-alternatives
to set:
  /usr/bin/c++ -> /etc/alternative/c++ ~=>
                  Ubuntu clang version 3.2-1~exp9ubuntu1
                  (tags/RELEASE_32/final) (based on LLVM 3.2)

my host is Ubuntu-13.04. I guess I should figure out

Is there a better way to make oe-core use clang for native tools?
I did glance at:
http://www.openembedded.org/wiki/Adding_a_secondary_toolchain

// Randy



 testglib.o:testglib.c:(.text+0x0): first defined here
| ./.libs/libglib.a(gutils.o): In function `g_bit_nth_msf':
| gutils.c:(.text+0x30): multiple definition of `g_bit_nth_msf'
| testglib.o:testglib.c:(.text+0x30): first defined here
| ./.libs/libglib.a(gutils.o): In function `g_bit_storage':
| gutils.c:(.text+0x60): multiple definition of `g_bit_storage'
| testglib.o:testglib.c:(.text+0x60): first defined here
| clang: error: linker command failed with exit code 1 (use -v to see
invocation)
| make[4]: *** [testglib] Error 1
| make[4]: Leaving directory
`/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25/glib-1.2.10'
| make[3]: *** [all-recursive] Error 1
| make[3]: Leaving directory
`/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25/glib-1.2.10'
| make[2]: *** [all] Error 2
| make[2]: Leaving directory
`/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25/glib-1.2.10'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory
`/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25'
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| ERROR: Function failed: do_compile (see
/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/temp/log.do_compile.32446
for further information)
ERROR: Task 27
(virtual:native:/home/rmacleod/src/distro/yocto/oe-core.git/meta/recipes-devtools/pkgconfig/
pkgconfig_0.25.bb, do_compile) failed with exit code '1'
NOTE: Tasks Summary: Attempted 47 tasks of which 46 didn't need to be rerun
and 1 failed.
No currently running tasks (47 of 63)


-- 
../Randy/..

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

Re: [PATCH 12/18] pkgconfig: Move patches in prep for 0.28 update

[Saul Wold]

On 05/06/2013 01:59 PM, Randy MacLeod wrote:
> On 13-04-24 05:37 PM, Saul Wold wrote:> Signed-off-by: Saul Wold
> <sgw@linux.intel.com <mailto:sgw@linux.intel.com>>
>  > ---
>  >   meta/recipes-devtools/pkgconfig/pkgconfig.inc     | 8 +-------
>  >   meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
> <http://pkgconfig_0.25.bb> | 7 +++++++
>  >   2 files changed, 8 insertions(+), 7 deletions(-)
>
> Saul,
>
> Any news on pkgconfig-0.28 ? I'm trying to compile c-i-m
> using clang for the -native tools and glib-1.2.10 shipped with
> pkgconfig-0.25 is causing the build error below.
> pkgconfig-0.28 and later includes version of glib-2.32.4
>
Got caught up in 1.4 finalization and planning for 1.5, I was going to 
look at it again this week.

> If you are about to push this uprev, I'll wait a while and try
> again. Do you want help?
>
I would appreciate help with the update if you can provide a tested 
pkgconfig update, I was thinking about providing the update for testing 
before enabling it similar to what we do with gcc, that's why I split 
the recipe.

I have an untested version (it builds) in my poky-contrib/sgw/wip branch 
with you want to finish/test it more.

Thanks for your help.

Sau!

>
> BTW, I just set
>    /usr/bin/gcc -> clang manually and used update-alternatives
> to set:
>    /usr/bin/c++ -> /etc/alternative/c++ ~=>
>                    Ubuntu clang version 3.2-1~exp9ubuntu1
>                    (tags/RELEASE_32/final) (based on LLVM 3.2)
>
> my host is Ubuntu-13.04. I guess I should figure out
>
> Is there a better way to make oe-core use clang for native tools?
> I did glance at:
> http://www.openembedded.org/wiki/Adding_a_secondary_toolchain
>
> // Randy
>
>
>
>   testglib.o:testglib.c:(.text+0x0): first defined here
> | ./.libs/libglib.a(gutils.o): In function `g_bit_nth_msf':
> | gutils.c:(.text+0x30): multiple definition of `g_bit_nth_msf'
> | testglib.o:testglib.c:(.text+0x30): first defined here
> | ./.libs/libglib.a(gutils.o): In function `g_bit_storage':
> | gutils.c:(.text+0x60): multiple definition of `g_bit_storage'
> | testglib.o:testglib.c:(.text+0x60): first defined here
> | clang: error: linker command failed with exit code 1 (use -v to see
> invocation)
> | make[4]: *** [testglib] Error 1
> | make[4]: Leaving directory
> `/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25/glib-1.2.10'
> | make[3]: *** [all-recursive] Error 1
> | make[3]: Leaving directory
> `/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25/glib-1.2.10'
> | make[2]: *** [all] Error 2
> | make[2]: Leaving directory
> `/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25/glib-1.2.10'
> | make[1]: *** [all-recursive] Error 1
> | make[1]: Leaving directory
> `/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/pkg-config-0.25'
> | make: *** [all] Error 2
> | ERROR: oe_runmake failed
> | ERROR: Function failed: do_compile (see
> /home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.25-r7/temp/log.do_compile.32446
> for further information)
> ERROR: Task 27
> (virtual:native:/home/rmacleod/src/distro/yocto/oe-core.git/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
> <http://pkgconfig_0.25.bb>, do_compile) failed with exit code '1'
> NOTE: Tasks Summary: Attempted 47 tasks of which 46 didn't need to be
> rerun and 1 failed.
> No currently running tasks (47 of 63)
>
>
> --
> ../Randy/..
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 12/18] pkgconfig: Move patches in prep for 0.28 update

[Randy MacLeod]

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

On Mon, May 6, 2013 at 5:58 PM, Saul Wold <sgw@linux.intel.com> wrote:

> On 05/06/2013 01:59 PM, Randy MacLeod wrote:
>
>> On 13-04-24 05:37 PM, Saul Wold wrote:> Signed-off-by: Saul Wold
>> <sgw@linux.intel.com <mailto:sgw@linux.intel.com>>
>>
>>  > ---
>>  >   meta/recipes-devtools/**pkgconfig/pkgconfig.inc     | 8 +-------
>>  >   meta/recipes-devtools/**pkgconfig/pkgconfig_0.25.bb
>> <http://pkgconfig_0.25.bb> | 7 +++++++
>>
>>  >   2 files changed, 8 insertions(+), 7 deletions(-)
>>
>> Saul,
>>
>> Any news on pkgconfig-0.28 ? I'm trying to compile c-i-m
>> using clang for the -native tools and glib-1.2.10 shipped with
>> pkgconfig-0.25 is causing the build error below.
>> pkgconfig-0.28 and later includes version of glib-2.32.4
>>
>>  Got caught up in 1.4 finalization and planning for 1.5, I was going to
> look at it again this week.
>
>
>  If you are about to push this uprev, I'll wait a while and try
>> again. Do you want help?
>>
>>  I would appreciate help with the update if you can provide a tested
> pkgconfig update, I was thinking about providing the update for testing
> before enabling it similar to what we do with gcc, that's why I split the
> recipe.
>
> I have an untested version (it builds) in my poky-contrib/sgw/wip branch
> with you want to finish/test it more.
>

I only see 0.25:

$ cd .../poky/poky-contrib.git
$ git pull
Already up-to-date.
$ git status
# On branch sgw/wip
nothing to commit, working directory clean
$ find meta -name "pkgcon*bb"
meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb

Did I miss something?

I think you want me to provide a commit for 0.28 as an additional recipe
with the
preferred provider being 0.25 until 0.28 is tested and stable. Is that
right?

Thanks for your help.
>

Let's not get ahead of ourselves. :)
I'm also in the middle of planning so we'll see how much time I have to
work on this. :) I've made some progress on groking the existing patches
and determining which ones should be kept, adjusted and tossed. More
tomorrow night - I hope.


Current status:
- removed all the pkgconfig-0.28/*patches - I'm not sure I can really get
away with that.
- configure is failing as shown below.


// Randy

$ bitbake -c configure pkgconfig-native
....
| system_include_path='/usr/include'
| system_library_path='/usr/lib:/lib'
| target_alias='x86_64-linux'
| use_indirect_deps='no'
|
| configure: exit 1
| ERROR: oe_runconf failed
| ERROR: Function failed: do_configure (see
/home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.28-r0/temp/log.do_configure.15370
for further information)
ERROR: Task 26
(virtual:native:/home/rmacleod/src/distro/yocto/oe-core.git/meta/recipes-devtools/pkgconfig/
pkgconfig_0.28.bb, do_configure) failed with exit code '1'
NOTE: Tasks Summary: Attempted 46 tasks of which 42 didn't need to be rerun
and 1 failed.
No currently running tasks (46 of 63)

Summary: 1 task failed:

virtual:native:/home/rmacleod/src/distro/yocto/oe-core.git/meta/recipes-devtools/pkgconfig/
pkgconfig_0.28.bb, do_configure


-- 
../Randy/..

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

Re: [PATCH 12/18] pkgconfig: Move patches in prep for 0.28 update

[Saul Wold]

Top Post:

My bad, I pushed the wrong local branch to sgw/wip, it's updated now.

Sorry.

	Sau!


On 05/06/2013 08:53 PM, Randy MacLeod wrote:
>
>
>
> On Mon, May 6, 2013 at 5:58 PM, Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>> wrote:
>
>     On 05/06/2013 01:59 PM, Randy MacLeod wrote:
>
>         On 13-04-24 05:37 PM, Saul Wold wrote:> Signed-off-by: Saul Wold
>         <sgw@linux.intel.com <mailto:sgw@linux.intel.com>
>         <mailto:sgw@linux.intel.com <mailto:sgw@linux.intel.com>>>
>
>           > ---
>           >   meta/recipes-devtools/__pkgconfig/pkgconfig.inc     | 8
>         +-------
>           >   meta/recipes-devtools/__pkgconfig/pkgconfig_0.25.bb
>         <http://pkgconfig_0.25.bb>
>         <http://pkgconfig_0.25.bb> | 7 +++++++
>
>           >   2 files changed, 8 insertions(+), 7 deletions(-)
>
>         Saul,
>
>         Any news on pkgconfig-0.28 ? I'm trying to compile c-i-m
>         using clang for the -native tools and glib-1.2.10 shipped with
>         pkgconfig-0.25 is causing the build error below.
>         pkgconfig-0.28 and later includes version of glib-2.32.4
>
>     Got caught up in 1.4 finalization and planning for 1.5, I was going
>     to look at it again this week.
>
>
>         If you are about to push this uprev, I'll wait a while and try
>         again. Do you want help?
>
>     I would appreciate help with the update if you can provide a tested
>     pkgconfig update, I was thinking about providing the update for
>     testing before enabling it similar to what we do with gcc, that's
>     why I split the recipe.
>
>     I have an untested version (it builds) in my poky-contrib/sgw/wip
>     branch with you want to finish/test it more.
>
>
> I only see 0.25:
>
> $ cd .../poky/poky-contrib.git
> $ git pull
> Already up-to-date.
> $ git status
> # On branch sgw/wip
> nothing to commit, working directory clean
> $ find meta -name "pkgcon*bb"
> meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb <http://pkgconfig_0.25.bb>
> meta/recipes-devtools/pkgconfig/pkgconfig_git.bb <http://pkgconfig_git.bb>
>
> Did I miss something?
>
> I think you want me to provide a commit for 0.28 as an additional recipe
> with the
> preferred provider being 0.25 until 0.28 is tested and stable. Is that
> right?
>
>     Thanks for your help.
>
>
> Let's not get ahead of ourselves. :)
> I'm also in the middle of planning so we'll see how much time I have to
> work on this. :) I've made some progress on groking the existing patches
> and determining which ones should be kept, adjusted and tossed. More
> tomorrow night - I hope.
>
>
> Current status:
> - removed all the pkgconfig-0.28/*patches - I'm not sure I can really
> get away with that.
> - configure is failing as shown below.
>
>
> // Randy
>
> $ bitbake -c configure pkgconfig-native
> ....
> | system_include_path='/usr/include'
> | system_library_path='/usr/lib:/lib'
> | target_alias='x86_64-linux'
> | use_indirect_deps='no'
> |
> | configure: exit 1
> | ERROR: oe_runconf failed
> | ERROR: Function failed: do_configure (see
> /home/rmacleod/src/distro/yocto/b-clang/build/tmp-eglibc/work/x86_64-linux/pkgconfig-native/0.28-r0/temp/log.do_configure.15370
> for further information)
> ERROR: Task 26
> (virtual:native:/home/rmacleod/src/distro/yocto/oe-core.git/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
> <http://pkgconfig_0.28.bb>, do_configure) failed with exit code '1'
> NOTE: Tasks Summary: Attempted 46 tasks of which 42 didn't need to be
> rerun and 1 failed.
> No currently running tasks (46 of 63)
>
> Summary: 1 task failed:
>
> virtual:native:/home/rmacleod/src/distro/yocto/oe-core.git/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
> <http://pkgconfig_0.28.bb>, do_configure
>
>
> --
> ../Randy/..

[PATCH 00/18] Package Updates

[Saul Wold]

Nothing really suprising here, I am doing a glib update 
and will have some other changes pending after that is
complete.

I am also testing an update to pkgconfig, which now carries
a mini glib to prevent circular issues, the first to was to
move patches from the .inc to the .bb file.

Sau!

The following changes since commit 395b90054eccddc1c9062a9a8657ed4482b7710a:

  glib-2.0: disable tests for native builds, and respect ptest for LSB (2013-04-22 15:48:57 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib sgw/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates

Saul Wold (18):
  less: Update to 458
  lsbinitscripts: Update to 9.46
  sysstat: Update to 10.1.5
  sqlite: Update to 3071602
  dhcp: Update to 4.2.5-P1
  resolvconf: Update to 1.71
  dpkg: Update to 1.16.10
  file: Update to 5.14
  libffi: Update to 3.0.13
  nspr: Update to 4.9.6
  libgcrypt: Update to 1.5.1
  pkgconfig: Move patches in prep for 0.28 update
  libxkbcommon: Update to 0.3.0
  glew: fix generation of glew.pc needed by mesa-demos
  mesa-demos: Update to 8.1.0
  glib-2.0: Update to 2.36
  glib-networking: Update to 2.36
  build-appliance: Add version info

 .../dhcp-3.0.3-dhclient-dbus.patch                 |    0
 .../{dhcp-4.2.5 => dhcp}/fix-client-path.patch     |    0
 .../{dhcp-4.2.5 => dhcp}/fix-external-bind.patch   |    0
 .../dhcp/{dhcp-4.2.5 => dhcp}/fixincludes.patch    |    0
 .../dhcp/{dhcp-4.2.5 => dhcp}/fixsepbuild.patch    |    0
 .../{dhcp-4.2.5 => dhcp}/link-with-lcrypto.patch   |    0
 .../dhcp/{dhcp-4.2.5 => dhcp}/noattrmode.patch     |    0
 .../dhcp/{dhcp-4.2.5 => dhcp}/site.h               |    0
 .../dhcp/{dhcp_4.2.5.bb => dhcp_4.2.5-P1.bb}       |    4 +-
 .../{resolvconf_1.70.bb => resolvconf_1.71.bb}     |    5 +-
 .../glib-2.0/obsolete_automake_macros.patch        |   13 -
 .../{glib-2.0_2.34.3.bb => glib-2.0_2.36.0.bb}     |   12 +-
 meta/recipes-core/glib-2.0/glib.inc                |    2 +-
 ...working_2.28.7.bb => glib-networking_2.36.0.bb} |   10 +-
 ...iance-image.bb => build-appliance-image_8.0.bb} |    0
 .../dpkg/{dpkg_1.16.9.bb => dpkg_1.16.10.bb}       |    4 +-
 .../file/{file_5.13.bb => file_5.14.bb}            |    4 +-
 meta/recipes-devtools/pkgconfig/pkgconfig.inc      |    8 +-
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb  |    7 +
 .../less/{less_457.bb => less_458.bb}              |    5 +-
 ...binitscripts_9.45.bb => lsbinitscripts_9.46.bb} |    7 +-
 .../{sysstat_10.1.4.bb => sysstat_10.1.5.bb}       |    4 +-
 .../libffi/0001-libffi-update-for-3.0.11.patch     |  171 --
 .../libffi/aarch64-adding-build-support.patch      |   63 -
 .../libffi/libffi/add-aarch64-support.patch        | 2672 --------------------
 .../libffi/libffi/fix-libffi.la-location.patch     |   18 +
 .../libffi/{libffi_3.0.11.bb => libffi_3.0.13.bb}  |   11 +-
 .../glew/files/fix-glew.pc-install.patch           |   44 +
 meta/recipes-graphics/glew/glew_1.9.0.bb           |    1 +
 ...glgears-Make-EGL_KHR_image-usage-portable.patch |   95 -
 .../mesa-demos/dso_linking_change_build_fix.patch  |   24 -
 .../mesa/mesa-demos/gles2-info.patch               |   21 -
 .../{mesa-demos_8.0.1.bb => mesa-demos_8.1.0.bb}   |   11 +-
 ...libxkbcommon_0.2.0.bb => libxkbcommon_0.3.0.bb} |   11 +-
 .../libgcrypt-1.5.0/obsolete_automake_macros.patch |   15 -
 meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb  |    9 -
 meta/recipes-support/libgcrypt/libgcrypt_1.5.1.bb  |    4 +
 .../nspr/{nspr_4.9.5.bb => nspr_4.9.6.bb}          |    7 +-
 .../{sqlite3_3071502.bb => sqlite3_3071602.bb}     |    9 +-
 39 files changed, 118 insertions(+), 3153 deletions(-)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/dhcp-3.0.3-dhclient-dbus.patch (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fix-client-path.patch (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fix-external-bind.patch (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixincludes.patch (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixsepbuild.patch (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/link-with-lcrypto.patch (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/noattrmode.patch (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/site.h (100%)
 rename meta/recipes-connectivity/dhcp/{dhcp_4.2.5.bb => dhcp_4.2.5-P1.bb} (66%)
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.70.bb => resolvconf_1.71.bb} (87%)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.34.3.bb => glib-2.0_2.36.0.bb} (85%)
 rename meta/recipes-core/glib-networking/{glib-networking_2.28.7.bb => glib-networking_2.36.0.bb} (71%)
 rename meta/recipes-core/images/{build-appliance-image.bb => build-appliance-image_8.0.bb} (100%)
 rename meta/recipes-devtools/dpkg/{dpkg_1.16.9.bb => dpkg_1.16.10.bb} (71%)
 rename meta/recipes-devtools/file/{file_5.13.bb => file_5.14.bb} (86%)
 rename meta/recipes-extended/less/{less_457.bb => less_458.bb} (87%)
 rename meta/recipes-extended/lsb/{lsbinitscripts_9.45.bb => lsbinitscripts_9.46.bb} (77%)
 rename meta/recipes-extended/sysstat/{sysstat_10.1.4.bb => sysstat_10.1.5.bb} (44%)
 delete mode 100644 meta/recipes-gnome/libffi/libffi/0001-libffi-update-for-3.0.11.patch
 delete mode 100644 meta/recipes-gnome/libffi/libffi/aarch64-adding-build-support.patch
 delete mode 100644 meta/recipes-gnome/libffi/libffi/add-aarch64-support.patch
 create mode 100644 meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch
 rename meta/recipes-gnome/libffi/{libffi_3.0.11.bb => libffi_3.0.13.bb} (76%)
 create mode 100644 meta/recipes-graphics/glew/files/fix-glew.pc-install.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-xeglgears-Make-EGL_KHR_image-usage-portable.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
 rename meta/recipes-graphics/mesa/{mesa-demos_8.0.1.bb => mesa-demos_8.1.0.bb} (69%)
 rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.2.0.bb => libxkbcommon_0.3.0.bb} (67%)
 delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
 create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.5.1.bb
 rename meta/recipes-support/nspr/{nspr_4.9.5.bb => nspr_4.9.6.bb} (95%)
 rename meta/recipes-support/sqlite/{sqlite3_3071502.bb => sqlite3_3071602.bb} (41%)

-- 
1.8.0.2

[PATCH 12/18] pkgconfig: Move patches in prep for 0.28 update

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/pkgconfig/pkgconfig.inc     | 8 +-------
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 7 +++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 87d7165..52b9ad1 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -12,13 +12,7 @@ DEPENDS = "glib-2.0 popt"
 DEPENDS_class-native = ""
 DEPENDS_class-nativesdk = ""
 
-SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://autofoo.patch \
-           file://glibconfig-sysdefs.h \
-           file://pkg-config-native.in \
-           file://disable-legacy.patch \
-           file://obsolete_automake_macros.patch \
-          "
+SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz"
 
 S = "${WORKDIR}/pkg-config-${PV}/"
 
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index a269973..a55d017 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -2,5 +2,12 @@ require pkgconfig.inc
 
 PR = "r7"
 
+SRC_URI += "file://autofoo.patch \
+            file://glibconfig-sysdefs.h \
+            file://pkg-config-native.in \
+            file://disable-legacy.patch \
+            file://obsolete_automake_macros.patch \
+           "
+
 SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
 SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"
-- 
1.8.0.2