* [CONSOLIDATED PULL 00/14] Updates and World Build Fixes
@ 2011-10-16 7:46 Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 01/14] bind: update to 9.8.1 Saul Wold
` (13 more replies)
0 siblings, 14 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Richard,
This is a batch of update fom the mailing list and a set of
changes to address various failures seen both on the Autobuilder
and World build targets.
Please merge as appropriate, I have built these on the autobuilder
over the weekend.
Thanks
Sau!
The following changes since commit d1b12b92439805ec9ca5d031d34d264acd0cab3b:
mesa-dri: Enable swrast only by default and intel drivers only on IA platform (2011-10-15 00:41:12 +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
Dmitry Cherukhin (1):
qt4: Added support for QtMobility 1.2
Dmitry Eremin-Solenikov (1):
default-provider: also define a default provider for gconf-native
Paul Eggleton (2):
pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
bluez4: disable hidd, pand & dund
Philip Balister (1):
cmake : Disable building ccmake.
Saul Wold (9):
bind: update to 9.8.1
resolvconf: Update to 1.61
glib-2.0: Add nativesdk depends for libffi
qmmp: Fix QA Packaging Errors
libomxil: Fix QA Package Errors
Distro Tracking: Fix dates
sysprof: remove duplicated patch
mktemp: Add patch to fix parallel make install
screen: Add patch to fix parallel make install
meta/conf/distro/include/default-providers.inc | 1 +
.../conf/distro/include/distro_tracking_fields.inc | 16 +++---
.../bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch | 0
.../cross-build-fix.patch | 0
.../bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} | 8 +-
meta/recipes-connectivity/bluez/bluez4.inc | 6 +-
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
.../resolvconf/resolvconf_1.61.bb | 33 ++++++++++
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 3 +-
meta/recipes-devtools/cmake/cmake_2.8.5.bb | 3 +-
.../mktemp/files/fix-parallel-make.patch | 23 +++++++
meta/recipes-extended/mktemp/mktemp_1.7.bb | 3 +-
.../screen/screen-4.0.3/fix-parallel-make.patch | 19 ++++++
meta/recipes-extended/screen/screen_4.0.3.bb | 3 +-
meta/recipes-gnome/libffi/libffi_3.0.9.bb | 4 +-
.../sysprof/files/ppc-macro-fix.patch | 13 ----
meta/recipes-kernel/sysprof/sysprof_git.bb | 1 -
meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb | 9 ++-
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +-
.../pulseaudio/pulseaudio_0.9.22.bb | 2 +-
.../pulseaudio/pulseaudio_0.9.23.bb | 2 +-
meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 ++++++++++--
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 11 ++++
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 10 +++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 62 ++++++++++++++++++++
25 files changed, 227 insertions(+), 48 deletions(-)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/cross-build-fix.patch (100%)
rename meta/recipes-connectivity/bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} (84%)
create mode 100644 meta/recipes-connectivity/resolvconf/resolvconf_1.61.bb
create mode 100644 meta/recipes-extended/mktemp/files/fix-parallel-make.patch
create mode 100644 meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
delete mode 100644 meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
--
1.7.6.2
^ permalink raw reply [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 01/14] bind: update to 9.8.1
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 14:38 ` Khem Raj
2011-10-16 7:46 ` [CONSOLIDATED PULL 02/14] resolvconf: Update to 1.61 Saul Wold
` (12 subsequent siblings)
13 siblings, 1 reply; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch | 0
.../cross-build-fix.patch | 0
.../bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} | 8 ++++----
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/cross-build-fix.patch (100%)
rename meta/recipes-connectivity/bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} (84%)
diff --git a/meta/recipes-connectivity/bind/bind-9.7.2-P3/conf.patch b/meta/recipes-connectivity/bind/bind-9.8.1/conf.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.7.2-P3/conf.patch
rename to meta/recipes-connectivity/bind/bind-9.8.1/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.7.2-P3/cross-build-fix.patch b/meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.7.2-P3/cross-build-fix.patch
rename to meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch
diff --git a/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb
similarity index 84%
rename from meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
rename to meta/recipes-connectivity/bind/bind_9.8.1.bb
index e3089bb..c3b30a5 100644
--- a/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.isc.org/sw/bind/"
SECTION = "console/network"
LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fe11ac92dcbd84134d91b6e2c2eccab5"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
DEPENDS = "openssl"
PR = "r0"
@@ -13,12 +13,12 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://cross-build-fix.patch \
"
-SRC_URI[md5sum] = "b4537cbae38b2daef36775bf49f33db9"
-SRC_URI[sha256sum] = "cd945f4766be664f4528ec065df626ad3624481695316ec8e13ad272f4abfb7e"
+SRC_URI[md5sum] = "cf31117c5d35af34d4c0702970ad9fb7"
+SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c"
# --enable-exportlib is necessary for building dhcp
EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads \
- --disable-devpoll --disable-epoll \
+ --disable-devpoll --disable-epoll --with-gost=no \
--sysconfdir=${sysconfdir}/bind \
--with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \
--enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 02/14] resolvconf: Update to 1.61
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 01/14] bind: update to 9.8.1 Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 14:42 ` Khem Raj
2011-10-16 7:46 ` [CONSOLIDATED PULL 03/14] default-provider: also define a default provider for gconf-native Saul Wold
` (11 subsequent siblings)
13 siblings, 1 reply; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../resolvconf/resolvconf_1.61.bb | 33 ++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-connectivity/resolvconf/resolvconf_1.61.bb
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.61.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.61.bb
new file mode 100644
index 0000000..4d265b6
--- /dev/null
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.61.bb
@@ -0,0 +1,33 @@
+SUMMARY = "name server information handler"
+DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \
+information about currently available nameservers. It sets \
+itself up as the intermediary between programs that supply \
+nameserver information and programs that need nameserver \
+information."
+SECTION = "console/network"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
+AUTHOR = "Thomas Hood"
+HOMEPAGE = "http://packages.debian.org/resolvconf"
+DEPENDS = "bash"
+RDEPENDS_${PN} = "bash"
+PR = "r0"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
+
+do_compile () {
+ :
+}
+
+do_install () {
+ install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/volatile/run/resolvconf/interface
+ install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
+ cp -pPR etc/* ${D}${sysconfdir}/
+ chown -R root:root ${D}${sysconfdir}/
+ install -m 0755 bin/resolvconf ${D}${base_sbindir}/
+ install -m 0644 README ${D}${docdir}/${P}/
+ install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
+}
+
+PACKAGE_ARCH = "all"
+
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 03/14] default-provider: also define a default provider for gconf-native
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 01/14] bind: update to 9.8.1 Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 02/14] resolvconf: Update to 1.61 Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 04/14] qt4: Added support for QtMobility 1.2 Saul Wold
` (10 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/conf/distro/include/default-providers.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index a5cdb5b..66f7ff3 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native"
PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
PREFERRED_PROVIDER_libgcc ?= "libgcc"
PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 04/14] qt4: Added support for QtMobility 1.2
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (2 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 03/14] default-provider: also define a default provider for gconf-native Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 05/14] cmake : Disable building ccmake Saul Wold
` (9 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
From: Dmitry Cherukhin <dima_ch@emcraft.com>
The QtMobility is a Qt add-on which allows to include standard mobile
functionality to Qt applications. For details, see
http://qt.nokia.com/products/qt-addons/mobility/
The patch is intended to add support for the QtMobility 1.2 package to OE.
Added two recipes:
1) qt-mobility-x11 builds the QtMobility 1.2 package
on the basis of Qt/X11 using the qt4-x11-free package;
2) qt-mobility-embedded builds the QtMobility 1.2 package
on the basis of Qt/Embedded using the qt4-embedded package.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 11 ++++
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 10 +++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 62 +++++++++++++++++++++
3 files changed, 83 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
diff --git a/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
new file mode 100644
index 0000000..0c30e5f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded"
+DEPENDS = "qt4-embedded"
+SECTION = "libs"
+qtm_embedded := "embedded"
+qtm_dir = "qtopia"
+qtm_glflags := "-=opengl"
+qtm_extra_config := "gstreamer-photography_enabled = no"
+
+inherit qt4e
+require qt-mobility_${PV}.inc
+
diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
new file mode 100644
index 0000000..cd7d5b5
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11"
+DEPENDS = "qt4-x11-free"
+SECTION = "x11/libs"
+qtm_embedded := ""
+qtm_dir = "qt4"
+qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
+qtm_extra_config := ""
+
+inherit qt4x11
+require qt-mobility_${PV}.inc
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
new file mode 100644
index 0000000..f665e64
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -0,0 +1,62 @@
+HOMEPAGE = "http://qt.nokia.com"
+DEPENDS += "pulseaudio bluez4"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz "
+
+SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
+SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
+
+S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
+
+qtm_bin := "/usr/bin/${qtm_dir}"
+qtm_lib := "/usr/lib"
+qtm_include := "/usr/include/${qtm_dir}"
+qtm_examples := "/usr/bin/${qtm_dir}/examples/QtMobility"
+qtm_demos := "/usr/bin/${qtm_dir}/demos/QtMobility"
+qtm_plugins := "/usr/lib/${qtm_dir}/plugins/QtMobility"
+qtm_data := "/usr/share/${qtm_dir}"
+qtm_imports := "/usr/lib/${qtm_dir}/imports"
+
+do_configure_prepend() {
+ cp qtmobility.pro qtmobility.pro.old
+ sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@' <qtmobility.pro.old >qtmobility.pro
+ for NAME in plugins/declarative/*/*.pro
+ do
+ cp $NAME $NAME.old
+ sed -e 's@...QT_INSTALL_IMPORTS.@${qtm_imports}@' <$NAME.old >$NAME
+ done
+ cp staticconfig.pri staticconfig.pri.old
+ echo "include(${STAGING_DATADIR}/${qtm_dir}/mkspecs/qconfig.pri)" >staticconfig.pri
+ cat staticconfig.pri.old >>staticconfig.pri
+ ./configure -qmake-exec qmake2 -prefix /usr -examples -demos
+ echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
+ echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
+ echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri
+ echo QT_MOBILITY_PLUGINS = ${qtm_plugins} >>./config.pri
+ echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
+ echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
+ echo QT_CONFIG ${qtm_glflags} >>./config.pri
+ echo bluez_enabled = yes >>./config.pri
+ echo ${qtm_extra_config} >>./config.pri
+ echo CONFIG += ${qtm_embedded} >>./config.pri
+}
+
+do_install() {
+ for NAME in */*.prf
+ do
+ cp $NAME $NAME.old
+ sed -e 's@/usr@${STAGING_BINDIR}/..@' <$NAME.old >$NAME
+ done
+ oe_runmake install INSTALL_ROOT=${D}
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
+
+FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug \
+ ${qtm_imports}/*/.debug ${qtm_imports}/*/*/.debug /usr/src/debug"
+FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins} ${qtm_imports}"
+FILES_${PN}-dev = "/usr"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 05/14] cmake : Disable building ccmake.
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (3 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 04/14] qt4: Added support for QtMobility 1.2 Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES Saul Wold
` (8 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
From: Philip Balister <philip@balister.org>
ccmake fails to build due to an as-needed type error with -ltinfo. Disable
it for now since the build fails and cmake is what we need for target
sdk.
Signed-off-by: Philip Balister <philip@balister.org>
---
meta/recipes-devtools/cmake/cmake_2.8.5.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
index 4fa9562..8e04072 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
@@ -4,7 +4,7 @@ inherit cmake
DEPENDS += "curl expat zlib libarchive ncurses"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
SRC_URI += "file://dont-run-cross-binaries.patch"
@@ -30,6 +30,7 @@ EXTRA_OECMAKE=" \
-DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
-DCMAKE_USE_SYSTEM_LIBRARIES=1 \
-DKWSYS_CHAR_IS_SIGNED=1 \
+ -DBUILD_CursesDialog=0 \
${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \
"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (4 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 05/14] cmake : Disable building ccmake Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 07/14] bluez4: disable hidd, pand & dund Saul Wold
` (7 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on
bluez4, otherwise disable it.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +++--
.../pulseaudio/pulseaudio_0.9.22.bb | 2 +-
.../pulseaudio/pulseaudio_0.9.23.bb | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2a8e74d..bb32467 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11"
# optional
-DEPENDS += "bluez4 udev alsa-lib glib-2.0 dbus consolekit"
+DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
file://gcc4-compile-fix.patch \
@@ -19,7 +20,7 @@ inherit autotools pkgconfig
EXTRA_OECONF = "\
--disable-lynx \
- --enable-bluez \
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
--disable-polkit \
--with-x \
--without-jack \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
index da2e988..3067365 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
@@ -1,6 +1,6 @@
require pulseaudio.inc
-PR = "r6"
+PR = "r7"
DEPENDS += "gdbm speex"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 1edd913..33f5e15 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -1,6 +1,6 @@
require pulseaudio.inc
-PR = "r4"
+PR = "r5"
DEPENDS += "gdbm speex"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 07/14] bluez4: disable hidd, pand & dund
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (5 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 08/14] glib-2.0: Add nativesdk depends for libffi Saul Wold
` (6 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
These daemons have been deprecated for some time, as their functionality
is now provided within the main bluetoothd daemon.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-connectivity/bluez/bluez4.inc | 6 +++---
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 5dacd92..fc515f6 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -27,9 +27,9 @@ EXTRA_OECONF = "\
--enable-bccmd \
--enable-hid2hci \
--enable-dfutool \
- --enable-hidd \
- --enable-pand \
- --enable-dund \
+ --disable-hidd \
+ --disable-pand \
+ --disable-dund \
--disable-cups \
--enable-test \
--enable-datafiles \
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index 420a525..52268cf 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -1,6 +1,6 @@
require bluez4.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://bluetooth.conf"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 08/14] glib-2.0: Add nativesdk depends for libffi
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (6 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 07/14] bluez4: disable hidd, pand & dund Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors Saul Wold
` (5 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 3 ++-
meta/recipes-gnome/libffi/libffi_3.0.9.bb | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
index 8fc6c81..566355d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
@@ -1,10 +1,11 @@
require glib.inc
-PR = "r1"
+PR = "r2"
PE = "1"
DEPENDS += "libffi python-argparse-native"
DEPENDS_virtclass-native += "libffi-native python-argparse-native"
+DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk"
SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
diff --git a/meta/recipes-gnome/libffi/libffi_3.0.9.bb b/meta/recipes-gnome/libffi/libffi_3.0.9.bb
index 0ea2284..fae1adb 100644
--- a/meta/recipes-gnome/libffi/libffi_3.0.9.bb
+++ b/meta/recipes-gnome/libffi/libffi_3.0.9.bb
@@ -7,7 +7,7 @@ library really only provides the lowest, machine dependent layer of a fully feat
A layer must exist above `libffi' that handles type conversions for values passed between the two languages."
SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz"
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "1f300a7a7f975d4046f51c3022fa5ff1"
SRC_URI[sha256sum] = "589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452"
@@ -16,4 +16,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa09cb778aaba64dc9eac37ab7e4e5d8"
inherit autotools
FILES_${PN}-dev += "${libdir}/libffi-${PV}"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (7 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 08/14] glib-2.0: Add nativesdk depends for libffi Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 10/14] libomxil: Fix QA Package Errors Saul Wold
` (4 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 +++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
index 948c32a..3f710f5 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SECTION = "multimedia"
-PR = "r0"
+PR = "r1"
DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
RDEPENDS_${PN} += "taglib alsa-lib curl"
@@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
-DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
"
-FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \
- ${libdir}/qmmp/PlaylistFormats/*.so \
- ${libdir}/qmmp/Output/libalsa.so \
- ${libdir}/qmmp/Transports/libhttp.so \
- ${libdir}/qmmp/Visual/libanalyzer.so \
+FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \
+ ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \
+ ${libdir}/qmmp/Output/libalsa${SOLIBS} \
+ ${libdir}/qmmp/Transports/libhttp${SOLIBS} \
+ ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \
${datadir}/icons/* \
${datadir}/qmmp/images/* \
${datadir}/applications/qmmp.desktop \
"
+FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \
+ ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \
+ ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \
+ ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \
+ "
+
+FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \
+ ${libdir}/qmmp/Output/.debug/libalsa* \
+ ${libdir}/qmmp/Transports/.debug/libhttp* \
+ ${libdir}/qmmp/Visual/.debug/libanalyzer* \
+ "
+
+FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \
+ ${libdir}/qmmp/General/.debug \
+ ${libdir}/qmmp/Input/.debug \
+ ${libdir}/qmmp/Output/.debug \
+ ${libdir}/qmmp/Effect/.debug \
+ ${libdir}/qmmp/Engines/.debug \
+ ${libdir}/qmmp/FileDialogs/.debug \
+ ${libdir}/qmmp/Transports/.debug \
+ ${libdir}/qmmp/Visual/.debug \
+ ${libdir}/qmmp/CommandLineOptions/.debug \
+ "
+
PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 10/14] libomxil: Fix QA Package Errors
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (8 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 11/14] Distro Tracking: Fix dates Saul Wold
` (3 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
index 665601f..da3ddde 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
file://src/omxcore.h;beginline=1;endline=27;md5=c2e37f68ba9652ca9b2431f466944174"
DEPENDS = "libvorbis libogg alsa-lib libmad"
+PR = "r1"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-B-${PV}.tar.gz"
S = "${WORKDIR}/${BPN}-B-${PV}"
@@ -13,6 +15,9 @@ inherit autotools
EXTRA_OECONF += "--disable-ffmpegcomponents"
-FILES_${PN} += "${libdir}/omxilcomponents/*.so*"
-FILES_${PN}-dev += "${libdir}/omxilcomponents/*.*a"
+FILES_${PN} += "${libdir}/omxilcomponents/*${SOLIBS} \
+ ${datadir}/libomxil-B"
+FILES_${PN}-staticdev += "${libdir}/omxilcomponents/*.a"
+FILES_${PN}-dev += "${libdir}/omxilcomponents/*.la \
+ ${libdir}/omxilcomponents/*${SOLIBSDEV}"
FILES_${PN}-dbg += "${libdir}/omxilcomponents/.debug/"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 11/14] Distro Tracking: Fix dates
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (9 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 10/14] libomxil: Fix QA Package Errors Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 12/14] sysprof: remove duplicated patch Saul Wold
` (2 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index eeac5d2..abc2cbf 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3447,32 +3447,32 @@ DISTRO_PN_ALIAS_pn-imake = "Mandriva=xutils Ubuntu=xutils"
RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-tools-native = "Sep 10, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <paul.eggleton@linux.intel.com>"
DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "Sep 10, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <paul.eggleton@linux.intel.com>"
DISTRO_PN_ALIAS_pn-qt4-tools-nativesdk = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
RECIPE_STATUS_pn-qt4-embedded = "green"
RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-embedded = "Sep 10, 2011"
RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <paul.eggleton@linux.intel.com>"
DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT"
RECIPE_STATUS_pn-qt4-x11-free = "green"
RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-x11-free = "Sep 10, 2011"
RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <paul.eggleton@linux.intel.com"
DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 12/14] sysprof: remove duplicated patch
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (10 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 11/14] Distro Tracking: Fix dates Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 13/14] mktemp: Add patch to fix parallel make install Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 14/14] screen: " Saul Wold
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Apparently this pactch was duplicated by backported
patch, and needed to be applied more broaded than to
just ppc.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../sysprof/files/ppc-macro-fix.patch | 13 -------------
meta/recipes-kernel/sysprof/sysprof_git.bb | 1 -
2 files changed, 0 insertions(+), 14 deletions(-)
delete mode 100644 meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
diff --git a/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch b/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
deleted file mode 100644
index a2e015a..0000000
--- a/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/collector.c
-===================================================================
---- git.orig/collector.c 2010-12-09 19:42:12.292040001 -0600
-+++ git/collector.c 2010-12-09 19:42:23.352039997 -0600
-@@ -175,7 +175,7 @@
- #define __NR_perf_counter_open 337
- #elif defined(__hppa__)
- #define __NR_perf_counter_open 318
--#elif defined(__ppc__) || defined(__ppc64__)
-+#elif defined(__powerpc__) || defined(__powerpc64__)
- #define __NR_perf_counter_open 319
- #elif defined(__s390__)
- #define __NR_perf_counter_open 331
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index c553263..bd34f00 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
SRC_URI_append_arm = " file://rmb-arm.patch"
SRC_URI_append_mips = " file://rmb-mips.patch"
-SRC_URI_append_powerpc = " file://ppc-macro-fix.patch"
S = "${WORKDIR}/git"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 13/14] mktemp: Add patch to fix parallel make install
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (11 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 12/14] sysprof: remove duplicated patch Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 14/14] screen: " Saul Wold
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../mktemp/files/fix-parallel-make.patch | 23 ++++++++++++++++++++
meta/recipes-extended/mktemp/mktemp_1.7.bb | 3 +-
2 files changed, 25 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-extended/mktemp/files/fix-parallel-make.patch
diff --git a/meta/recipes-extended/mktemp/files/fix-parallel-make.patch b/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
new file mode 100644
index 0000000..30b8741
--- /dev/null
+++ b/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
@@ -0,0 +1,23 @@
+This fixes the parallel make install failure
+
+Upstream-status: pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: mktemp-1.7/Makefile.in
+===================================================================
+--- mktemp-1.7.orig/Makefile.in
++++ mktemp-1.7/Makefile.in
+@@ -94,10 +94,10 @@ install-dirs:
+ $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \
+ $(DESTDIR)$(mandir)/man1
+
+-install-binaries: $(PROG)
++install-binaries: install-dirs $(PROG)
+ $(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG)
+
+-install-man:
++install-man: install-dirs
+ $(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \
+ $(DESTDIR)$(mandir)/man1/mktemp.1
+
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index d0479ce..65f542e 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -5,10 +5,11 @@ SECTION = "console/utils"
LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
file://disable-strip.patch \
+ file://fix-parallel-make.patch \
"
SRC_URI[md5sum] = "787bbed9fa2ee8e7645733c0e8e65172"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [CONSOLIDATED PULL 14/14] screen: Add patch to fix parallel make install
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
` (12 preceding siblings ...)
2011-10-16 7:46 ` [CONSOLIDATED PULL 13/14] mktemp: Add patch to fix parallel make install Saul Wold
@ 2011-10-16 7:46 ` Saul Wold
13 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2011-10-16 7:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../screen/screen-4.0.3/fix-parallel-make.patch | 19 +++++++++++++++++++
meta/recipes-extended/screen/screen_4.0.3.bb | 3 ++-
2 files changed, 21 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
diff --git a/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch b/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
new file mode 100644
index 0000000..05c5701
--- /dev/null
+++ b/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
@@ -0,0 +1,19 @@
+This fixes the parallel make install failure
+
+Upstream-status: pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: screen-4.0.3/Makefile.in
+===================================================================
+--- screen-4.0.3.orig/Makefile.in
++++ screen-4.0.3/Makefile.in
+@@ -70,7 +70,7 @@ screen: $(OFILES)
+ .c.o:
+ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
+
+-install_bin: .version screen
++install_bin: .version screen installdirs
+ -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+ then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb
index 27f39dd..a875a35 100644
--- a/meta/recipes-extended/screen/screen_4.0.3.bb
+++ b/meta/recipes-extended/screen/screen_4.0.3.bb
@@ -12,11 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \
SECTION = "console/utils"
DEPENDS = "ncurses \
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \
${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-11+lenny1.diff.gz;name=patch \
file://configure.patch \
+ file://fix-parallel-make.patch \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
PAM_SRC_URI = "file://screen.pam"
--
1.7.6.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [CONSOLIDATED PULL 01/14] bind: update to 9.8.1
2011-10-16 7:46 ` [CONSOLIDATED PULL 01/14] bind: update to 9.8.1 Saul Wold
@ 2011-10-16 14:38 ` Khem Raj
0 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2011-10-16 14:38 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, Oct 16, 2011 at 12:46 AM, Saul Wold <sgw@linux.intel.com> wrote:
> LICENSE = "ISC"
> -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fe11ac92dcbd84134d91b6e2c2eccab5"
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
>
why did this checksum change some words in commit would be nice
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [CONSOLIDATED PULL 02/14] resolvconf: Update to 1.61
2011-10-16 7:46 ` [CONSOLIDATED PULL 02/14] resolvconf: Update to 1.61 Saul Wold
@ 2011-10-16 14:42 ` Khem Raj
0 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2011-10-16 14:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, Oct 16, 2011 at 12:46 AM, Saul Wold <sgw@linux.intel.com> wrote:
> +
> +PACKAGE_ARCH = "all"
> +
would it be better to inherit allarch instead ?
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2011-10-16 14:48 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-16 7:46 [CONSOLIDATED PULL 00/14] Updates and World Build Fixes Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 01/14] bind: update to 9.8.1 Saul Wold
2011-10-16 14:38 ` Khem Raj
2011-10-16 7:46 ` [CONSOLIDATED PULL 02/14] resolvconf: Update to 1.61 Saul Wold
2011-10-16 14:42 ` Khem Raj
2011-10-16 7:46 ` [CONSOLIDATED PULL 03/14] default-provider: also define a default provider for gconf-native Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 04/14] qt4: Added support for QtMobility 1.2 Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 05/14] cmake : Disable building ccmake Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 07/14] bluez4: disable hidd, pand & dund Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 08/14] glib-2.0: Add nativesdk depends for libffi Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 10/14] libomxil: Fix QA Package Errors Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 11/14] Distro Tracking: Fix dates Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 12/14] sysprof: remove duplicated patch Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 13/14] mktemp: Add patch to fix parallel make install Saul Wold
2011-10-16 7:46 ` [CONSOLIDATED PULL 14/14] screen: " Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox