* [CONSOLIDATED PULL (Updated) 01/15] gcc: use ${base_lib} to match gcc default configuration
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 02/15] gst-plugins: partially sync packaging with OE .dev Saul Wold
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
Rather than tweaking MULTILIB_DIRNAMES & MULTILIB_OSDIRNAMES like is
done for x86-64 via 64bithack.patch. We can just go with gcc defaults
and utilize ${base_lib} for where to find gcc libs.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
.../gcc/gcc-cross-intermediate.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index df5958a..7b1bb38 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -34,7 +34,7 @@ do_compile () {
do_install () {
oe_runmake 'DESTDIR=${D}' install
install -d ${D}${target_base_libdir}/
- mv ${D}${exec_prefix}/${TARGET_SYS}/lib/* ${D}${target_base_libdir}/
+ mv ${D}${exec_prefix}/${TARGET_SYS}/${baselib}/* ${D}${target_base_libdir}/
# We don't really need this (here shares/ contains man/, info/, locale/).
rm -rf ${D}${datadir}/
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 02/15] gst-plugins: partially sync packaging with OE .dev
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 01/15] gcc: use ${base_lib} to match gcc default configuration Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 03/15] python-native: Fix a compiler finding issue Saul Wold
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
Gst-plugins get 2 extra packages:
${PN}-apps: helper apps in ${bindir}
${PN}-meta: meta package that will drag in all plugins, libs and apps ${PN} generates
And all libs are split out and run through debian style renaming if enabled.
The packaging include was split out to be reused by external plugins (e.g. gst-plugin-gl, gst-fluendo-*).
The new package list looks like:
libgstapp-0.10-0_0.10.32-r1_armv7a.ipk
libgstfft-0.10-0_0.10.32-r1_armv7a.ipk
[..]
gst-plugins-base-videorate_0.10.32-r1_armv7a.ipk
gst-plugins-base-videoscale_0.10.32-r1_armv7a.ipk
[..]
gst-plugins-base-meta_0.10.32-r1_armv7a.ipk
[..]
gst-plugins-base-apps_0.10.32-r1_armv7a.ipk
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../gstreamer/gst-plugins-bad_0.10.21.bb | 2 +-
.../gstreamer/gst-plugins-base_0.10.32.bb | 2 +-
.../gstreamer/gst-plugins-good_0.10.28.bb | 2 +-
.../gstreamer/gst-plugins-package.inc | 34 ++++++++++++++++++++
.../gstreamer/gst-plugins-ugly_0.10.17.bb | 2 +-
meta/recipes-multimedia/gstreamer/gst-plugins.inc | 18 +---------
6 files changed, 40 insertions(+), 20 deletions(-)
create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb
index 2b8a89c..a7023e3 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg"
-PR = "r0"
+PR = "r1"
inherit gettext
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
index a9e2b52..82d9afc 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
@@ -13,7 +13,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
SRC_URI[md5sum] = "2920af2b3162f3d9fbaa7fabc8ed4d38"
SRC_URI[sha256sum] = "e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b"
-PR = "r0"
+PR = "r1"
inherit gettext
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
index b9648e3..cca63e9 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.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"
-PR = "r0"
+PR = "r1"
inherit gettext
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
new file mode 100644
index 0000000..796df14
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -0,0 +1,34 @@
+LIBV = "0.10"
+
+python populate_packages_prepend () {
+ gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
+ postinst = bb.data.getVar('plugin_postinst', d, 1)
+ glibdir = bb.data.expand('${libdir}', d)
+
+ do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
+ do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', bb.data.expand('${PN}-%s', d), 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d))
+ do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', bb.data.expand('${PN}-%s-dev', d), 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d))
+
+ pn = bb.data.getVar('PN', d, 1)
+ metapkg = pn + '-meta'
+ bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
+ bb.data.setVar('FILES_' + metapkg, "", d)
+ blacklist = [ pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc' ]
+ metapkg_rdepends = []
+ packages = bb.data.getVar('PACKAGES', d, 1).split()
+ for pkg in packages[1:]:
+ if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-static'):
+ metapkg_rdepends.append(pkg)
+ bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+ bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d)
+}
+
+ALLOW_EMPTY = "1"
+
+PACKAGES += "${PN}-apps ${PN}-meta"
+FILES_${PN}-apps = "${bindir}"
+
+FILES_${PN} = "${datadir}/gstreamer-${LIBV}"
+FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
+
+
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb
index 76e00a5..2a79c2a 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb
@@ -7,7 +7,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/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index ad6c3a4..b23d399 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -14,13 +14,6 @@ EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-LIBV = "0.10"
-#FILES_${PN} += "${libdir}/gstreamer-${LIBV}/*.so"
-#FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/*.la ${libdir}/gstreamer-${LIBV}/*.a"
-FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
-
-PACKAGES_DYNAMIC = "${PN}-*"
-
# orc.m4 calls pkg-config ----variable=orcc orc-0.4 to get the path to orcc,
# resulting in /usr/bin/orcc. Force it to use the staged orcc.
do_configure_append() {
@@ -29,14 +22,7 @@ do_configure_append() {
done
}
-python populate_packages_prepend () {
- gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
- postinst = bb.data.getVar('plugin_postinst', d, 1)
+require gst-plugins-package.inc
-# Can't package separate debug packages yet
-# do_split_packages(d, gst_libdir, '\.debug/libgst(.*)\.so$', bb.data.expand('${PN}-%s-dbg', d), 'GStreamer plugin for %s (with debugging symbols)', recursive=True, extra_depends=bb.data.expand('${PN}-dbg', d), match_path=True)
- do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', bb.data.expand('${PN}-%s', d), 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d))
- do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', bb.data.expand('${PN}-%s-dev', d), 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d))
-}
+PACKAGES_DYNAMIC = "${PN}-*"
-ALLOW_EMPTY = "1"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 03/15] python-native: Fix a compiler finding issue
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 01/15] gcc: use ${base_lib} to match gcc default configuration Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 02/15] gst-plugins: partially sync packaging with OE .dev Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 04/15] apr-util: disable pqsql support to avoid configure error Saul Wold
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Mei Lei <lei.mei@intel.com>
The CC variable sometimes add option information after compiler name, but python can't get the real compiler name if those information added.
Fix this issue by dropping the option information when finding compiler name.
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
.../python/python-native/unixccompiler.patch | 20 ++++++++++++++++++++
.../recipes-devtools/python/python-native_2.6.6.bb | 3 ++-
2 files changed, 22 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/python/python-native/unixccompiler.patch
diff --git a/meta/recipes-devtools/python/python-native/unixccompiler.patch b/meta/recipes-devtools/python/python-native/unixccompiler.patch
new file mode 100644
index 0000000..10a9baf
--- /dev/null
+++ b/meta/recipes-devtools/python/python-native/unixccompiler.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+# The CC variable,sometimes like:"x86_64-poky-linux-gcc -m64 --sysroot=/${TMPDIR}/sysroots/qemux86-64", contains option information.
+# This will lead to wrong compiler name "qemux86-64" rather than "x86_64-poky-linux-gcc" when python finding the compiler name.
+
+#Signed-off-by: Mei Lei <lei.mei@intel.com>
+
+diff --git Python-2.6.6/Lib/distutils/unixccompiler.py Python-2.6.6/Lib/distutils/unixccompiler.py
+index 6d0b84d..aaf49cb 100644
+--- Python-2.6.6/Lib/distutils/unixccompiler.py
++++ Python-2.6.6/Lib/distutils/unixccompiler.py
+@@ -282,7 +282,7 @@ class UnixCCompiler(CCompiler):
+ # this time, there's no way to determine this information from
+ # the configuration data stored in the Python installation, so
+ # we use this hack.
+- compiler = os.path.basename(sysconfig.get_config_var("CC"))
++ compiler = os.path.basename(sysconfig.get_config_var("CC").split()[0])
+ if sys.platform[:6] == "darwin":
+ # MacOSX's linker doesn't understand the -R flag at all
+ return "-L" + dir
diff --git a/meta/recipes-devtools/python/python-native_2.6.6.bb b/meta/recipes-devtools/python/python-native_2.6.6.bb
index 59ed61a..2b00d32 100644
--- a/meta/recipes-devtools/python/python-native_2.6.6.bb
+++ b/meta/recipes-devtools/python/python-native_2.6.6.bb
@@ -1,6 +1,6 @@
require python.inc
DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
@@ -12,6 +12,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
file://11-distutils-never-modify-shebang-line.patch \
file://12-distutils-prefix-is-inside-staging-area.patch \
file://debug.patch \
+ file://unixccompiler.patch \
file://nohostlibs.patch"
S = "${WORKDIR}/Python-${PV}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 04/15] apr-util: disable pqsql support to avoid configure error
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (2 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 03/15] python-native: Fix a compiler finding issue Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 05/15] gtk-icon-cache bbclass: don't assing to global RDEPENDS Saul Wold
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Mei Lei <lei.mei@intel.com>
The pqsql config script will check host path and add host paths to compiler and linker options:
adding "-I/usr/include/postgresql" to CPPFLAGS
adding "-L/usr/lib" to LDFLAGS
Disable pqsql support since we didn't use this feature in other recipes.
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
meta/recipes-support/apr/apr-util_1.3.12.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/apr/apr-util_1.3.12.bb b/meta/recipes-support/apr/apr-util_1.3.12.bb
index 6635202..800e67e 100644
--- a/meta/recipes-support/apr/apr-util_1.3.12.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.12.bb
@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
-PR = "r0"
+PR = "r1"
SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
file://configfix.patch \
@@ -18,6 +18,7 @@ SRC_URI[sha256sum] = "815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241
EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
--without-odbc \
+ --without-pgsql \
--with-dbm=gdbm \
--with-gdbm=${STAGING_DIR_HOST}${prefix} \
--without-sqlite2 \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 05/15] gtk-icon-cache bbclass: don't assing to global RDEPENDS
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (3 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 04/15] apr-util: disable pqsql support to avoid configure error Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 06/15] gdb: Update to 7.3 Saul Wold
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
Only the package with the icons needs it
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/classes/gtk-icon-cache.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 4142d0e..5d8ef34 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -37,9 +37,9 @@ python populate_packages_append () {
continue
bb.note("adding hicolor-icon-theme dependency to %s" % pkg)
- rdepends = bb.data.getVar('RDEPENDS', d, 1)
+ rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)
rdepends += "hicolor-icon-theme"
- bb.data.setVar('RDEPENDS', rdepends, d)
+ bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)
bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 06/15] gdb: Update to 7.3
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (4 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 05/15] gtk-icon-cache bbclass: don't assing to global RDEPENDS Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 07/15] liburcu: Update to 0.6.4 Saul Wold
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
This has one upstream patch removed and a couple rebased
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gdb/gdb-common.inc | 8 +++-
...s-canadian_7.2.bb => gdb-cross-canadian_7.3.bb} | 2 +-
.../gdb/{gdb-cross_7.2.bb => gdb-cross_7.3.bb} | 2 +-
meta/recipes-devtools/gdb/gdb.inc | 2 +-
.../fix_for_build_error_internal_error_call.patch | 20 -----------
.../gdb/gdb/gdbserver-cflags-last.diff | 16 +++++----
.../gdb/gdb/kill_arm_map_symbols.patch | 36 ++++++++++----------
.../gdb/{gdb_7.2.bb => gdb_7.3.bb} | 4 +--
8 files changed, 37 insertions(+), 53 deletions(-)
rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.2.bb => gdb-cross-canadian_7.3.bb} (87%)
rename meta/recipes-devtools/gdb/{gdb-cross_7.2.bb => gdb-cross_7.3.bb} (83%)
delete mode 100644 meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch
rename meta/recipes-devtools/gdb/{gdb_7.2.bb => gdb_7.3.bb} (68%)
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 8ec3735..df6c70f 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -2,7 +2,9 @@ DESCRIPTION = "gdb - GNU debugger"
HOMEPAGE = "http://www.gnu.org/software/gdb/"
LICENSE="GPLv3+"
SECTION = "devel"
-DEPENDS = "ncurses readline elfutils"
+DEPENDS = "ncurses readline elfutils lttng-ust"
+
+INC_PR = "r2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
@@ -13,6 +15,9 @@ inherit autotools
SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
file://no-werror.patch"
+SRC_URI[md5sum] = "1d6b4e469270433583ef62a906c02fa8"
+SRC_URI[sha256sum] = "d1791d1f9d6c21ec265f4f74dadc15bc35698158a1b836d1626b9a69b818f5c5"
+
export CC_FOR_BUILD = "${BUILD_CC}"
export CXX_FOR_BUILD = "${BUILD_CXX}"
export CPP_FOR_BUILD = "${BUILD_CPP}"
@@ -29,7 +34,6 @@ EXPAT = "--without-expat"
EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
--with-curses --disable-multilib --with-system-readline --disable-sim \
${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \
- --without-ust \
"
GDBPROPREFIX = "--program-prefix=''"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
similarity index 87%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
index ca44b3c..58c20c4 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
@@ -1,7 +1,7 @@
require gdb-common.inc
require gdb-cross-canadian.inc
-PR = "r1"
+PR = "${INC_PR}.0"
GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
EXPAT = "--with-expat"
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross_7.3.bb
similarity index 83%
rename from meta/recipes-devtools/gdb/gdb-cross_7.2.bb
rename to meta/recipes-devtools/gdb/gdb-cross_7.3.bb
index b5a8bea..9c2ed07 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.2.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.3.bb
@@ -3,4 +3,4 @@ require gdb-cross.inc
SRC_URI += "file://sim-install-6.6.patch;patch=1"
EXPAT = "--with-expat"
-PR = "r0"
+PR = "${INC_PR}.0"
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index efa3cbf..9f5f34f 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -4,7 +4,7 @@ inherit gettext
SRC_URI += "file://kill_arm_map_symbols.patch \
file://gdbserver-cflags-last.diff;striplevel=0 \
- file://fix_for_build_error_internal_error_call.patch "
+ "
#LDFLAGS_append = " -s"
#export CFLAGS_append=" -L${STAGING_LIBDIR}"
diff --git a/meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch b/meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch
deleted file mode 100644
index afb1783..0000000
--- a/meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-
-The prototype of function internall_error has changed. And one place in the code was not synced up with the new prototype, causing build error. This patche fixes that.
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-2010/11/12
-
-Index: gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
-===================================================================
---- gdb-7.2.orig/gdb/gdbserver/linux-i386-ipa.c
-+++ gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
-@@ -178,7 +178,7 @@ supply_static_tracepoint_registers (stru
- }
- break;
- default:
-- internal_error ("unhandled register size: %d",
-+ internal_error (__FILE__, __LINE__, "unhandled register size: %d",
- i386_st_collect_regmap[i].size);
- }
- }
diff --git a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
index 0475a42..8256f17 100644
--- a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
+++ b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
@@ -2,16 +2,18 @@ Upstream-Status: Pending
Index: gdb/gdbserver/Makefile.in
===================================================================
---- gdb/gdbserver/Makefile.in.orig
-+++ gdb/gdbserver/Makefile.in
-@@ -89,8 +89,8 @@ WARN_CFLAGS = -Wall
+--- gdb/gdbserver/Makefile.in.orig 2011-03-09 23:32:02.000000000 -0800
++++ gdb/gdbserver/Makefile.in 2011-08-05 21:16:43.592202579 -0700
+@@ -94,10 +94,10 @@
CFLAGS = @CFLAGS@
# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
--INTERNAL_CFLAGS = $(WARN_CFLAGS) ${CFLAGS} ${GLOBAL_CFLAGS} \
-- ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}
-+INTERNAL_CFLAGS = $(WARN_CFLAGS) ${GLOBAL_CFLAGS} \
-+ ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CFLAGS}
+-INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \
++INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \
+ ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}
+ INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
+-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS)
++INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS}
# LDFLAGS is specifically reserved for setting from the command line
# when running make.
diff --git a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
index c1756f7..9fc45b9 100644
--- a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
+++ b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
@@ -1,26 +1,26 @@
Upstream-Status: Inappropriate [embedded specific]
-Index: gdb-6.3/gdb/arm-tdep.c
+Index: gdb-7.3/gdb/arm-tdep.c
===================================================================
---- gdb-6.3.orig/gdb/arm-tdep.c 2004-08-03 02:02:20.000000000 +0000
-+++ gdb-6.3/gdb/arm-tdep.c 2005-11-09 15:13:29.000000000 +0000
-@@ -2491,6 +2491,19 @@
+--- gdb-7.3.orig/gdb/arm-tdep.c 2011-05-17 14:27:01.000000000 -0700
++++ gdb-7.3/gdb/arm-tdep.c 2011-08-05 22:29:58.784201850 -0700
+@@ -7806,6 +7806,19 @@
static void
arm_elf_make_msymbol_special(asymbol *sym, struct minimal_symbol *msym)
{
+
-+ /* FIXME: We want gdb to ignore the ARM ELF mapping symbols when
-+ displaying disassembly so we use this horrible hack here to
-+ artifically set their address to the highest possible value.
-+ This is wrong of course, and it prevents the symbols from being
-+ used for their intended purpose - to distinguish between ARM
-+ and THUMB code. So we ought to find a better way to do this. */
-+ if (bfd_asymbol_name (sym)
-+ && bfd_asymbol_name (sym)[0] == '$'
-+ && bfd_asymbol_name (sym)[1] != 0
-+ && bfd_asymbol_name (sym)[2] == 0)
-+ SYMBOL_VALUE_ADDRESS(msym) = (CORE_ADDR) 0x7ffffffc;
++ /* FIXME: We want gdb to ignore the ARM ELF mapping symbols when
++ displaying disassembly so we use this horrible hack here to
++ artifically set their address to the highest possible value.
++ This is wrong of course, and it prevents the symbols from being
++ used for their intended purpose - to distinguish between ARM
++ and THUMB code. So we ought to find a better way to do this. */
++ if (bfd_asymbol_name (sym)
++ && bfd_asymbol_name (sym)[0] == '$'
++ && bfd_asymbol_name (sym)[1] != 0
++ && bfd_asymbol_name (sym)[2] == 0)
++ SYMBOL_VALUE_ADDRESS(msym) = (CORE_ADDR) 0x7ffffffc;
+
- /* Thumb symbols are of type STT_LOPROC, (synonymous with
- STT_ARM_TFUNC). */
- if (ELF_ST_TYPE (((elf_symbol_type *)sym)->internal_elf_sym.st_info)
+ if (ARM_SYM_BRANCH_TYPE (&((elf_symbol_type *)sym)->internal_elf_sym)
+ == ST_BRANCH_TO_THUMB)
+ MSYMBOL_SET_SPECIAL (msym);
diff --git a/meta/recipes-devtools/gdb/gdb_7.2.bb b/meta/recipes-devtools/gdb/gdb_7.3.bb
similarity index 68%
rename from meta/recipes-devtools/gdb/gdb_7.2.bb
rename to meta/recipes-devtools/gdb/gdb_7.3.bb
index 501efb4..5e21858 100644
--- a/meta/recipes-devtools/gdb/gdb_7.2.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.3.bb
@@ -4,7 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
-PR = "r0"
+PR = "${INC_PR}.0"
-SRC_URI[md5sum] = "950b766466bee748e554765c86b8b495"
-SRC_URI[sha256sum] = "34919cb51334c8149ae36ed086f35e79fe3fa2b2a85b568d7c0edad20cd972d4"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 07/15] liburcu: Update to 0.6.4
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (5 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 06/15] gdb: Update to 7.3 Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 08/15] lttng-ust: Update to 0.15 Saul Wold
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../liburcu/{liburcu_0.5.4.bb => liburcu_0.6.4.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/liburcu/{liburcu_0.5.4.bb => liburcu_0.6.4.bb} (72%)
diff --git a/meta/recipes-support/liburcu/liburcu_0.5.4.bb b/meta/recipes-support/liburcu/liburcu_0.6.4.bb
similarity index 72%
rename from meta/recipes-support/liburcu/liburcu_0.5.4.bb
rename to meta/recipes-support/liburcu/liburcu_0.6.4.bb
index b83d708..3f0596e 100644
--- a/meta/recipes-support/liburcu/liburcu_0.5.4.bb
+++ b/meta/recipes-support/liburcu/liburcu_0.6.4.bb
@@ -5,14 +5,14 @@ BUGTRACKER = "n/a"
LICENSE = "LGPLv2.1+ & MIT-style"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b472dc110d38774921e1d5ccb0065fff \
file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \
- file://urcu/uatomic_arch_x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42"
+ file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42"
PR = "r0"
SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2"
-SRC_URI[md5sum] = "04147d24749be75200173859839207f7"
-SRC_URI[sha256sum] = "02aedbb16c16bd034e246d5c9637a9232be559c66fc2fe4eb28948e234bd89f1"
+SRC_URI[md5sum] = "39ec317ef5af3ea167429f3eb2a93081"
+SRC_URI[sha256sum] = "2914637c60027ea52974aa7fa8ee7f2a3a0067502bbaebe01de14d6988aa8882"
S = "${WORKDIR}/userspace-rcu-${PV}"
CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 08/15] lttng-ust: Update to 0.15
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (6 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 07/15] liburcu: Update to 0.6.4 Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 09/15] lttng-control: Update to 0.89 Saul Wold
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
This address [YOCTO #1005] which was waiting for upstream updates
from the lttng and GDB teams.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../lttng/lttng-ust/uclibc-sched_getcpu.patch | 50 --------------------
meta/recipes-kernel/lttng/lttng-ust_0.15.bb | 31 ++++++++++++
2 files changed, 31 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.15.bb
diff --git a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
deleted file mode 100644
index f4ea196..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-uClibc does not have sched_getcpu() implemented. So we create a wrapper
-to getcpu syscall when compiling for uclibc.
-
-So far execinfo.h does not exist on uclibc but it turns out to be that
-this header is not needed even in eglibc case so it can be removed
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Accepted
-
-Index: ust-0.12/libust/tracer.h
-===================================================================
---- ust-0.12.orig/libust/tracer.h
-+++ ust-0.12/libust/tracer.h
-@@ -342,14 +342,22 @@ static __inline__ void ltt_write_trace_h
- header->start_freq = trace->start_freq;
- header->freq_scale = trace->freq_scale;
- }
--
-+#ifdef __UCLIBC__
-+#define sched_getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache)
-+#endif
- #ifndef UST_VALGRIND
-
- static __inline__ int ust_get_cpu(void)
- {
- int cpu;
-
-+#ifdef __UCLIBC__
-+ int c, s;
-+ s = syscall(__NR_getcpu, &c, NULL, NULL);
-+ cpu = (s == -1) ? s : c;
-+#else
- cpu = sched_getcpu();
-+#endif
- if (likely(cpu >= 0))
- return cpu;
- /*
-Index: ust-0.12/libustcomm/ustcomm.c
-===================================================================
---- ust-0.12.orig/libustcomm/ustcomm.c
-+++ ust-0.12/libustcomm/ustcomm.c
-@@ -31,7 +31,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <execinfo.h>
-
- #include "ustcomm.h"
- #include "usterr.h"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.15.bb b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
new file mode 100644
index 0000000..915e619
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Linux Trace Toolkit Userspace Tracer"
+DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code"
+HOMEPAGE = "http://lttng.org/ust"
+BUGTRACKER = "n/a"
+
+LICENSE = "LGPLv2.1+ & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+ file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
+ file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
+
+DEPENDS = "liburcu"
+
+PR = "r2"
+
+SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "86c71486a70695dc0b2171ad16fc82b3"
+SRC_URI[sha256sum] = "7ff7ecdc051c0649d5fd21b5ceff4895ca95dc34f14cdc04e50de13cfd1903c5"
+
+
+S = "${WORKDIR}/ust-${PV}"
+
+inherit autotools
+
+#EXTRA_OECONF = "ac_cv_lib_urcu_bp_synchronize_rcu_bp=no"
+
+# Due to liburcu not building on MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 09/15] lttng-control: Update to 0.89
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (7 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 08/15] lttng-ust: Update to 0.15 Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 10/15] gtk-icon-cache: fix RDEPENDS append bug Saul Wold
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
...lttng-control_0.88.bb => lttng-control_0.89.bb} | 6 ++--
meta/recipes-kernel/lttng/lttng-ust_0.12.bb | 30 --------------------
2 files changed, 3 insertions(+), 33 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-control_0.88.bb => lttng-control_0.89.bb} (77%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.12.bb
diff --git a/meta/recipes-kernel/lttng/lttng-control_0.88.bb b/meta/recipes-kernel/lttng/lttng-control_0.89.bb
similarity index 77%
rename from meta/recipes-kernel/lttng/lttng-control_0.88.bb
rename to meta/recipes-kernel/lttng/lttng-control_0.89.bb
index dee960f..77314c8 100644
--- a/meta/recipes-kernel/lttng/lttng-control_0.88.bb
+++ b/meta/recipes-kernel/lttng/lttng-control_0.89.bb
@@ -7,12 +7,12 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
PR = "r0"
-LTTDATE = "09242010"
+LTTDATE = "05122011"
SRC_URI = "http://lttng.org/files/lttng/ltt-control-${PV}-${LTTDATE}.tar.gz"
-SRC_URI[md5sum] = "ca81d874352756837518d74c9d1091a7"
-SRC_URI[sha256sum] = "89c625a4d1b0823954217df232a31f3cae31de7b6655c0d885a61bece0dfcd88"
+SRC_URI[md5sum] = "2e5a531bf5cab88eef5282b45271789f"
+SRC_URI[sha256sum] = "feb120e0bedd9ef8917dd14ee96cc94941f517826a4c2035d1c4aa33e4e808ab"
S = "${WORKDIR}/ltt-control-${PV}-${LTTDATE}"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb
deleted file mode 100644
index 5fca949..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Linux Trace Toolkit Userspace Tracer"
-DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code"
-HOMEPAGE = "http://lttng.org/ust"
-BUGTRACKER = "n/a"
-
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
- file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
- file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
-
-DEPENDS = "liburcu"
-
-PR = "r0"
-
-SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz \
- file://uclibc-sched_getcpu.patch \
- "
-
-SRC_URI[md5sum] = "fae6e324a56016658c5b83ec14ba0043"
-SRC_URI[sha256sum] = "215b05f47d0c9e3a2934926a7d14fa9c67025db917c3a1f641df40b08314ab0c"
-
-S = "${WORKDIR}/ust-${PV}"
-
-inherit autotools
-
-# Due to liburcu not building on MIPS currently this recipe needs to
-# be limited also.
-# So here let us first suppport x86/arm/powerpc platforms now.
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
-
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 10/15] gtk-icon-cache: fix RDEPENDS append bug
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (8 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 09/15] lttng-control: Update to 0.89 Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 11/15] linux-yocto: pass KMACHINE to updateme, not MACHINE Saul Wold
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
python += doesn't add a leading space, which we do need:
| Collected errors:
| * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-gnome-themes:
| * gnome-icon-themehicolor-icon-theme *
| * opkg_install_cmd: Cannot install package task-gnome-themes.
| * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-gnome-apps:
| * iso-codeshicolor-icon-theme *
| * opkg_install_cmd: Cannot install package task-gnome-apps.
| * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-gnome:
| * grephicolor-icon-theme *
| * opkg_install_cmd: Cannot install package task-gnome.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/classes/gtk-icon-cache.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 5d8ef34..3bfb8ff 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -38,7 +38,7 @@ python populate_packages_append () {
bb.note("adding hicolor-icon-theme dependency to %s" % pkg)
rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)
- rdepends += "hicolor-icon-theme"
+ rdepends += " hicolor-icon-theme"
bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)
bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 11/15] linux-yocto: pass KMACHINE to updateme, not MACHINE
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (9 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 10/15] gtk-icon-cache: fix RDEPENDS append bug Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 12/15] linux-yocto: allow configuration of arbitrary branches Saul Wold
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
To support the mapping of any oe/yocto MACHINE to a kernel
branch that may not share that naming structure we have
KMACHINE and KBRANCH. To allow the mapping to work, we
actually have to pass KMACHINE into updateme and not MACHINE.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index a374df1..5e7003b 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -28,7 +28,7 @@ do_patch() {
addon_features="$addon_features --feature $feat"
done
fi
- updateme --branch ${kbranch} ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR}
+ updateme --branch ${kbranch} ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
if [ $? -ne 0 ]; then
echo "ERROR. Could not update ${kbranch}"
exit 1
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 12/15] linux-yocto: allow configuration of arbitrary branches
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (10 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 11/15] linux-yocto: pass KMACHINE to updateme, not MACHINE Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 13/15] linux-yocto: update atom-pc preempt-rt definition Saul Wold
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
When building an external tree or bootstrapping a BSP the
external branch may not have been checked out. The tools now ensure
that the tree is ready for configuration, so we no longer need to
force the checkout of the external branch.
This change is coupled with some kern tools tweaks as follows:
40d9bab updateme: allow the location of board descriptions based on defines
59859ca createme: use branch name when creating meta data
91b4275 configme: determine meta branch based on directories, not branch naming
f5a915c kgit-meta: make branch creation and renaming more robust
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 16 ++++------------
.../kern-tools/kern-tools-native_git.bb | 2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5e7003b..f31ff61 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -28,7 +28,8 @@ do_patch() {
addon_features="$addon_features --feature $feat"
done
fi
- updateme --branch ${kbranch} ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
+ updateme --branch ${kbranch} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
+ ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
if [ $? -ne 0 ]; then
echo "ERROR. Could not update ${kbranch}"
exit 1
@@ -86,17 +87,8 @@ addtask kernel_checkout before do_patch after do_unpack
do_kernel_configme() {
echo "[INFO] doing kernel configme"
- kbranch=${KBRANCH}
- if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
- # switch from a generic to a specific branch
- kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH}
- cd ${S}
- git checkout ${kbranch}
- else
- cd ${S}
- fi
-
- configme --reconfig --output ${B} ${kbranch} ${MACHINE}
+ cd ${S}
+ configme --reconfig --output ${B} ${KBRANCH} ${KMACHINE}
if [ $? -ne 0 ]; then
echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
exit 1
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 1fbb1f7..5659252 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
-SRCREV = "f5a915c277a37ba5949b4c0778356189e7dd9ec0"
+SRCREV = "40d9bab24bde4c2f94a0cece153663aa93e0f9a4"
PR = r10
PV = "0.1+git${SRCPV}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 13/15] linux-yocto: update atom-pc preempt-rt definition
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (11 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 12/15] linux-yocto: allow configuration of arbitrary branches Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 14/15] linux-yocto: merge v3.0.1 Saul Wold
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
The atom-pc preempt-rt configuration wasn't pulling in the common-pc
settings, and wasn't defining re-use of the preempt-rt/base branch
properly.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index ead9d7c..bd08ca6 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = "582dcc88c7c4d765c03b38ff384210d6efbf7956"
SRCREV_machine_qemux86 = "099a40c1669d20fdae2846cfd28bf74fd38dacea"
SRCREV_machine_qemux86-64 = "896b8fd5783a6aac80d1447da5958334f4734845"
SRCREV_machine = "2d22c15ef4802bc117c5482217c2b2c4d34ab303"
-SRCREV_meta = "37856a69113155d343efc8f8c59c7e63fbf963c4"
+SRCREV_meta = "76b3679beff6c640388a609ccf87f46bb7bf0f2b"
PR = "r0"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 14/15] linux-yocto: merge v3.0.1
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (12 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 13/15] linux-yocto: update atom-pc preempt-rt definition Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 15/15] kernel-yocto: add CCACHE_DIR dependency to do_kernel_configme Saul Wold
2011-08-08 12:42 ` [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Richard Purdie
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
3.0.1 -stable has been released. This now becomes the baseline for
the 3.0 linux-yocto tree. As was the policy in the 2.6.34 and
2.6.37 kernels, the version stays at 3.0 in the recipe.
Build and boot tested on qemu* targets.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index bd08ca6..a7bd67a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -14,12 +14,12 @@ KMETA = meta
LINUX_VERSION ?= "3.0"
LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
-SRCREV_machine_qemuarm = "703430f6cd786d9f42fdee1936337ecf1c3d27b5"
-SRCREV_machine_qemumips = "a3bb11ebd7dd1482de334dd71f8e4afe5e2bcd32"
-SRCREV_machine_qemuppc = "582dcc88c7c4d765c03b38ff384210d6efbf7956"
-SRCREV_machine_qemux86 = "099a40c1669d20fdae2846cfd28bf74fd38dacea"
-SRCREV_machine_qemux86-64 = "896b8fd5783a6aac80d1447da5958334f4734845"
-SRCREV_machine = "2d22c15ef4802bc117c5482217c2b2c4d34ab303"
+SRCREV_machine_qemuarm = "30a2cec4e9d7048681c1d239f49cc935287a7012"
+SRCREV_machine_qemumips = "f9b9688cefaa87d898394902acfb858d6b0f1e28"
+SRCREV_machine_qemuppc = "a46a4c356f8bcf7a30d967a1b43633b824cd07a1"
+SRCREV_machine_qemux86 = "efaab1f75dbc577922c862fa19d45c3f31cb99cb"
+SRCREV_machine_qemux86-64 = "c30a56850c73c74af2d056d803081a0d829ce35c"
+SRCREV_machine = "318b059a472128f67119f367f51f11893ee60269"
SRCREV_meta = "76b3679beff6c640388a609ccf87f46bb7bf0f2b"
PR = "r0"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [CONSOLIDATED PULL (Updated) 15/15] kernel-yocto: add CCACHE_DIR dependency to do_kernel_configme
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (13 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 14/15] linux-yocto: merge v3.0.1 Saul Wold
@ 2011-08-07 5:01 ` Saul Wold
2011-08-08 12:42 ` [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Richard Purdie
15 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-08-07 5:01 UTC (permalink / raw)
To: openembedded-core
[YOCTO #1350]
Since do_kernel_configme is added before the standard do_configure task
we needed to add CCACHE_DIR so when the kernel builds it's host configure
tools the CCACHE_DIR exists.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/kernel-yocto.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index f31ff61..daaee50 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -84,6 +84,7 @@ do_kernel_checkout[dirs] = "${S}"
addtask kernel_checkout before do_patch after do_unpack
+do_kernel_configme[dirs] = "${CCACHE_DIR} ${S} ${B}"
do_kernel_configme() {
echo "[INFO] doing kernel configme"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build
2011-08-07 5:01 [Updated CONSOLIDATED PULL 00/15] Fixes for M3 and getting master to build Saul Wold
` (14 preceding siblings ...)
2011-08-07 5:01 ` [CONSOLIDATED PULL (Updated) 15/15] kernel-yocto: add CCACHE_DIR dependency to do_kernel_configme Saul Wold
@ 2011-08-08 12:42 ` Richard Purdie
15 siblings, 0 replies; 17+ messages in thread
From: Richard Purdie @ 2011-08-08 12:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2011-08-06 at 22:01 -0700, Saul Wold wrote:
> Richard,
>
> This has Bruce's updated Kernel, which has taken a spin on the fuzzy builder,
> along with a fix for M3 BSP failures and a couple of other bug and build fixes.
> I also remembered to include the SRC_URI checksums this time for the recipe
> updates.
>
> Thanks
> Sau!
>
>
> The following changes since commit 7a278238d9b08e0315e92d386282cb488cc0c7b4:
>
> bitbake.conf/powerpc64: Set baselib to 'lib64' for ppc64 (2011-08-05 17:48:23 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Bruce Ashfield (4):
> linux-yocto: pass KMACHINE to updateme, not MACHINE
> linux-yocto: allow configuration of arbitrary branches
> linux-yocto: update atom-pc preempt-rt definition
> linux-yocto: merge v3.0.1
>
> Koen Kooi (3):
> gst-plugins: partially sync packaging with OE .dev
> gtk-icon-cache bbclass: don't assing to global RDEPENDS
> gtk-icon-cache: fix RDEPENDS append bug
I squashed these two into one
> Kumar Gala (1):
> gcc: use ${base_lib} to match gcc default configuration
>
> Mei Lei (2):
> python-native: Fix a compiler finding issue
> apr-util: disable pqsql support to avoid configure error
>
> Saul Wold (5):
> gdb: Update to 7.3
> liburcu: Update to 0.6.4
> lttng-ust: Update to 0.15
> lttng-control: Update to 0.89
, fixed the piece in lttng-control that belonged in lttng-ust
> kernel-yocto: add CCACHE_DIR dependency to do_kernel_configme
and merged them all to master, thanks.
Richard
^ permalink raw reply [flat|nested] 17+ messages in thread