[PATCH 0/4] PR bumps for missing libz.la, resent gdb python support with fix

[PATCH 0/4] PR bumps for missing libz.la, resent gdb python support with fix

[Martin Jansa]

The following changes since commit e5ad03093dfc4364d1407183f458df79f347c7a1:

  guile: fix cross configure failure (2012-02-10 13:38:16 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Eric BENARD (1):
  gdb-cross-canadian: build gdb with python support

Martin Jansa (3):
  gdb-cross-canadian: use NATIVESDK paths as it happens to be here
  zlib: remove ldconfig call from install-libs
  recipes: bump PR to rebuild .la files without libz.la

 meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb    |    2 +-
 meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb  |    2 +-
 meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb    |    2 +-
 .../telepathy/libtelepathy_0.3.3.bb                |    2 +-
 .../telepathy/telepathy-glib_0.17.4.bb             |    2 +-
 .../telepathy/telepathy-mission-control_5.10.1.bb  |    2 +-
 meta/recipes-core/eggdbus/eggdbus_0.6.bb           |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb      |    2 +-
 .../glib-networking/glib-networking_2.28.7.bb      |    2 +-
 meta/recipes-core/libxml/libxml2_2.7.8.bb          |    2 +-
 .../zlib/zlib-1.2.6/remove.ldconfig.call.patch     |   20 +++++++++++++++
 meta/recipes-core/zlib/zlib_1.2.6.bb               |    3 ++
 meta/recipes-devtools/binutils/binutils_2.22.bb    |    2 +-
 meta/recipes-devtools/file/file_5.10.bb            |    2 +-
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |   26 +++++++++++++++++++-
 meta/recipes-devtools/python/python-gst_0.10.22.bb |    2 +-
 .../python/python-pygobject_2.27.91.bb             |    2 +-
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    2 +-
 .../subversion/subversion_1.7.2.bb                 |    2 +
 meta/recipes-extended/cracklib/cracklib_2.8.18.bb  |    2 +-
 meta/recipes-extended/pam/libpam_1.1.5.bb          |    2 +-
 meta/recipes-extended/polkit/polkit_0.104.bb       |    2 +-
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    2 +-
 meta/recipes-gnome/gnome/gconf_3.2.3.bb            |    2 +-
 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb   |    2 +-
 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb         |    2 +
 meta/recipes-gnome/gtk+/gtk+_2.24.8.bb             |    2 +-
 meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb        |    2 +-
 meta/recipes-gnome/json-glib/json-glib_0.14.2.bb   |    2 +
 meta/recipes-gnome/libglade/libglade_2.6.4.bb      |    2 +-
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb       |    2 +-
 meta/recipes-gnome/libunique/libunique_1.1.6.bb    |    2 +-
 meta/recipes-graphics/cairo/cairo_1.10.2.bb        |    2 +-
 .../libmatchbox/libmatchbox_1.9.bb                 |    2 +-
 .../menu-cache/menu-cache_0.3.2.bb                 |    2 +-
 meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb |    2 +-
 meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb   |    2 +-
 .../gstreamer/gst-plugins-bad_0.10.22.bb           |    2 +-
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    2 +-
 .../gstreamer/gst-plugins-good_0.10.30.bb          |    2 +-
 .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    2 +-
 .../gstreamer/gstreamer_0.10.35.bb                 |    2 +-
 .../libid3tag/libid3tag_0.15.1b.bb                 |    2 +-
 meta/recipes-multimedia/libpng/libpng_1.2.46.bb    |    2 +-
 meta/recipes-multimedia/libtiff/tiff_3.9.5.bb      |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb          |    2 +-
 meta/recipes-sato/eds/eds-dbus_git.bb              |    2 +-
 .../gtk-engines/gtk-sato-engine_git.bb             |    2 +-
 .../matchbox-keyboard/matchbox-keyboard_git.bb     |    2 +-
 .../matchbox-panel-2/matchbox-panel-2_git.bb       |    2 +-
 .../recipes-sato/owl-video-widget/libowl-av_git.bb |    2 +-
 .../sato-screenshot/sato-screenshot_git.bb         |    2 +-
 meta/recipes-sato/webkit/webkit-gtk_svn.bb         |    2 +-
 meta/recipes-support/curl/curl_7.23.1.bb           |    2 +-
 meta/recipes-support/gnutls/gnutls_2.12.16.bb      |    2 +-
 meta/recipes-support/libcroco/libcroco_0.6.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_0.1.17.bb         |    2 +-
 meta/recipes-support/libsoup/libsoup_2.2.105.bb    |    2 +-
 meta/recipes-support/libxslt/libxslt_1.1.26.bb     |    2 +-
 meta/recipes-support/neon/neon_0.29.6.bb           |    2 +-
 meta/recipes-support/vte/vte_0.28.2.bb             |    2 +-
 61 files changed, 109 insertions(+), 56 deletions(-)
 create mode 100644 meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch

-- 
1.7.8.4

[PATCH 1/4] gdb-cross-canadian: build gdb with python support

[Martin Jansa]

From: Eric BENARD <eric@eukrea.com>

* python support is needed for providing finer scripting control
in gdb, and for remote controling gdb for example from qtcreator
* gdb/configure tries to autodetect python using python executable
with --includes --ldflags --exec-prefix to get the right flags
As it's difficult to achieve in OE's context, we generate a
script which will return the right values and make gdb's build
system happy. This idea was taken from the following article :
http://www.mentby.com/doug-evans-2/python-enabled-gdb-on-windows-and-relocation.html
* tested using angstrom & armv7 target & qtcreator 201005 & 2.4.0

Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: fcooper@ti.com
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index ec0748e..b5746ce 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -4,4 +4,22 @@ DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
 PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 BPN = "gdb"
 
-DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk"
+DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk python-nativesdk"
+RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
+             python-nativesdk-codecs python-nativesdk-netclient"
+
+EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
+
+do_configure_prepend() {
+cat > ${WORKDIR}/python << EOF
+#! /bin/sh
+case "\$2" in
+        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
+        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
+        --exec-prefix) echo "/usr" ;;
+        *) exit 1 ;;
+esac
+exit 0
+EOF
+        chmod +x ${WORKDIR}/python
+}
-- 
1.7.8.4

[PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Martin Jansa]

* seems like config/config in -L was also wrong

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index b5746ce..bac63b7 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
 
 EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
 
+NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
+NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
+NATIVESDK_PATHNATIVE = "${NATIVESDK_PATH}/sysroots/${SDK_SYS}"
+NATIVESDK_LIBDIR = "${NATIVESDK_PATHNATIVE}${libdir_nativesdk}"
+NATIVESDK_INCLUDEDIR = "${NATIVESDK_PATHNATIVE}${includedir_nativesdk}"
+
 do_configure_prepend() {
 cat > ${WORKDIR}/python << EOF
 #! /bin/sh
 case "\$2" in
-        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
-        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
+        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
+        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
         --exec-prefix) echo "/usr" ;;
         *) exit 1 ;;
 esac
-- 
1.7.8.4

[PATCH 3/4] zlib: remove ldconfig call from install-libs

[Martin Jansa]

* it's called from install-libs target and when /etc/ld.so.cache is writeable by user running bitbake
  then it creates invalid cache (in my case libstdc++.so cannot be found after building zlib(-native)
  and I have to call touch */libstdc++.so && /sbin/ldconfig to fix it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../zlib/zlib-1.2.6/remove.ldconfig.call.patch     |   20 ++++++++++++++++++++
 meta/recipes-core/zlib/zlib_1.2.6.bb               |    3 +++
 2 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch

diff --git a/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
new file mode 100644
index 0000000..403b482
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
@@ -0,0 +1,20 @@
+
+When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache 
+(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call 
+touch */libstdc++.so && /sbin/ldconfig to fix it.
+
+So remove ldconfig call from make install-libs
+
+Upstream-Status: Inappropriate [disable feature]
+
+diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in
+--- zlib-1.2.6.orig/Makefile.in	2012-01-28 23:48:50.000000000 +0100
++++ zlib-1.2.6/Makefile.in	2012-02-13 15:38:20.577700723 +0100
+@@ -199,7 +199,6 @@
+ 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+ 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+-	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
+ 	fi
+ 	cp zlib.3 $(DESTDIR)$(man3dir)
+ 	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
diff --git a/meta/recipes-core/zlib/zlib_1.2.6.bb b/meta/recipes-core/zlib/zlib_1.2.6.bb
index a220773..54f8abf 100644
--- a/meta/recipes-core/zlib/zlib_1.2.6.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.6.bb
@@ -6,7 +6,10 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
 
+PR = "r1"
+
 SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
+           file://remove.ldconfig.call.patch \
            "
 SRC_URI[md5sum] = "dc2cfa0d2313ca77224b4d932b2911e9"
 SRC_URI[sha256sum] = "fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e"
-- 
1.7.8.4

[PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb    |    2 +-
 meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb  |    2 +-
 meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb    |    2 +-
 .../telepathy/libtelepathy_0.3.3.bb                |    2 +-
 .../telepathy/telepathy-glib_0.17.4.bb             |    2 +-
 .../telepathy/telepathy-mission-control_5.10.1.bb  |    2 +-
 meta/recipes-core/eggdbus/eggdbus_0.6.bb           |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb      |    2 +-
 .../glib-networking/glib-networking_2.28.7.bb      |    2 +-
 meta/recipes-core/libxml/libxml2_2.7.8.bb          |    2 +-
 meta/recipes-devtools/binutils/binutils_2.22.bb    |    2 +-
 meta/recipes-devtools/file/file_5.10.bb            |    2 +-
 meta/recipes-devtools/python/python-gst_0.10.22.bb |    2 +-
 .../python/python-pygobject_2.27.91.bb             |    2 +-
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    2 +-
 .../subversion/subversion_1.7.2.bb                 |    2 ++
 meta/recipes-extended/cracklib/cracklib_2.8.18.bb  |    2 +-
 meta/recipes-extended/pam/libpam_1.1.5.bb          |    2 +-
 meta/recipes-extended/polkit/polkit_0.104.bb       |    2 +-
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    2 +-
 meta/recipes-gnome/gnome/gconf_3.2.3.bb            |    2 +-
 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb   |    2 +-
 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb         |    2 ++
 meta/recipes-gnome/gtk+/gtk+_2.24.8.bb             |    2 +-
 meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb        |    2 +-
 meta/recipes-gnome/json-glib/json-glib_0.14.2.bb   |    2 ++
 meta/recipes-gnome/libglade/libglade_2.6.4.bb      |    2 +-
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb       |    2 +-
 meta/recipes-gnome/libunique/libunique_1.1.6.bb    |    2 +-
 meta/recipes-graphics/cairo/cairo_1.10.2.bb        |    2 +-
 .../libmatchbox/libmatchbox_1.9.bb                 |    2 +-
 .../menu-cache/menu-cache_0.3.2.bb                 |    2 +-
 meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb |    2 +-
 meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb   |    2 +-
 .../gstreamer/gst-plugins-bad_0.10.22.bb           |    2 +-
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    2 +-
 .../gstreamer/gst-plugins-good_0.10.30.bb          |    2 +-
 .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    2 +-
 .../gstreamer/gstreamer_0.10.35.bb                 |    2 +-
 .../libid3tag/libid3tag_0.15.1b.bb                 |    2 +-
 meta/recipes-multimedia/libpng/libpng_1.2.46.bb    |    2 +-
 meta/recipes-multimedia/libtiff/tiff_3.9.5.bb      |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb          |    2 +-
 meta/recipes-sato/eds/eds-dbus_git.bb              |    2 +-
 .../gtk-engines/gtk-sato-engine_git.bb             |    2 +-
 .../matchbox-keyboard/matchbox-keyboard_git.bb     |    2 +-
 .../matchbox-panel-2/matchbox-panel-2_git.bb       |    2 +-
 .../recipes-sato/owl-video-widget/libowl-av_git.bb |    2 +-
 .../sato-screenshot/sato-screenshot_git.bb         |    2 +-
 meta/recipes-sato/webkit/webkit-gtk_svn.bb         |    2 +-
 meta/recipes-support/curl/curl_7.23.1.bb           |    2 +-
 meta/recipes-support/gnutls/gnutls_2.12.16.bb      |    2 +-
 meta/recipes-support/libcroco/libcroco_0.6.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_0.1.17.bb         |    2 +-
 meta/recipes-support/libsoup/libsoup_2.2.105.bb    |    2 +-
 meta/recipes-support/libxslt/libxslt_1.1.26.bb     |    2 +-
 meta/recipes-support/neon/neon_0.29.6.bb           |    2 +-
 meta/recipes-support/vte/vte_0.28.2.bb             |    2 +-
 58 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
index 310d8a9..dcc40b8 100644
--- a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
@@ -18,7 +18,7 @@ FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
 
 EXTRA_OECONF = "--disable-introspection"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "aec6a56ac1d4f8a4837da83f2d152556"
 SRC_URI[sha256sum] = "94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea" 
diff --git a/meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb b/meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb
index ce9ca30..ae96eda 100644
--- a/meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb
@@ -7,7 +7,7 @@ DEPENDS = "gupnp"
 
 SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
index fd2eb38..8460c16 100644
--- a/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz \
 SRC_URI[md5sum] = "021bb237741532af4bca50157ff326e4"
 SRC_URI[sha256sum] = "f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe"
 
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-introspection"
 
diff --git a/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb b/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
index e063f89..a7c6667 100644
--- a/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
+++ b/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://src/tp-conn.c;beginline=1;endline=19;md5=4c58069f77d601cc59200bce5396c7cb"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
            file://prefer_python_2.5.patch \
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.17.4.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.17.4.bb
index 1ad91b2..64473df 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.17.4.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.17.4.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
 LICENSE = "LGPLv2.1+"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
 
diff --git a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.10.1.bb b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.10.1.bb
index f7ce736..9be4543 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.10.1.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.10.1.bb
@@ -8,7 +8,7 @@ DEPENDS = "libtelepathy dbus-glib gconf"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-${PV}.tar.gz"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/meta/recipes-core/eggdbus/eggdbus_0.6.bb b/meta/recipes-core/eggdbus/eggdbus_0.6.bb
index 0b958f7..75f56de 100644
--- a/meta/recipes-core/eggdbus/eggdbus_0.6.bb
+++ b/meta/recipes-core/eggdbus/eggdbus_0.6.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
                     file://src/eggdbus/eggdbus.h;md5=6b312aef57ed8d738b3f131ad037d6c2"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "dbus glib-2.0 dbus-glib eggdbus-native"
 DEPENDS_virtclass-native = "dbus-native glib-2.0-native dbus-glib-native"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
index 4bb38a7..111f9a4 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r3"
+PR = "r4"
 PE = "1"
 
 DEPENDS += "libffi python-argparse-native zlib"
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb b/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb
index 521c925..1ae34c0 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 SECTION = "libs"
 DEPENDS = "glib-2.0 gnutls"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/2.28/${BPN}-${PV}.tar.bz2"
 
diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb
index 8ec69fb..1de73da 100644
--- a/meta/recipes-core/libxml/libxml2_2.7.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb
@@ -1,6 +1,6 @@
 require libxml2.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://fix_version_info.patch"
 
diff --git a/meta/recipes-devtools/binutils/binutils_2.22.bb b/meta/recipes-devtools/binutils/binutils_2.22.bb
index f9827d3..8b058fe 100644
--- a/meta/recipes-devtools/binutils/binutils_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.22.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-PR = "r4"
+PR = "r5"
 
 LIC_FILES_CHKSUM="\
     file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
diff --git a/meta/recipes-devtools/file/file_5.10.bb b/meta/recipes-devtools/file/file_5.10.bb
index 1bf1b61..db247a7 100644
--- a/meta/recipes-devtools/file/file_5.10.bb
+++ b/meta/recipes-devtools/file/file_5.10.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
 
 DEPENDS = "zlib file-native"
 DEPENDS_virtclass-native = "zlib-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://fix_version_check.patch \
diff --git a/meta/recipes-devtools/python/python-gst_0.10.22.bb b/meta/recipes-devtools/python/python-gst_0.10.22.bb
index baadd41..7bd6d06 100644
--- a/meta/recipes-devtools/python/python-gst_0.10.22.bb
+++ b/meta/recipes-devtools/python/python-gst_0.10.22.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 LICENSE = "LGPLv2.1"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
 RDEPENDS_${PN} += "python-pygtk"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
            file://python-path.patch"
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index efc06b4..d79ab2f 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 DEPENDS = "python python-pygobject-native glib-2.0"
 DEPENDS_virtclass-native = "glib-2.0-native"
 RDEPENDS_virtclass-native = ""
-PR = "r3"
+PR = "r4"
 
 MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 83ee890..2c26d9a 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = "file-native"
-PR = "r29"
+PR = "r30"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
index 23e2132..a8d4f22 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.2.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
@@ -7,6 +7,8 @@ HOMEPAGE = "http://subversion.tigris.org"
 
 BBCLASSEXTEND = "native"
 
+PR = "r1"
+
 # negative, because of new checkout format in 1.7.0 
 # and distro PREMIRRORs need to be in sync with users
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta/recipes-extended/cracklib/cracklib_2.8.18.bb b/meta/recipes-extended/cracklib/cracklib_2.8.18.bb
index 05eda85..31f808d 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.8.18.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.8.18.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
 DEPENDS = "zlib"
-PR ="r2"
+PR ="r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz"
 
diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.5.bb
index c2c101b..283f477 100644
--- a/meta/recipes-extended/pam/libpam_1.1.5.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.5.bb
@@ -9,7 +9,7 @@ SECTION = "base"
 LICENSE = "GPLv2+ | BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \
            file://99_pam \
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index d53dda8..2737a4a 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -14,7 +14,7 @@ SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"
 SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
-PR = "r1"
+PR = "r2"
 DEPENDS = "libpam expat dbus-glib eggdbus intltool-native"
 RDEPENDS_${PN} = "libpam"
 EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 458b0fc..121babd 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -18,7 +18,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
 SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"
 SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700"
 
-PR = "r3"
+PR = "r4"
 
 inherit autotools pkgconfig gettext
 
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index a12cb9b..ccbc24e 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -9,7 +9,7 @@ POLKIT_libc-uclibc = ""
 DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native ${POLKIT}"
 DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
 
-PR = "r7"
+PR = "r8"
 
 inherit gnomebase
 
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
index 8fb7c7a..1a5ee05 100644
--- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
+++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SECTION = "x11/gnome"
 
-PR = "r5"
+PR = "r6"
 
 inherit autotools gnome pkgconfig
 
diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
index 8367bbd..19a6b31 100644
--- a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
+++ b/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
@@ -4,6 +4,8 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base"
 
+PR = "r1"
+
 EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
 
 inherit gnome pkgconfig
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index 8dfcc32..dab66c7 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -27,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03"
 SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043"
diff --git a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
index f15cf2e..7635e7a 100644
--- a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 SRCREV = "1161"
 PV = "2.11.0+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;proto=http \
            http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-stylesheet-user.patch;striplevel=0;name=patch2 \
diff --git a/meta/recipes-gnome/json-glib/json-glib_0.14.2.bb b/meta/recipes-gnome/json-glib/json-glib_0.14.2.bb
index bdc9dfb..18db4e7 100644
--- a/meta/recipes-gnome/json-glib/json-glib_0.14.2.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_0.14.2.bb
@@ -8,6 +8,8 @@ HOMEPAGE = "http://live.gnome.org/JsonGlib"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
+PR = "r1"
+
 DEPENDS = "glib-2.0"
 
 SRC_URI[archive.md5sum] = "5716a181a2b85268f53a1fb0c8024c4a"
diff --git a/meta/recipes-gnome/libglade/libglade_2.6.4.bb b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
index 632d7f7..747b4ed 100644
--- a/meta/recipes-gnome/libglade/libglade_2.6.4.bb
+++ b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff"
 
 SECTION = "libs"
-PR = "r2"
+PR = "r3"
 DEPENDS = "zlib gdk-pixbuf gtk+ gtk-doc-native"
 
 inherit autotools pkgconfig gnome
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index c1d5e3b..faefecd 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco cairo libxml2 popt"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
diff --git a/meta/recipes-gnome/libunique/libunique_1.1.6.bb b/meta/recipes-gnome/libunique/libunique_1.1.6.bb
index 71b4551..7061cf6 100644
--- a/meta/recipes-gnome/libunique/libunique_1.1.6.bb
+++ b/meta/recipes-gnome/libunique/libunique_1.1.6.bb
@@ -9,7 +9,7 @@ SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d"
 SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "glib-2.0 gtk+ dbus"
 
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.2.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
index a74a2cc..206b026 100644
--- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -2,7 +2,7 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
index 2ce5952..2fcd1b0 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
@@ -1,6 +1,6 @@
 require libmatchbox.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
            file://16bppfixes.patch \
diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb
index 87f9826..b8f9d97 100644
--- a/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb
+++ b/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb
@@ -16,6 +16,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz"
 SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a"
 SRC_URI[sha256sum] = "6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig
diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb
index c489f39..252fd22 100644
--- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
 
 DEPENDS += "zlib xproto font-util"
-PR = "r2"
+PR = "r3"
 PE = "1"
 
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb
index 3e44fc8..55d4e69 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
 DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc zlib"
 PROVIDES = "xfont"
 
-PR = "r1"
+PR = "r2"
 PE = "1"
 
 XORG_PN = "libXfont"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb
index 56c54b5..b99d453 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg"
 
-PR = "r1"
+PR = "r2"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
index e49a00c..6dfc26e 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
@@ -13,7 +13,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
 SRC_URI[md5sum] = "1d300983525f4f09030eb3ba47cb04b0"
 SRC_URI[sha256sum] = "cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"
 
-PR = "r0"
+PR = "r1"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
index a3dffa0..ebd49ab 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
 	    speex libsoup-2.4 pulseaudio"
-PR = "r4"
+PR = "r5"
 
 inherit gettext gconf
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb
index 72a8151..7f87cd3 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
 
 DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
-PR = "r0"
+PR = "r1"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb
index b58f34d..8d3bc75 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
 DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
            file://check_fix.patch \
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
index c5d53e6..dbcf2da 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 			file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63"
 SECTION = "libs"
 DEPENDS = "zlib gperf-native"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \
            file://addpkgconfig.patch"
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
index a917691..142f2b9 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \
                     file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc"
 DEPENDS = "zlib"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
 
diff --git a/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb b/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb
index ae8df15..bf0a387 100644
--- a/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf"
 HOMEPAGE = "http://www.remotesensing.org/libtiff/"
 DEPENDS = "zlib jpeg lzo"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
            file://libtool2.patch"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb
index edd3e0e..6a0b0b8 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb
index 0405a02..74da2ef 100644
--- a/meta/recipes-sato/eds/eds-dbus_git.bb
+++ b/meta/recipes-sato/eds/eds-dbus_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi
 
 SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f"
 PV = "2.30+git${SRCPV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
            file://oh-contact.patch;striplevel=0 \
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
index 224b6e1..d6685f5 100644
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 SRCREV = "e4a29fbb7648f12fb3aefd8ea0120c3f54ba392a"
 PV = "0.3.3+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
 
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 97b40d4..74d8757 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -12,7 +12,7 @@ RDEPENDS_${PN} = "formfactor dbus-wait"
 SECTION = "x11"
 SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
 PV = "0.0+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
            file://configure_fix.patch;maxrev=1819 \
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 0514164..12e4392 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -13,7 +13,7 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 
 SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35"
 PV = "0.0+git${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 RPROVIDES_${PN} = "matchbox-panel"
 RREPLACES_${PN} = "matchbox-panel"
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
index f1a4f88..4413d38 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
@@ -14,7 +14,7 @@ RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
 
 SRCREV = "1379fd230a32509e94971961183f1031f469737a"
 PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index 5e51d3d..8a113b3 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 DEPENDS = "matchbox-panel-2"
 SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
 PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
            file://fix_ldadd_order.patch"
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index e279ca3..9181c2c 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -15,7 +15,7 @@ SRCREV_FORMAT = "source"
 
 SRCREV = "101488"
 PV = "1.7.2+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
diff --git a/meta/recipes-support/curl/curl_7.23.1.bb b/meta/recipes-support/curl/curl_7.23.1.bb
index 9772465..db1ca81 100644
--- a/meta/recipes-support/curl/curl_7.23.1.bb
+++ b/meta/recipes-support/curl/curl_7.23.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
 DEPENDS = "zlib gnutls"
 DEPENDS_virtclass-native = "zlib-native"
 DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://noldlibpath.patch \
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.16.bb b/meta/recipes-support/gnutls/gnutls_2.12.16.bb
index 3c9b809..38cc98f 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.16.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.16.bb
@@ -1,6 +1,6 @@
 require gnutls.inc
 
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.6"
 
 SRC_URI += "file://gnutls-openssl.patch \
             file://correct_rpl_gettimeofday_signature.patch \
diff --git a/meta/recipes-support/libcroco/libcroco_0.6.3.bb b/meta/recipes-support/libcroco/libcroco_0.6.3.bb
index 0addd64..74c2cbb 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.3.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
 
 SECTION = "x11/utils"
 DEPENDS = "glib-2.0 libxml2 zlib"
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
diff --git a/meta/recipes-support/libfm/libfm_0.1.17.bb b/meta/recipes-support/libfm/libfm_0.1.17.bb
index efc1024..adf8e64 100644
--- a/meta/recipes-support/libfm/libfm_0.1.17.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.17.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 SECTION = "x11/libs"
 DEPENDS = "gtk+ menu-cache intltool-native"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz"
 
diff --git a/meta/recipes-support/libsoup/libsoup_2.2.105.bb b/meta/recipes-support/libsoup/libsoup_2.2.105.bb
index d251e94..697caaa 100644
--- a/meta/recipes-support/libsoup/libsoup_2.2.105.bb
+++ b/meta/recipes-support/libsoup/libsoup_2.2.105.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "glib-2.0 gnutls libxml2"
 
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index 09e90dc..f3e806d 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
 
 SECTION = "libs"
 DEPENDS = "libxml2"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
            file://pkgconfig_fix.patch"
diff --git a/meta/recipes-support/neon/neon_0.29.6.bb b/meta/recipes-support/neon/neon_0.29.6.bb
index ed62181..170a47c 100644
--- a/meta/recipes-support/neon/neon_0.29.6.bb
+++ b/meta/recipes-support/neon/neon_0.29.6.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a
 DEPENDS = "zlib libxml2 expat time gnutls libproxy"
 DEPENDS_virtclass-native = "zlib-native libxml2-native expat-native gnutls-native"
 
-PR = "r1"
+PR = "r2"
 
 BBCLASSEXTEND = "native"
 
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb
index 33f71b5..507e272 100644
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ b/meta/recipes-support/vte/vte_0.28.2.bb
@@ -2,7 +2,7 @@ require vte.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
 SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"
-- 
1.7.8.4

[PATCH] gdb-cross-canadian: bump PR

[Martin Jansa]

* incremented twice, because meta-oe had .bbappend with PRINC

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
index a4714e7..dbcffde 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
@@ -1,7 +1,7 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.3"
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 EXPAT = "--with-expat"
-- 
1.7.8.4

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Saul Wold]

On 02/13/2012 07:40 AM, Martin Jansa wrote:
> * seems like config/config in -L was also wrong
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
>   meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
>   1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> index b5746ce..bac63b7 100644
> --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
>
>   EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
>
> +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
Martin,

These two lines will not work in the general case, since the NATIVESDK 
might be for a different distro (not oecore) or in a different directory 
such as /opt vs /usr/local.

The Poky build fails with this patch for example.

Sau!

> +NATIVESDK_PATHNATIVE = "${NATIVESDK_PATH}/sysroots/${SDK_SYS}"
> +NATIVESDK_LIBDIR = "${NATIVESDK_PATHNATIVE}${libdir_nativesdk}"
> +NATIVESDK_INCLUDEDIR = "${NATIVESDK_PATHNATIVE}${includedir_nativesdk}"
> +

>   do_configure_prepend() {
>   cat>  ${WORKDIR}/python<<  EOF
>   #! /bin/sh
>   case "\$2" in
> -        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
> -        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> +        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
> +        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
>           --exec-prefix) echo "/usr" ;;
>           *) exit 1 ;;
>   esac

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Martin Jansa]

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

On Fri, Feb 17, 2012 at 02:36:48PM -0800, Saul Wold wrote:
> On 02/13/2012 07:40 AM, Martin Jansa wrote:
> > * seems like config/config in -L was also wrong
> >
> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > ---
> >   meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
> >   1 files changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > index b5746ce..bac63b7 100644
> > --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
> >
> >   EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
> >
> > +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> > +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"

Ah, I was reusing definition from bitbake.conf:
meta/conf/bitbake.conf:SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"

with only TARGET_ARCH replaced with SDK_ARCH.

Can we move "oecore" to extra varible like:

bitbake.conf:
-SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME_PREFIX = "oecore"
+SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"

meta-yocto/conf/distro/poky.conf:
-SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME_PREFIX = "${DISTRO}-${TCLIBC}"

SDK_PATH is worse:
meta/conf/bitbake.conf:SDKPATH = "/usr/local/${SDK_NAME}"
meta-yocto/conf/distro/poky.conf:SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"

Maybe this patch is not going in right direction, but nobody replied in
"SDK confusion Was: [oe] [meta-oe] gdb-cross-canadian: build gdb with python support"
thread so I have sent this version which works in default (distroless)
oe-core (and also for SHR as we don't override default SDK* variables.

If this variables make sense globally, then we can move them to
bitbake.conf and pokyt.conf (and maybe Angstrom too) can overwrite them
like they do with other SDK*.

Cheers,


> Martin,
> 
> These two lines will not work in the general case, since the NATIVESDK 
> might be for a different distro (not oecore) or in a different directory 
> such as /opt vs /usr/local.
> 
> The Poky build fails with this patch for example.
> 
> Sau!
> 
> > +NATIVESDK_PATHNATIVE = "${NATIVESDK_PATH}/sysroots/${SDK_SYS}"
> > +NATIVESDK_LIBDIR = "${NATIVESDK_PATHNATIVE}${libdir_nativesdk}"
> > +NATIVESDK_INCLUDEDIR = "${NATIVESDK_PATHNATIVE}${includedir_nativesdk}"
> > +
> 
> >   do_configure_prepend() {
> >   cat>  ${WORKDIR}/python<<  EOF
> >   #! /bin/sh
> >   case "\$2" in
> > -        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
> > -        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > +        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
> > +        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> >           --exec-prefix) echo "/usr" ;;
> >           *) exit 1 ;;
> >   esac

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Richard Purdie]

On Sat, 2012-02-18 at 12:56 +0100, Martin Jansa wrote:
> On Fri, Feb 17, 2012 at 02:36:48PM -0800, Saul Wold wrote:
> > On 02/13/2012 07:40 AM, Martin Jansa wrote:
> > > * seems like config/config in -L was also wrong
> > >
> > > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > > ---
> > >   meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
> > >   1 files changed, 8 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > index b5746ce..bac63b7 100644
> > > --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
> > >
> > >   EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
> > >
> > > +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> > > +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
> 
> Ah, I was reusing definition from bitbake.conf:
> meta/conf/bitbake.conf:SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
> 
> with only TARGET_ARCH replaced with SDK_ARCH.
> 
> Can we move "oecore" to extra varible like:
> 
> bitbake.conf:
> -SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
> +SDK_NAME_PREFIX = "oecore"
> +SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"
> 
> meta-yocto/conf/distro/poky.conf:
> -SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
> +SDK_NAME_PREFIX = "${DISTRO}-${TCLIBC}"
> 
> SDK_PATH is worse:
> meta/conf/bitbake.conf:SDKPATH = "/usr/local/${SDK_NAME}"
> meta-yocto/conf/distro/poky.conf:SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
> 
> Maybe this patch is not going in right direction, but nobody replied in
> "SDK confusion Was: [oe] [meta-oe] gdb-cross-canadian: build gdb with python support"
> thread so I have sent this version which works in default (distroless)
> oe-core (and also for SHR as we don't override default SDK* variables.

This last week has been a bit problematic with conference activities
occupying many of the people who would normally have replied to that
kind of thread.

I'm very worried that you're having to copy the base bitbake definitions
as needing to do that is usually a sign there is some underlying more
fundamental problem. We really need to find a better alternative.

I therefore don't think the patch as it stands can go in but I do want
to understand the problem and try and fix it in a way that addresses the
issues. I'm probably not going to get a chance to look at things until
next week though.

Cheers,

Richard

Re: [PATCH 0/4] PR bumps for missing libz.la, resent gdb python support with fix

[Saul Wold]

On 02/13/2012 07:40 AM, Martin Jansa wrote:
> The following changes since commit e5ad03093dfc4364d1407183f458df79f347c7a1:
>
>    guile: fix cross configure failure (2012-02-10 13:38:16 +0000)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib jansa/pull
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
>
> Eric BENARD (1):
>    gdb-cross-canadian: build gdb with python support
>
> Martin Jansa (3):
>    gdb-cross-canadian: use NATIVESDK paths as it happens to be here
>    zlib: remove ldconfig call from install-libs
>    recipes: bump PR to rebuild .la files without libz.la
>
The zlib patches were pulled, but as already noted the 
gdb-cross-canadian ones are pending.

Thanks
	Sau!

>   meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb    |    2 +-
>   meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb  |    2 +-
>   meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb    |    2 +-
>   .../telepathy/libtelepathy_0.3.3.bb                |    2 +-
>   .../telepathy/telepathy-glib_0.17.4.bb             |    2 +-
>   .../telepathy/telepathy-mission-control_5.10.1.bb  |    2 +-
>   meta/recipes-core/eggdbus/eggdbus_0.6.bb           |    2 +-
>   meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb      |    2 +-
>   .../glib-networking/glib-networking_2.28.7.bb      |    2 +-
>   meta/recipes-core/libxml/libxml2_2.7.8.bb          |    2 +-
>   .../zlib/zlib-1.2.6/remove.ldconfig.call.patch     |   20 +++++++++++++++
>   meta/recipes-core/zlib/zlib_1.2.6.bb               |    3 ++
>   meta/recipes-devtools/binutils/binutils_2.22.bb    |    2 +-
>   meta/recipes-devtools/file/file_5.10.bb            |    2 +-
>   meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |   26 +++++++++++++++++++-
>   meta/recipes-devtools/python/python-gst_0.10.22.bb |    2 +-
>   .../python/python-pygobject_2.27.91.bb             |    2 +-
>   meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    2 +-
>   .../subversion/subversion_1.7.2.bb                 |    2 +
>   meta/recipes-extended/cracklib/cracklib_2.8.18.bb  |    2 +-
>   meta/recipes-extended/pam/libpam_1.1.5.bb          |    2 +-
>   meta/recipes-extended/polkit/polkit_0.104.bb       |    2 +-
>   meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    2 +-
>   meta/recipes-gnome/gnome/gconf_3.2.3.bb            |    2 +-
>   meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb   |    2 +-
>   meta/recipes-gnome/gthumb/gthumb_2.12.4.bb         |    2 +
>   meta/recipes-gnome/gtk+/gtk+_2.24.8.bb             |    2 +-
>   meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb        |    2 +-
>   meta/recipes-gnome/json-glib/json-glib_0.14.2.bb   |    2 +
>   meta/recipes-gnome/libglade/libglade_2.6.4.bb      |    2 +-
>   meta/recipes-gnome/librsvg/librsvg_2.32.1.bb       |    2 +-
>   meta/recipes-gnome/libunique/libunique_1.1.6.bb    |    2 +-
>   meta/recipes-graphics/cairo/cairo_1.10.2.bb        |    2 +-
>   .../libmatchbox/libmatchbox_1.9.bb                 |    2 +-
>   .../menu-cache/menu-cache_0.3.2.bb                 |    2 +-
>   meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb |    2 +-
>   meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb   |    2 +-
>   .../gstreamer/gst-plugins-bad_0.10.22.bb           |    2 +-
>   .../gstreamer/gst-plugins-base_0.10.35.bb          |    2 +-
>   .../gstreamer/gst-plugins-good_0.10.30.bb          |    2 +-
>   .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    2 +-
>   .../gstreamer/gstreamer_0.10.35.bb                 |    2 +-
>   .../libid3tag/libid3tag_0.15.1b.bb                 |    2 +-
>   meta/recipes-multimedia/libpng/libpng_1.2.46.bb    |    2 +-
>   meta/recipes-multimedia/libtiff/tiff_3.9.5.bb      |    2 +-
>   meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb          |    2 +-
>   meta/recipes-sato/eds/eds-dbus_git.bb              |    2 +-
>   .../gtk-engines/gtk-sato-engine_git.bb             |    2 +-
>   .../matchbox-keyboard/matchbox-keyboard_git.bb     |    2 +-
>   .../matchbox-panel-2/matchbox-panel-2_git.bb       |    2 +-
>   .../recipes-sato/owl-video-widget/libowl-av_git.bb |    2 +-
>   .../sato-screenshot/sato-screenshot_git.bb         |    2 +-
>   meta/recipes-sato/webkit/webkit-gtk_svn.bb         |    2 +-
>   meta/recipes-support/curl/curl_7.23.1.bb           |    2 +-
>   meta/recipes-support/gnutls/gnutls_2.12.16.bb      |    2 +-
>   meta/recipes-support/libcroco/libcroco_0.6.3.bb    |    2 +-
>   meta/recipes-support/libfm/libfm_0.1.17.bb         |    2 +-
>   meta/recipes-support/libsoup/libsoup_2.2.105.bb    |    2 +-
>   meta/recipes-support/libxslt/libxslt_1.1.26.bb     |    2 +-
>   meta/recipes-support/neon/neon_0.29.6.bb           |    2 +-
>   meta/recipes-support/vte/vte_0.28.2.bb             |    2 +-
>   61 files changed, 109 insertions(+), 56 deletions(-)
>   create mode 100644 meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
>

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Steve Sakoman]

On Mon, Feb 13, 2012 at 7:40 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
<snip>

>  meta/recipes-core/libxml/libxml2_2.7.8.bb          |    2 +-

The rebuild of libxml2 triggered by this commit fails on my 8 core machine:

| In file included from libxml.h:36:0,
|                  from xmlmemory.c:8:
| ./include/libxml/xmlversion.h:396:22: fatal error: ansidecl.h: No
such file or directory

Seems to be a missing dependency on binutils.  I'll send a patch.

Steve

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Steve Sakoman]

On Mon, Feb 13, 2012 at 7:40 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
<snip>
>  meta/recipes-gnome/gtk+/gtk+_2.24.8.bb             |    2 +-

The rebuild of gtk+ triggered by this commit fails on my quad core
build machine:

| configure: error: Package requirements (cairo-xlib >= 1.6) were not met:
|
| No package 'cairo-xlib' found

I won't have time to look into this until this evening or tomorrow
morning, but will send a patch when I find a fix.

Unless someone beats me to it :-)

Steve

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Khem Raj]

On Tue, Feb 21, 2012 at 11:25 AM, Steve Sakoman <sakoman@gmail.com> wrote:
>
> | configure: error: Package requirements (cairo-xlib >= 1.6) were not met:
> |
> | No package 'cairo-xlib' found

Add DEPENDS += "cairo"

>
> I won't have time to look into this until this evening or tomorrow
> morning, but will send a patch when I find a fix.
>
> Unless someone beats me to it :-)

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Steve Sakoman]

On Tue, Feb 21, 2012 at 1:07 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, Feb 21, 2012 at 11:25 AM, Steve Sakoman <sakoman@gmail.com> wrote:
>>
>> | configure: error: Package requirements (cairo-xlib >= 1.6) were not met:
>> |
>> | No package 'cairo-xlib' found
>
> Add DEPENDS += "cairo"

Nope, cairo is already in the DEPENDS list for gtk+.

Seems the issue is that on that build machine (the 4 core) cairo isn't
being built with --with-x=yes.

The cairo recipe checks for x11 in DISTRO_FEATURES and does
--with-x=yes if it is present.

Since Poky doesn't have x11 in DISTRO_FEATURES, cairo builds without
xlib support by default.

On my other build machine (the 8 core) some other package must be
triggering cairo to build with xlib enabled and I don't get the gtk+
error.

Not sure what the proper fix is.  Suggestions welcome.  In order to
get work done I'll probably append x11 to distro features in my layer
and deal with it when I have more time.

Steve

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Phil Blundell]

On Tue, 2012-02-21 at 13:16 -0800, Steve Sakoman wrote:
> On Tue, Feb 21, 2012 at 1:07 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > On Tue, Feb 21, 2012 at 11:25 AM, Steve Sakoman <sakoman@gmail.com> wrote:
> >>
> >> | configure: error: Package requirements (cairo-xlib >= 1.6) were not met:
> >> |
> >> | No package 'cairo-xlib' found
> >
> > Add DEPENDS += "cairo"
> 
> Nope, cairo is already in the DEPENDS list for gtk+.
> 
> Seems the issue is that on that build machine (the 4 core) cairo isn't
> being built with --with-x=yes.
> 
> The cairo recipe checks for x11 in DISTRO_FEATURES and does
> --with-x=yes if it is present.
> 
> Since Poky doesn't have x11 in DISTRO_FEATURES, cairo builds without
> xlib support by default.

If you don't have x11 in DISTRO_FEATURES then I wouldn't have expected
gtk+ to want cairo-x11 either.  Though, I don't quite know what the gtk+
configury will do if you don't select any backends at all and it's
possible it might be falling back to X in that case.

What gtk backend are you expecting to use - directfb?

p.

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Steve Sakoman]

On Tue, Feb 21, 2012 at 1:33 PM, Phil Blundell <philb@gnu.org> wrote:
> On Tue, 2012-02-21 at 13:16 -0800, Steve Sakoman wrote:
>> On Tue, Feb 21, 2012 at 1:07 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> > On Tue, Feb 21, 2012 at 11:25 AM, Steve Sakoman <sakoman@gmail.com> wrote:
>> >>
>> >> | configure: error: Package requirements (cairo-xlib >= 1.6) were not met:
>> >> |
>> >> | No package 'cairo-xlib' found
>> >
>> > Add DEPENDS += "cairo"
>>
>> Nope, cairo is already in the DEPENDS list for gtk+.
>>
>> Seems the issue is that on that build machine (the 4 core) cairo isn't
>> being built with --with-x=yes.
>>
>> The cairo recipe checks for x11 in DISTRO_FEATURES and does
>> --with-x=yes if it is present.
>>
>> Since Poky doesn't have x11 in DISTRO_FEATURES, cairo builds without
>> xlib support by default.
>
> If you don't have x11 in DISTRO_FEATURES then I wouldn't have expected
> gtk+ to want cairo-x11 either.

Agreed!  But it does :-(

> Though, I don't quite know what the gtk+
> configury will do if you don't select any backends at all and it's
> possible it might be falling back to X in that case.
>
> What gtk backend are you expecting to use - directfb?

Well, this is an image for a headless system, so neither directfb nor
x11 will be used!  I'm not really sure what package is causing gtk+ to
be built.

Steve

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Paul Eggleton]

On Tuesday 21 February 2012 13:16:11 Steve Sakoman wrote:
> Since Poky doesn't have x11 in DISTRO_FEATURES, cairo builds without
> xlib support by default.

If you're referring to the default configuration, I can assure you Poky does 
have x11 in DISTRO_FEATURES.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Phil Blundell]

On Tue, 2012-02-21 at 13:39 -0800, Steve Sakoman wrote:
> Well, this is an image for a headless system, so neither directfb nor
> x11 will be used!  I'm not really sure what package is causing gtk+ to
> be built.

Ah.  Well, gtk+ 2.x requires you to choose exactly one of either x11 or
directfb as the backend.  If you don't have either then it isn't going
to work. 

You can use "bitbake -g" to find out what is depending on gtk+, or just
add gtk+ to BBMASK and see which recipe starts complaining about
unsatisfied dependencies.  Sounds like eliminating that dependency at
source is probably going to be the most fruitful route for you to
explore.

p.

Re: [PATCH 4/4] recipes: bump PR to rebuild .la files without libz.la

[Steve Sakoman]

On Tue, Feb 21, 2012 at 1:44 PM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Tuesday 21 February 2012 13:16:11 Steve Sakoman wrote:
>> Since Poky doesn't have x11 in DISTRO_FEATURES, cairo builds without
>> xlib support by default.
>
> If you're referring to the default configuration, I can assure you Poky does
> have x11 in DISTRO_FEATURES.

The ELC flu is affecting my ability to think :-(

I see now that Poky relies on the DISTRO_FEATURES setup in
bitbake.conf (via default-distrovars.inc via defaultsetup.conf).  I
was just looking in poky.conf and didn't see anywhere that it pulled
in either of those files.

So now I need to figure out why the quad core machine is refusing to
enable --with-x=yes for the cairo build . . .

Perhaps better to wait till tomorrow when I am feeling better.

Steve

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Martin Jansa]

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

On Sat, Feb 18, 2012 at 02:01:06PM +0000, Richard Purdie wrote:
> On Sat, 2012-02-18 at 12:56 +0100, Martin Jansa wrote:
> > On Fri, Feb 17, 2012 at 02:36:48PM -0800, Saul Wold wrote:
> > > On 02/13/2012 07:40 AM, Martin Jansa wrote:
> > > > * seems like config/config in -L was also wrong
> > > >
> > > > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > > > ---
> > > >   meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
> > > >   1 files changed, 8 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > > index b5746ce..bac63b7 100644
> > > > --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > > +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > > @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
> > > >
> > > >   EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
> > > >
> > > > +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> > > > +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
> > 
> > Ah, I was reusing definition from bitbake.conf:
> > meta/conf/bitbake.conf:SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
> > 
> > with only TARGET_ARCH replaced with SDK_ARCH.
> > 
> > Can we move "oecore" to extra varible like:
> > 
> > bitbake.conf:
> > -SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
> > +SDK_NAME_PREFIX = "oecore"
> > +SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"
> > 
> > meta-yocto/conf/distro/poky.conf:
> > -SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
> > +SDK_NAME_PREFIX = "${DISTRO}-${TCLIBC}"
> > 
> > SDK_PATH is worse:
> > meta/conf/bitbake.conf:SDKPATH = "/usr/local/${SDK_NAME}"
> > meta-yocto/conf/distro/poky.conf:SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
> > 
> > Maybe this patch is not going in right direction, but nobody replied in
> > "SDK confusion Was: [oe] [meta-oe] gdb-cross-canadian: build gdb with python support"
> > thread so I have sent this version which works in default (distroless)
> > oe-core (and also for SHR as we don't override default SDK* variables.
> 
> This last week has been a bit problematic with conference activities
> occupying many of the people who would normally have replied to that
> kind of thread.

I know and I wasn't complaining much about lack of responses :) rather
wanted to resend this 2 patches in form easy to test for everybody.

And I wanted to resend older Eric's patch for oe-core not .bbappend in
meta-oe, because I wanted to test it without any aditional layer (as
it first should work for distroless oe-core and not only for distributions
overwriting default configuration).

> I'm very worried that you're having to copy the base bitbake definitions
> as needing to do that is usually a sign there is some underlying more
> fundamental problem. We really need to find a better alternative.
> 
> I therefore don't think the patch as it stands can go in but I do want
> to understand the problem and try and fix it in a way that addresses the
> issues. I'm probably not going to get a chance to look at things until
> next week though.

I've added SDK_NAME_PREFIX to bitbake.conf which is probably better to
overwrite then whole "oecore-${SDK_ARCH}-${TARGET_ARCH}" and I've moved
3 NATIVESDK_* variables from that .inc to bitbake.conf so it's easier to
see that those also need to be overwriten in consistent way, see
following patchset.

Cheers,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Richard Purdie]

On Mon, 2012-02-13 at 16:40 +0100, Martin Jansa wrote:
> * seems like config/config in -L was also wrong
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> index b5746ce..bac63b7 100644
> --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
>  
>  EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
>  
> +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
> +NATIVESDK_PATHNATIVE = "${NATIVESDK_PATH}/sysroots/${SDK_SYS}"
> +NATIVESDK_LIBDIR = "${NATIVESDK_PATHNATIVE}${libdir_nativesdk}"
> +NATIVESDK_INCLUDEDIR = "${NATIVESDK_PATHNATIVE}${includedir_nativesdk}"
> +
>  do_configure_prepend() {
>  cat > ${WORKDIR}/python << EOF
>  #! /bin/sh
>  case "\$2" in
> -        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
> -        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> +        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
> +        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
>          --exec-prefix) echo "/usr" ;;
>          *) exit 1 ;;
>  esac

I made some experiments with "bitbake gdb-cross-canadian-x86-64 -e" and
it seems to me that:

       --includes) echo "-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}/" ;;
       --ldflags) echo "-L${STAGING_LIBDIR}/../python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;

should work ok here?

Cheers,

Richard

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Martin Jansa]

[-- Attachment #1.1: Type: text/plain, Size: 4542 bytes --]

On Thu, Feb 23, 2012 at 10:27:53AM +0000, Richard Purdie wrote:
> On Mon, 2012-02-13 at 16:40 +0100, Martin Jansa wrote:
> > * seems like config/config in -L was also wrong
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
> >  1 files changed, 8 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > index b5746ce..bac63b7 100644
> > --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
> >  
> >  EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
> >  
> > +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> > +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
> > +NATIVESDK_PATHNATIVE = "${NATIVESDK_PATH}/sysroots/${SDK_SYS}"
> > +NATIVESDK_LIBDIR = "${NATIVESDK_PATHNATIVE}${libdir_nativesdk}"
> > +NATIVESDK_INCLUDEDIR = "${NATIVESDK_PATHNATIVE}${includedir_nativesdk}"
> > +
> >  do_configure_prepend() {
> >  cat > ${WORKDIR}/python << EOF
> >  #! /bin/sh
> >  case "\$2" in
> > -        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
> > -        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > +        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
> > +        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> >          --exec-prefix) echo "/usr" ;;
> >          *) exit 1 ;;
> >  esac
> 
> I made some experiments with "bitbake gdb-cross-canadian-x86-64 -e" and
> it seems to me that:
> 
>        --includes) echo "-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}/" ;;
>        --ldflags) echo "-L${STAGING_LIBDIR}/../python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> 
> should work ok here?

No it's not the same.

With default oe-core settings it behaves like this:

python-nativesdk is staged in the same directory for all 3 MACHINEs I
was using for test (qemuarm, qemux86, qemux86-64)

SDKMACHINE=i686:   SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/
SDKMACHINE=x86-64: SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux

while STAGING_INCDIR is different for each machine
SDKMACHINE=i686:
  STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-i586/sysroots/i686-oesdk-linux/usr/lib/i586-oe-linux"
  STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-x86_64/sysroots/i686-oesdk-linux/usr/lib/x86_64-oe-linux"
  STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-arm/sysroots/i686-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"
SDKMACHINE=x86-64:
  STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-i586/sysroots/x86_64-oesdk-linux/usr/lib/i586-oe-linux"
  STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/x86_64-oe-linux"
  STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-arm/sysroots/x86_64-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"

notice that not only SDK_NAME tripple is changing
SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"
so we keep it the same across all MACHINES with:
NATIVESDK_SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${SDK_ARCH}"

but also toplevel SYSROOT is different
i686-nativesdk-oesdk-linux
i686-oesdk-linux-nativesdk
and
x86_64-nativesdk-oesdk-linux
x86_64-oesdk-linux-nativesdk

So nativesdk staging is broken and python-nativesdk should be staged
separately for each SDK_ARCH/TARGET_ARCH combination or we need those
NATIVESDK_SDK_NAME variables for cross-canadian -> nativesdk deps.

Attaching complete list of combinations I've built to be sure :).

Cheers,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #1.2: nativesdk.paths.txt --]
[-- Type: text/plain, Size: 5594 bytes --]

SYSROOTS = /OE/oe-core/SYSROOTS
= SDKMACHINE=x86-64 ==
SDKMACHINE=x86-64 MACHINE=qemux86 bitbake python-nativesdk
                  SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/include/python2.7/Python.h
                  SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/python2.7/config/
SDKMACHINE=x86-64 MACHINE=qemux86 bitbake gdb-cross-canadian-i586
  STAGING_INCDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-i586/sysroots/x86_64-oesdk-linux/usr/include"
  STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-i586/sysroots/x86_64-oesdk-linux/usr/lib/i586-oe-linux"
                                     NATIVESDK_LIBDIR="/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib"
                                     NATIVESDK_INCDIR="/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/include"

SDKMACHINE=x86-64 MACHINE=qemux86-64 bitbake python-nativesdk
                  SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/include/python2.7/Python.h
                  SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/python2.7/config/
SDKMACHINE=x86-64 MACHINE=qemux86-64 bitbake gdb-cross-canadian-x86-64
  STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/x86_64-oe-linux"
  STAGING_INCDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/include"
                                     NATIVESDK_LIBDIR="/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib"
                                     NATIVESDK_INCDIR="/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/include"

SDKMACHINE=x86-64 MACHINE=qemuarm bitbake python-nativesdk
                  SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/include/python2.7/Python.h
                  SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/python2.7/config/
SDKMACHINE=x86-64 MACHINE=qemuarm bitbake gdb-cross-canadian-arm
  STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-arm/sysroots/x86_64-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"
  STAGING_INCDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-arm/sysroots/x86_64-oesdk-linux/usr/include"
                                     NATIVESDK_INCDIR="/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/include"
                                     NATIVESDK_LIBDIR="/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib"

== SDKMACHINE=i686 ==
SDKMACHINE=i686 MACHINE=qemux86 bitbake python-nativesdk
                  SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/include/python2.7/Python.h
                  SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/lib/python2.7/config/
SDKMACHINE=i686 MACHINE=qemux86 bitbake gdb-cross-canadian-i586
  STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-i586/sysroots/i686-oesdk-linux/usr/lib/i586-oe-linux"
  STAGING_INCDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-i586/sysroots/i686-oesdk-linux/usr/include"
                                   NATIVESDK_LIBDIR="/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/lib"
                                   NATIVESDK_INCDIR="/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/include"

SDKMACHINE=i686 MACHINE=qemux86-64 bitbake python-nativesdk
                  SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/include/python2.7/Python.h
                  SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/lib/python2.7/config/
SDKMACHINE=i686 MACHINE=qemux86-64 bitbake gdb-cross-canadian-x86-64
  STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-x86_64/sysroots/i686-oesdk-linux/usr/lib/x86_64-oe-linux"
  STAGING_INCDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-x86_64/sysroots/i686-oesdk-linux/usr/include"
                                   NATIVESDK_LIBDIR="/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/lib"
                                   NATIVESDK_INCDIR="/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/include"

SDKMACHINE=i686 MACHINE=qemuarm bitbake python-nativesdk
                  SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/include/python2.7/Python.h
                  SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/lib/python2.7/config/
SDKMACHINE=i686 MACHINE=qemuarm bitbake gdb-cross-canadian-arm
  STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-arm/sysroots/i686-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"
  STAGING_INCDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-arm/sysroots/i686-oesdk-linux/usr/include"
                                   NATIVESDK_LIBDIR="/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/lib"
                                   NATIVESDK_INCDIR="/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/usr/include"

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Richard Purdie]

On Sat, 2012-02-25 at 01:05 +0100, Martin Jansa wrote:
> On Thu, Feb 23, 2012 at 10:27:53AM +0000, Richard Purdie wrote:
> > On Mon, 2012-02-13 at 16:40 +0100, Martin Jansa wrote:
> > > * seems like config/config in -L was also wrong
> > > 
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > >  meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
> > >  1 files changed, 8 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > index b5746ce..bac63b7 100644
> > > --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
> > >  
> > >  EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
> > >  
> > > +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> > > +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
> > > +NATIVESDK_PATHNATIVE = "${NATIVESDK_PATH}/sysroots/${SDK_SYS}"
> > > +NATIVESDK_LIBDIR = "${NATIVESDK_PATHNATIVE}${libdir_nativesdk}"
> > > +NATIVESDK_INCLUDEDIR = "${NATIVESDK_PATHNATIVE}${includedir_nativesdk}"
> > > +
> > >  do_configure_prepend() {
> > >  cat > ${WORKDIR}/python << EOF
> > >  #! /bin/sh
> > >  case "\$2" in
> > > -        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
> > > -        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > > +        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
> > > +        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > >          --exec-prefix) echo "/usr" ;;
> > >          *) exit 1 ;;
> > >  esac
> > 
> > I made some experiments with "bitbake gdb-cross-canadian-x86-64 -e" and
> > it seems to me that:
> > 
> >        --includes) echo "-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}/" ;;
> >        --ldflags) echo "-L${STAGING_LIBDIR}/../python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > 
> > should work ok here?
> 
> No it's not the same.
> 
> With default oe-core settings it behaves like this:
> 
> python-nativesdk is staged in the same directory for all 3 MACHINEs I
> was using for test (qemuarm, qemux86, qemux86-64)
> 
> SDKMACHINE=i686:   SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/
> SDKMACHINE=x86-64: SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux
> 
> while STAGING_INCDIR is different for each machine
> SDKMACHINE=i686:
>   STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-i586/sysroots/i686-oesdk-linux/usr/lib/i586-oe-linux"
>   STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-x86_64/sysroots/i686-oesdk-linux/usr/lib/x86_64-oe-linux"
>   STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-arm/sysroots/i686-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"
> SDKMACHINE=x86-64:
>   STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-i586/sysroots/x86_64-oesdk-linux/usr/lib/i586-oe-linux"
>   STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/x86_64-oe-linux"
>   STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-arm/sysroots/x86_64-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"
> 
> notice that not only SDK_NAME tripple is changing
> SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"
> so we keep it the same across all MACHINES with:
> NATIVESDK_SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${SDK_ARCH}"
> 
> but also toplevel SYSROOT is different
> i686-nativesdk-oesdk-linux
> i686-oesdk-linux-nativesdk
> and
> x86_64-nativesdk-oesdk-linux
> x86_64-oesdk-linux-nativesdk
> 
> So nativesdk staging is broken and python-nativesdk should be staged
> separately for each SDK_ARCH/TARGET_ARCH combination or we need those
> NATIVESDK_SDK_NAME variables for cross-canadian -> nativesdk deps.

All becomes clear now. 

I seem to remember strongly disagreeing with:

SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
SDKPATH = "/usr/local/${SDK_NAME}"

that is in bitbake.conf but probably wasn't able to articulate why at
the time. You'll note that poky.conf does:

SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"

so the SDKPATH is not dependent on TARGET_ARCH. It doesn't need to
depend on SDK_ARCH either although that is not the problematic part
here.

If you think about what is happening, bitbake will reuse the sstate
files for each nativesdk, they are meant to be equivalent for each
SDKMACHINE. If you hardcode TARGET_ARCH into the path, they are not.

So I'd say that SDKPATH containing SDK_NAME is clearly bogus and
TARGET_ARCH needs to be removed in somehow at the very least. Fix that
and your problems should go away. The patches you're sending don't fix
the root problem though.

Cheers,

Richard

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Martin Jansa]

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

On Sat, Feb 25, 2012 at 01:02:48AM +0000, Richard Purdie wrote:
> On Sat, 2012-02-25 at 01:05 +0100, Martin Jansa wrote:
> > On Thu, Feb 23, 2012 at 10:27:53AM +0000, Richard Purdie wrote:
> > > On Mon, 2012-02-13 at 16:40 +0100, Martin Jansa wrote:
> > > > * seems like config/config in -L was also wrong
> > > > 
> > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > > ---
> > > >  meta/recipes-devtools/gdb/gdb-cross-canadian.inc |   10 ++++++++--
> > > >  1 files changed, 8 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > > index b5746ce..bac63b7 100644
> > > > --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > > +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
> > > > @@ -10,12 +10,18 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
> > > >  
> > > >  EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
> > > >  
> > > > +NATIVESDK_NAME = "oecore-${SDK_ARCH}-${SDK_ARCH}"
> > > > +NATIVESDK_PATH = "/usr/local/${NATIVESDK_NAME}"
> > > > +NATIVESDK_PATHNATIVE = "${NATIVESDK_PATH}/sysroots/${SDK_SYS}"
> > > > +NATIVESDK_LIBDIR = "${NATIVESDK_PATHNATIVE}${libdir_nativesdk}"
> > > > +NATIVESDK_INCLUDEDIR = "${NATIVESDK_PATHNATIVE}${includedir_nativesdk}"
> > > > +
> > > >  do_configure_prepend() {
> > > >  cat > ${WORKDIR}/python << EOF
> > > >  #! /bin/sh
> > > >  case "\$2" in
> > > > -        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
> > > > -        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > > > +        --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
> > > > +        --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > > >          --exec-prefix) echo "/usr" ;;
> > > >          *) exit 1 ;;
> > > >  esac
> > > 
> > > I made some experiments with "bitbake gdb-cross-canadian-x86-64 -e" and
> > > it seems to me that:
> > > 
> > >        --includes) echo "-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}/" ;;
> > >        --ldflags) echo "-L${STAGING_LIBDIR}/../python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
> > > 
> > > should work ok here?
> > 
> > No it's not the same.
> > 
> > With default oe-core settings it behaves like this:
> > 
> > python-nativesdk is staged in the same directory for all 3 MACHINEs I
> > was using for test (qemuarm, qemux86, qemux86-64)
> > 
> > SDKMACHINE=i686:   SYSROOTS/i686-nativesdk-oesdk-linux/usr/local/oecore-i686-i686/sysroots/i686-oesdk-linux/
> > SDKMACHINE=x86-64: SYSROOTS/x86_64-nativesdk-oesdk-linux/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux
> > 
> > while STAGING_INCDIR is different for each machine
> > SDKMACHINE=i686:
> >   STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-i586/sysroots/i686-oesdk-linux/usr/lib/i586-oe-linux"
> >   STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-x86_64/sysroots/i686-oesdk-linux/usr/lib/x86_64-oe-linux"
> >   STAGING_LIBDIR="SYSROOTS/i686-oesdk-linux-nativesdk/usr/local/oecore-i686-arm/sysroots/i686-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"
> > SDKMACHINE=x86-64:
> >   STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-i586/sysroots/x86_64-oesdk-linux/usr/lib/i586-oe-linux"
> >   STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-x86_64/sysroots/x86_64-oesdk-linux/usr/lib/x86_64-oe-linux"
> >   STAGING_LIBDIR="SYSROOTS/x86_64-oesdk-linux-nativesdk/usr/local/oecore-x86_64-arm/sysroots/x86_64-oesdk-linux/usr/lib/armv5te-oe-linux-gnueabi"
> > 
> > notice that not only SDK_NAME tripple is changing
> > SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"
> > so we keep it the same across all MACHINES with:
> > NATIVESDK_SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${SDK_ARCH}"
> > 
> > but also toplevel SYSROOT is different
> > i686-nativesdk-oesdk-linux
> > i686-oesdk-linux-nativesdk
> > and
> > x86_64-nativesdk-oesdk-linux
> > x86_64-oesdk-linux-nativesdk
> > 
> > So nativesdk staging is broken and python-nativesdk should be staged
> > separately for each SDK_ARCH/TARGET_ARCH combination or we need those
> > NATIVESDK_SDK_NAME variables for cross-canadian -> nativesdk deps.
> 
> All becomes clear now. 
> 
> I seem to remember strongly disagreeing with:
> 
> SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
> SDKPATH = "/usr/local/${SDK_NAME}"
> 
> that is in bitbake.conf but probably wasn't able to articulate why at
> the time. You'll note that poky.conf does:
> 
> SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
> SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
> SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
> 
> so the SDKPATH is not dependent on TARGET_ARCH. It doesn't need to
> depend on SDK_ARCH either although that is not the problematic part
> here.
> 
> If you think about what is happening, bitbake will reuse the sstate
> files for each nativesdk, they are meant to be equivalent for each
> SDKMACHINE. If you hardcode TARGET_ARCH into the path, they are not.

I'll update my first patch to remove TARGET_ARCH, I'm testing
SDKPATH = "/usr/local/${SDK_NAME_PREFIX}"
now, then we still have to deal with different toplevel SYSROOT (if we
want to use STAGING_LIBDIR etc).

x86_64-nativesdk-oesdk-linux (python-nativesdk)
x86_64-oesdk-linux-nativesdk (gdb-cross-canadian-*)

And that looks even more like another wrong variable to me, but as I've
said in 1st thread (SDK confusion) I normaly don't build SDKs so maybe
there are hidden reasons to stage them in different dirs.

I can use Eric's
${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}
to look into right sysroot, but maybe it's again not right direction.

> So I'd say that SDKPATH containing SDK_NAME is clearly bogus and
> TARGET_ARCH needs to be removed in somehow at the very least. Fix that
> and your problems should go away. 

Not really but it's getting better :).

> The patches you're sending don't fix the root problem though.

Originaly they were meant mostly to show the difference between
nativesdk and cross-canadian paths.. so I'm not much surprised :).

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/4] gdb-cross-canadian: use NATIVESDK paths as it happens to be here

[Richard Purdie]

On Sat, 2012-02-25 at 14:12 +0100, Martin Jansa wrote:
> On Sat, Feb 25, 2012 at 01:02:48AM +0000, Richard Purdie wrote:
> > I seem to remember strongly disagreeing with:
> > 
> > SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
> > SDKPATH = "/usr/local/${SDK_NAME}"
> > 
> > that is in bitbake.conf but probably wasn't able to articulate why at
> > the time. You'll note that poky.conf does:
> > 
> > SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
> > SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
> > SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
> > 
> > so the SDKPATH is not dependent on TARGET_ARCH. It doesn't need to
> > depend on SDK_ARCH either although that is not the problematic part
> > here.
> > 
> > If you think about what is happening, bitbake will reuse the sstate
> > files for each nativesdk, they are meant to be equivalent for each
> > SDKMACHINE. If you hardcode TARGET_ARCH into the path, they are not.
> 
> I'll update my first patch to remove TARGET_ARCH, I'm testing
> SDKPATH = "/usr/local/${SDK_NAME_PREFIX}"
> now, then we still have to deal with different toplevel SYSROOT (if we
> want to use STAGING_LIBDIR etc).

Ok, we need to do this one step at a time :)

> x86_64-nativesdk-oesdk-linux (python-nativesdk)
> x86_64-oesdk-linux-nativesdk (gdb-cross-canadian-*)

This looks broken, the python-nativesdk looks right, the cross-canadian
one looks wrong.

Thinking further, cross-candian is never used from staging. Its
therefore entirely possible the path is just totally broken in
cross-canadian.bbclass. We can probably do something like:

-STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
+STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"

> And that looks even more like another wrong variable to me, but as I've
> said in 1st thread (SDK confusion) I normaly don't build SDKs so maybe
> there are hidden reasons to stage them in different dirs.
> 
> I can use Eric's
> ${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}
> to look into right sysroot, but maybe it's again not right direction.
> 
> > So I'd say that SDKPATH containing SDK_NAME is clearly bogus and
> > TARGET_ARCH needs to be removed in somehow at the very least. Fix that
> > and your problems should go away. 
> 
> Not really but it's getting better :).
> 
> > The patches you're sending don't fix the root problem though.
> 
> Originaly they were meant mostly to show the difference between
> nativesdk and cross-canadian paths.. so I'm not much surprised :).

Hopefully with the above we can resolve this!

Cheers,

Richard