* [PATCH 01/17] gcc: Fix unpackaged files warnings, broken symlink and superfluous files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 02/17] connman: Package unpackaged .la file Richard Purdie
` (16 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/gcc/gcc-package-target.inc | 25 +++++++++++++++++----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 8c66c72..69abf72 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -6,6 +6,8 @@ PACKAGES = "\
gfortran gfortran-symlinks \
gcov gcov-symlinks \
${PN}-doc \
+ ${PN}-dev \
+ ${PN}-dbg \
"
FILES_${PN} = "\
@@ -19,6 +21,12 @@ FILES_${PN} = "\
${gcclibdir}/${TARGET_SYS}/${BINV}/include \
${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
"
+FILES_${PN}-dbg += "\
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \
+"
+FILES_${PN}-dev = "\
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
+"
FILES_${PN}-symlinks = "\
${bindir}/cc \
${bindir}/gcc \
@@ -93,16 +101,23 @@ do_install () {
find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
+ # Not sure why we end up with these but we don't want them...
+ rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
+
# Symlinks so we can use these trivially on the target
- ln -sf ${TARGET_PREFIX}g77 g77 || true
- ln -sf ${TARGET_PREFIX}gfortran gfortran || true
+ if [ -e ${TARGET_PREFIX}g77 ]; then
+ ln -sf ${TARGET_PREFIX}g77 g77 || true
+ ln -sf g77 f77 || true
+ fi
+ if [ -e ${TARGET_PREFIX}gfortran ]; then
+ ln -sf ${TARGET_PREFIX}gfortran gfortran || true
+ ln -sf gfortran f95 || true
+ fi
ln -sf ${TARGET_PREFIX}g++ g++
ln -sf ${TARGET_PREFIX}gcc gcc
- ln -sf g77 f77 || true
- ln -sf gfortran f95 || true
+ ln -sf ${TARGET_PREFIX}cpp cpp
ln -sf g++ c++
ln -sf gcc cc
- ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp
chown -R root:root ${D}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 02/17] connman: Package unpackaged .la file
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
2011-07-05 22:51 ` [PATCH 01/17] gcc: Fix unpackaged files warnings, broken symlink and superfluous files Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-06 9:14 ` Phil Blundell
2011-07-05 22:51 ` [PATCH 03/17] tslib: " Richard Purdie
` (15 subsequent siblings)
17 siblings, 1 reply; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-connectivity/connman/connman.inc | 2 ++
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ccff573..916f8ad 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -38,6 +38,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
${libdir}/connman/scripts/.debug"
+FILES_${PN}-dev += "${libdir}/connman/plugins/*.la"
+
python populate_packages_prepend() {
depmap = dict( wifi="wpa-supplicant", bluetooth="bluez4", ofono="ofono" )
packages = []
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index 75ef5b5..aeff439 100644
--- a/meta/recipes-connectivity/connman/connman_0.75.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -1,5 +1,5 @@
require connman.inc
-PR = "r0"
+PR = "r1"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 03/17] tslib: Package unpackaged .la file
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
2011-07-05 22:51 ` [PATCH 01/17] gcc: Fix unpackaged files warnings, broken symlink and superfluous files Richard Purdie
2011-07-05 22:51 ` [PATCH 02/17] connman: Package unpackaged .la file Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 04/17] btrfs-tools: Fix manpage creation directory Richard Purdie
` (14 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-graphics/tslib/tslib_1.0.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
index 9ab8259..ad9bfa7 100644
--- a/meta/recipes-graphics/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
@@ -10,7 +10,7 @@ SECTION = "base"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
-PR = "r17"
+PR = "r18"
SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
file://fix_version.patch;patch=1 \
@@ -51,6 +51,7 @@ RDEPENDS_${PN} = "tslib-conf"
RRECOMMENDS_${PN} = "pointercal"
FILES_${PN}-dbg += "${libdir}/ts/.debug*"
+FILES_${PN}-dev += "${libdir}/ts/*.la"
FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*"
FILES_tslib-calibrate += "${bindir}/ts_calibrate"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 04/17] btrfs-tools: Fix manpage creation directory
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (2 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 03/17] tslib: " Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 05/17] xcb-proto: Package unshipped files, create python-xcbgen package for python xcbgen code Richard Purdie
` (13 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../btrfs-tools/btrfs-tools/weak-defaults.patch | 31 ++++++++++++++++++++
.../btrfs-tools/btrfs-tools_git.bb | 3 +-
2 files changed, 33 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
new file mode 100644
index 0000000..9ca9fca
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
@@ -0,0 +1,31 @@
+Upstream-Status: Pending
+
+Allow mandir to be set from the environment, fixing the following packaging warnings:
+
+WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package:
+WARNING: /usr/man/man8/btrfs-show.8.gz
+WARNING: /usr/man/man8/btrfs-image.8.gz
+WARNING: /usr/man/man8/btrfsctl.8.gz
+WARNING: /usr/man/man8/btrfs.8.gz
+WARNING: /usr/man/man8/btrfsck.8.gz
+WARNING: /usr/man/man8/mkfs.btrfs.8.gz
+
+RP - 5/7/2011
+
+Index: git/man/Makefile
+===================================================================
+--- git.orig/man/Makefile 2011-07-05 22:03:58.949919067 +0100
++++ git/man/Makefile 2011-07-05 22:04:07.789919856 +0100
+@@ -2,9 +2,9 @@
+ INSTALL= install
+
+ prefix ?= /usr/local
+-bindir = $(prefix)/bin
+-mandir = $(prefix)/man
+-man8dir = $(mandir)/man8
++bindir ?= $(prefix)/bin
++mandir ?= $(prefix)/man
++man8dir ?= $(mandir)/man8
+
+ MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \
+ btrfs-show.8.gz btrfs.8.gz
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index 312dff3..a5c556d 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unsta
S = "${WORKDIR}/git"
-PR = "r0"
+PR = "r1"
SRC_URI += "file://upstream-tmp/0001-Btrfs-progs-add-a-btrfs-select-super-command-to-over.patch \
file://upstream-tmp/0002-Btrfs-progs-use-safe-string-manipulation-functions.patch \
@@ -40,6 +40,7 @@ SRC_URI += "file://upstream-tmp/0001-Btrfs-progs-add-a-btrfs-select-super-comman
file://debian/01-labels.patch \
file://debian/02-ftbfs.patch \
file://fix_use_of_gcc.patch \
+ file://weak-defaults.patch \
"
SRC_URI[md5sum] = "78b1700d318de8518abfaab71f99a885"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 05/17] xcb-proto: Package unshipped files, create python-xcbgen package for python xcbgen code
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (3 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 04/17] btrfs-tools: Fix manpage creation directory Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 06/17] eds-dbus: Package unpackaged files Richard Purdie
` (12 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-graphics/xcb/xcb-proto.inc | 5 ++++-
meta/recipes-graphics/xcb/xcb-proto_1.6.bb | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index d511341..cd7e115 100644
--- a/meta/recipes-graphics/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
@@ -13,7 +13,10 @@ SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
inherit autotools pkgconfig
-FILES_${PN}-dev += "${datadir}/xcb/*.xml"
+PACKAGES += "python-xcbgen"
+
+FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd"
+FILES_python-xcbgen = "${libdir}/python*"
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
index 74a6ec7..3133977 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b"
SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 06/17] eds-dbus: Package unpackaged files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (4 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 05/17] xcb-proto: Package unshipped files, create python-xcbgen package for python xcbgen code Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 07/17] systemtap: Don't set prefix to a path including so examples get placed in the correct path and packaged correctly Richard Purdie
` (11 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-sato/eds/eds-dbus_2.20.0.bb | 7 +++++--
meta/recipes-sato/eds/eds-dbus_git.bb | 9 +++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
index 2cbc903..2acc5b5 100644
--- a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
+++ b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
@@ -34,6 +34,7 @@ PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
libedataserver libedataserver-dev \
libedataserverui libedataserverui-dev"
+FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \
${libdir}/evolution-data-server*/extensions/.debug/"
@@ -45,6 +46,7 @@ FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \
${libdir}/evolution-data-server-*/camel-providers/*.urls"
FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
${libdir}/pkgconfig/camel*pc \
+ ${libdir}/evolution-data-server-*/camel-providers/*.la \
${includedir}/evolution-data-server*/camel"
FILES_libebook = "${libdir}/libebook-*.so.*"
@@ -55,7 +57,6 @@ RRECOMMENDS_libebook = "libedata-book"
FILES_libecal = "${libdir}/libecal-*.so.* \
${datadir}/evolution-data-server-1.4/zoneinfo"
-
FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
${includedir}/evolution-data-server*/libecal/*.h \
${includedir}/evolution-data-server*/libical/*.h"
@@ -68,6 +69,7 @@ FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
${datadir}/evolution-data-server-1.4/weather/Locations.xml"
FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
${libdir}/pkgconfig/libedata-book-*.pc \
+ ${libdir}/evolution-data-server-*/extensions/libebook*.la \
${includedir}/evolution-data-server-*/libedata-book"
FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
@@ -76,7 +78,8 @@ FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
${libdir}/evolution-data-server-*/extensions/libecal*.so"
FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
${libdir}/pkgconfig/libedata-cal-*.pc \
- ${includedir}/evolution-data-server-*/libedata-cal"
+ ${includedir}/evolution-data-server-*/libedata-cal \
+ ${libdir}/evolution-data-server-*/extensions/libecal*.la"
FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb
index a8100ad..0d920cd 100644
--- a/meta/recipes-sato/eds/eds-dbus_git.bb
+++ b/meta/recipes-sato/eds/eds-dbus_git.bb
@@ -51,6 +51,7 @@ PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
libedataserver libedataserver-dev \
libedataserverui libedataserverui-dev"
+FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \
${libdir}/evolution-data-server*/extensions/.debug/"
@@ -62,6 +63,7 @@ FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \
${libdir}/evolution-data-server-*/camel-providers/*.urls"
FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
${libdir}/pkgconfig/camel*pc \
+ ${libdir}/evolution-data-server-*/camel-providers/*.la \
${includedir}/evolution-data-server*/camel"
FILES_libebook = "${libdir}/libebook-*.so.*"
@@ -80,9 +82,11 @@ RRECOMMENDS_libecal = "libedata-cal tzdata"
FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
${datadir}/dbus-1/services/*.AddressBook.service \
${libdir}/libedata-book-*.so.* \
- ${libdir}/evolution-data-server-*/extensions/libebook*.so"
+ ${libdir}/evolution-data-server-*/extensions/libebook*.so \
+ ${datadir}/evolution-data-server-1.4/weather/Locations.xml"
FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
${libdir}/pkgconfig/libedata-book-*.pc \
+ ${libdir}/evolution-data-server-*/extensions/libebook*.la \
${includedir}/evolution-data-server-*/libedata-book"
FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
@@ -91,7 +95,8 @@ FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
${libdir}/evolution-data-server-*/extensions/libecal*.so"
FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
${libdir}/pkgconfig/libedata-cal-*.pc \
- ${includedir}/evolution-data-server-*/libedata-cal"
+ ${includedir}/evolution-data-server-*/libedata-cal \
+ ${libdir}/evolution-data-server-*/extensions/libecal*.la"
FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 07/17] systemtap: Don't set prefix to a path including so examples get placed in the correct path and packaged correctly
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (5 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 06/17] eds-dbus: Package unpackaged files Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 08/17] qt4: Package debug source files Richard Purdie
` (10 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index f24c179..e8aa54f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "elfutils sqlite3"
SRCREV = "4ab3a1863bf4f472acae7a809bf2b38d91658aa8"
-PR = "r3"
+PR = "r4"
PV = "1.4+git${SRCPV}"
SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
file://fix_for_compilation_with_gcc-4.6.0.patch \
"
-EXTRA_OECONF = "--prefix=${D} --with-libelf=${STAGING_DIR_TARGET} --without-rpm \
+EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
ac_cv_file__usr_include_nss=no \
ac_cv_file__usr_include_nss3=no \
ac_cv_file__usr_include_nspr=no \
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 08/17] qt4: Package debug source files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (6 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 07/17] systemtap: Don't set prefix to a path including so examples get placed in the correct path and packaged correctly Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 09/17] telepathy-python: Remove unneeded and unpackaged files Richard Purdie
` (9 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-qt/qt4/qt4.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 284586f..881b445 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -51,6 +51,7 @@ python __anonymous () {
${includedir}/${QT_DIR_NAME}/%(incname)s
${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
+ bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${QT_BASE_NAME}-dbg", d)
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
@@ -67,6 +68,7 @@ python __anonymous () {
${includedir}/${QT_DIR_NAME}/%(incname)s
${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d)
+ bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${QT_BASE_NAME}-dbg", d)
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
@@ -105,7 +107,7 @@ ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
FILES_${PN} = ""
FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
-FILES_${PN}-dbg = ""
+FILES_${PN}-dbg = "${exec_prefix}/src/debug/"
RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 09/17] telepathy-python: Remove unneeded and unpackaged files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (7 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 08/17] qt4: Package debug source files Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 10/17] librsvg: Clean up " Richard Purdie
` (8 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../telepathy/telepathy-python_0.15.19.bb | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
index 8182362..0a483c4 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
@@ -9,7 +9,7 @@ RDEPENDS_${PN} += "python-dbus"
SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${P}.tar.gz \
file://parallel_make.patch"
-PR = "r1"
+PR = "r2"
inherit autotools
@@ -20,3 +20,10 @@ FILES_${PN} += "\
${libdir}/python*/site-packages/telepathy/*.py \
${libdir}/python*/site-packages/telepathy/*/*.py \
"
+
+do_install_append () {
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyc
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyo
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyc
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyo
+}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 10/17] librsvg: Clean up unpackaged files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (8 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 09/17] telepathy-python: Remove unneeded and unpackaged files Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 11/17] gtk-engines: Package " Richard Purdie
` (7 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index a47afc6..6744932 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = "x11/utils"
DEPENDS = "gtk+ libcroco cairo libxml2 popt"
-PR = "r3"
+PR = "r4"
inherit autotools pkgconfig gnome
@@ -27,16 +27,21 @@ do_configure_prepend () {
PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \
+ ${libdir}/gtk-2.0/*.a ${libdir}/gtk-2.0/*/*/*.a"
FILES_rsvg = "${bindir}/rsvg \
${bindir}/rsvg-view \
${bindir}/rsvg-convert \
${datadir}/pixmaps/svg-viewer.svg \
${datadir}/themes"
FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so ${libdir}/gdk-pixbuf-2.0/*/*/*.so"
-FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
- ${libdir}/gtk-2.0/*/loaders/*.*a \
- ${libdir}/gtk-2.0/*/engines/*.*a"
-FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
+ ${libdir}/gtk-2.0/*/*/*.la \
+ ${libdir}/gdk-pixbuf-2.0/*.la \
+ ${libdir}/gdk-pixbuf-2.0/*/*/*.la"
+FILES_librsvg-gtk-dbg += "${libdir}/gdk-pixbuf-2.0/.debug \
+ ${libdir}/gdk-pixbuf-2.0/*/*/.debug \
+ ${libdir}/gtk-2.0/.debug \
${libdir}/gtk-2.0/*/*/.debug"
pkg_postinst_librsvg-gtk() {
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 00/17] Various QA/unpackaged files cleanups
@ 2011-07-05 22:51 Richard Purdie
2011-07-05 22:51 ` [PATCH 01/17] gcc: Fix unpackaged files warnings, broken symlink and superfluous files Richard Purdie
` (17 more replies)
0 siblings, 18 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
This patch series is for a number of QA/unpackaged files cleanups.
The following changes since commit f05b7ee7716d1e5cc1ba0bbab57e91c3a0569e9e:
x-load: Update to 1.5.0 (2011-07-05 14:16:33 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rpurdie/master
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/master
Richard Purdie (17):
gcc: Fix unpackaged files warnings, broken symlink and superfluous
files
connman: Package unpackaged .la file
tslib: Package unpackaged .la file
btrfs-tools: Fix manpage creation directory
xcb-proto: Package unshipped files, create python-xcbgen package for
python xcbgen code
eds-dbus: Package unpackaged files
systemtap: Don't set prefix to a path including so examples get
placed in the correct path and packaged correctly
qt4: Package debug source files
telepathy-python: Remove unneeded and unpackaged files
librsvg: Clean up unpackaged files
gtk-engines: Package unpackaged files
x11perf: Packaged unpackaged files
apt: Package unpackaged files
git: Package up python and gitweb files into appropriate packages
kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS
issues
opensp: Add unpackaged files
chrpath: Ensure the package respects the docdir variable
meta/recipes-connectivity/connman/connman.inc | 2 +
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
.../telepathy/telepathy-python_0.15.19.bb | 9 ++++-
meta/recipes-devtools/apt/apt-package.inc | 2 +-
meta/recipes-devtools/apt/apt_0.7.14.bb | 4 +-
.../btrfs-tools/btrfs-tools/weak-defaults.patch | 31 ++++++++++++++
.../btrfs-tools/btrfs-tools_git.bb | 3 +-
.../chrpath/chrpath/standarddoc.patch | 19 +++++++++
meta/recipes-devtools/chrpath/chrpath_0.13.bb | 5 +-
meta/recipes-devtools/gcc/gcc-package-target.inc | 25 +++++++++--
meta/recipes-devtools/git/git.inc | 6 +++
meta/recipes-devtools/opensp/opensp_1.5.bb | 4 +-
.../gtk-engines/gtk-engines_2.20.2.bb | 5 ++-
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 15 +++++--
meta/recipes-graphics/tslib/tslib_1.0.bb | 3 +-
meta/recipes-graphics/xcb/xcb-proto.inc | 5 ++-
meta/recipes-graphics/xcb/xcb-proto_1.6.bb | 2 +-
meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb | 4 +-
meta/recipes-kernel/systemtap/systemtap_git.bb | 4 +-
meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 10 ++++-
.../trace-cmd/trace-cmd/addldflags.patch | 43 ++++++++++++++++++++
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 5 +-
meta/recipes-qt/qt4/qt4.inc | 4 +-
meta/recipes-sato/eds/eds-dbus_2.20.0.bb | 7 ++-
meta/recipes-sato/eds/eds-dbus_git.bb | 9 +++-
25 files changed, 193 insertions(+), 35 deletions(-)
create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
create mode 100644 meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
--
1.7.4.1
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 11/17] gtk-engines: Package unpackaged files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (9 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 10/17] librsvg: Clean up " Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 12/17] x11perf: Packaged " Richard Purdie
` (6 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../gtk-engines/gtk-engines_2.20.2.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 85c38e2..bbf52be 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
SECTION = "x11/base"
DEPENDS = "gtk+"
-PR = "r0"
+PR = "r1"
PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
@@ -21,6 +21,9 @@ RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
+
CFLAGS_prepend = "-DHAVE_ANIMATION "
inherit gnome
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 12/17] x11perf: Packaged unpackaged files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (10 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 11/17] gtk-engines: Package " Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 13/17] apt: Package " Richard Purdie
` (5 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb b/meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb
index 8faffe0..26057d5 100644
--- a/meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb
+++ b/meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb
@@ -11,8 +11,10 @@ DEPENDS += "libxmu libxrender libxft libxext fontconfig"
LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \
file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01"
-PR = "r0"
+PR = "r1"
PE = "1"
+FILES_${PN} += "${libdir}/X11/x11perfcomp/*"
+
SRC_URI[md5sum] = "c3ac3667a6f5c3cead9847fbf4b5f36e"
SRC_URI[sha256sum] = "394d7355afe7f3b054ce6f30db78794c6305c6593d48b7fb86a9c89d9d9e21bd"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 13/17] apt: Package unpackaged files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (11 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 12/17] x11perf: Packaged " Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-06 9:17 ` Phil Blundell
2011-07-05 22:51 ` [PATCH 14/17] git: Package up python and gitweb files into appropriate packages Richard Purdie
` (4 subsequent siblings)
17 siblings, 1 reply; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/apt/apt-package.inc | 2 +-
meta/recipes-devtools/apt/apt_0.7.14.bb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index 9e104f1..2e3be38 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -62,7 +62,7 @@ FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \
${docdir}/apt"
FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}"
-FILES_${PN}-dev = "${libdir}/libapt*.so"
+FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
do_install () {
set -x
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb
index aa155d9..1335c16 100644
--- a/meta/recipes-devtools/apt/apt_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt_0.7.14.bb
@@ -3,10 +3,10 @@ RDEPENDS_${PN} = "dpkg"
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
require apt.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "file://nodoc.patch \
- file://includes-fix.patch "
+ file://includes-fix.patch "
SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814"
SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 14/17] git: Package up python and gitweb files into appropriate packages
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (12 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 13/17] apt: Package " Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 15/17] kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues Richard Purdie
` (3 subsequent siblings)
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/git/git.inc | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 5d77880..56655f9 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -38,6 +38,9 @@ FILES_${PN}-perltools += " \
"
RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
+PACKAGES =+ "${PN}-python"
+FILES_${PN}-python = "${libdir}/python*"
+
# git-tk package with gitk and git-gui
PACKAGES =+ "${PN}-tk"
#RDEPENDS_${PN}-tk = "${PN} tk tcl"
@@ -47,5 +50,8 @@ FILES_${PN}-tk = " \
${datadir}/gitk \
"
+PACKAGES =+ "gitweb"
+FILES_gitweb = "${datadir}/gitweb/"
+
BBCLASSEXTEND = "native"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 15/17] kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (13 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 14/17] git: Package up python and gitweb files into appropriate packages Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-06 9:15 ` Phil Blundell
2011-07-05 22:51 ` [PATCH 16/17] opensp: Add unpackaged files Richard Purdie
` (2 subsequent siblings)
17 siblings, 1 reply; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 10 ++++-
.../trace-cmd/trace-cmd/addldflags.patch | 43 ++++++++++++++++++++
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 5 +-
3 files changed, 54 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
index 6b4692e..733bddc 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49"
-PR = r0
+PR = r1
PV = "1.0.5+git${SRCPV}"
DEPENDS = "gtk+"
@@ -12,11 +12,17 @@ RDEPENDS_${PN} = "trace-cmd"
inherit pkgconfig
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
+ file://addldflags.patch"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
+FILES_${PN} += "${datadir}/trace-cmd/plugins/*.so"
+FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/"
+
+FILESPATH = "${FILE_DIRNAME}/trace-cmd"
+
do_install() {
oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
}
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
new file mode 100644
index 0000000..8e8f578
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
@@ -0,0 +1,43 @@
+Upstream-Status: Pending
+
+Add ability for the Makefile to respect LDFLAGS.
+
+Also remove hardcoded /usr/local/include include path.
+
+RP 7/5/2011
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile 2011-07-05 11:58:11.699910550 +0100
++++ git/Makefile 2011-07-05 23:30:12.319920617 +0100
+@@ -189,10 +189,11 @@
+ TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
+ KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
+
+-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
++INCLUDES = -I. $(CONFIG_INCLUDES)
+
+ # Set compile option CFLAGS if not set elsewhere
+ CFLAGS ?= -g -Wall
++LDFLAGS ?=
+
+ # Append required CFLAGS
+ override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
+@@ -225,7 +226,7 @@
+
+ do_app_build = \
+ ($(print_app_build) \
+- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
++ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
+
+ do_compile_shared_library = \
+ ($(print_shared_lib_compile) \
+@@ -237,7 +238,7 @@
+
+ do_plugin_build = \
+ ($(print_plugin_build) \
+- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<)
+
+ do_build_static_lib = \
+ ($(print_static_lib_build) \
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index 5cf433a..1278dc7 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
@@ -4,12 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49"
-PR = "r1"
+PR = "r2"
PV = "1.0.5+git${SRCPV}"
inherit pkgconfig
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
+ file://addldflags.patch"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = "'prefix=${prefix}'"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 16/17] opensp: Add unpackaged files
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (14 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 15/17] kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 17/17] chrpath: Ensure the package respects the docdir variable Richard Purdie
2011-07-06 2:59 ` [PATCH 00/17] Various QA/unpackaged files cleanups Otavio Salvador
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/opensp/opensp_1.5.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
index 61022e0..a402d11 100644
--- a/meta/recipes-devtools/opensp/opensp_1.5.bb
+++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
-PR = "r0"
+PR = "r1"
# At -Os it encounters calls to some inline functions which are then
# not found in any other objects with gcc 4.5
@@ -42,4 +42,6 @@ do_install_append() {
ln -sf osx sgml2xml
}
+FILES_${PN} += "${datadir}/OpenSP/"
+
BBCLASSEXTEND = "native"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 17/17] chrpath: Ensure the package respects the docdir variable
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (15 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 16/17] opensp: Add unpackaged files Richard Purdie
@ 2011-07-05 22:51 ` Richard Purdie
2011-07-06 2:59 ` [PATCH 00/17] Various QA/unpackaged files cleanups Otavio Salvador
17 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-05 22:51 UTC (permalink / raw)
To: openembedded-core
This resolves unpackaged file QA warnings and an empty -doc package.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../chrpath/chrpath/standarddoc.patch | 19 +++++++++++++++++++
meta/recipes-devtools/chrpath/chrpath_0.13.bb | 5 +++--
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
new file mode 100644
index 0000000..f96f104
--- /dev/null
+++ b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Pending
+
+autoconf/automake set docdir automatically, use their value ensuring
+doc files are placed into $datadir/doc, not $prefix/doc.
+
+RP 5/7/2011
+
+Index: chrpath-0.13/Makefile.am
+===================================================================
+--- chrpath-0.13.orig/Makefile.am 2011-07-05 23:40:14.769920254 +0100
++++ chrpath-0.13/Makefile.am 2011-07-05 23:40:19.819920635 +0100
+@@ -1,7 +1,5 @@
+ SUBDIRS = testsuite deb
+
+-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-
+ doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+ bin_PROGRAMS = chrpath
diff --git a/meta/recipes-devtools/chrpath/chrpath_0.13.bb b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
index 200f444..d65725e 100644
--- a/meta/recipes-devtools/chrpath/chrpath_0.13.bb
+++ b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
@@ -4,9 +4,10 @@ looks for libraries) in an application. It does not (yet) allow you to add an \
rpath if there isn't one already."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r2"
+PR = "r3"
-SRC_URI = "${DEBIAN_MIRROR}/main/c/chrpath/chrpath_${PV}.orig.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/c/chrpath/chrpath_${PV}.orig.tar.gz \
+ file://standarddoc.patch"
SRC_URI[md5sum] = "b73072a8fbba277558c50364b65bb407"
SRC_URI[sha256sum] = "c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH 00/17] Various QA/unpackaged files cleanups
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
` (16 preceding siblings ...)
2011-07-05 22:51 ` [PATCH 17/17] chrpath: Ensure the package respects the docdir variable Richard Purdie
@ 2011-07-06 2:59 ` Otavio Salvador
2011-07-06 8:03 ` Richard Purdie
2011-07-06 9:06 ` Phil Blundell
17 siblings, 2 replies; 26+ messages in thread
From: Otavio Salvador @ 2011-07-06 2:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, Jul 5, 2011 at 19:51, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> This patch series is for a number of QA/unpackaged files cleanups.
I noticed you have added .la files in some packages. This seems wrong
and useless. In fact I am making a local patchset to drop them all and
I have most build working (fixing last things before posting for
review).
It seems very wrong to depend on .la files for linking and pkg-config
seems to be the most right solution when possible.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 00/17] Various QA/unpackaged files cleanups
2011-07-06 2:59 ` [PATCH 00/17] Various QA/unpackaged files cleanups Otavio Salvador
@ 2011-07-06 8:03 ` Richard Purdie
2011-07-06 9:06 ` Phil Blundell
1 sibling, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-06 8:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-07-05 at 23:59 -0300, Otavio Salvador wrote:
> On Tue, Jul 5, 2011 at 19:51, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > This patch series is for a number of QA/unpackaged files cleanups.
>
> I noticed you have added .la files in some packages. This seems wrong
> and useless. In fact I am making a local patchset to drop them all and
> I have most build working (fixing last things before posting for
> review).
>
> It seems very wrong to depend on .la files for linking and pkg-config
> seems to be the most right solution when possible.
.la files are an interesting problem. I'm not overly fond of them but
even in this modern age they can help on certain targets like darwin and
they can help with static linking since they have dependency information
that often hasn't been added into the .pc files. We don't often do
either of those things but in general the .la files are pretty harmless.
With regard to the patch series, it just adds .la files to -dev packages
so the only impact is to development images and even there its small.
If you wanted to clean things up, dropping all the binconfig scripts
would IMO be a much more useful effort as those are much more ugly to
handle and bug ridden. At least libtool has some notion of sysroot
support these days!
Cheers,
Richard
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 00/17] Various QA/unpackaged files cleanups
2011-07-06 2:59 ` [PATCH 00/17] Various QA/unpackaged files cleanups Otavio Salvador
2011-07-06 8:03 ` Richard Purdie
@ 2011-07-06 9:06 ` Phil Blundell
1 sibling, 0 replies; 26+ messages in thread
From: Phil Blundell @ 2011-07-06 9:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-07-05 at 23:59 -0300, Otavio Salvador wrote:
> On Tue, Jul 5, 2011 at 19:51, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > This patch series is for a number of QA/unpackaged files cleanups.
>
> I noticed you have added .la files in some packages. This seems wrong
> and useless. In fact I am making a local patchset to drop them all and
> I have most build working (fixing last things before posting for
> review).
>
> It seems very wrong to depend on .la files for linking and pkg-config
> seems to be the most right solution when possible.
I think Richard's patch to add the .las to the appropriate FILES is a
reasonable one. Whether you actually want the .la files installed or
not is another question, but if your policy is that you don't then I
think the right answer is a global mechanism to suppress them rather
than tinkering with individual recipes. It would probably be fairly
straightforward to make a new class which did something like:
do_purge_la() {
find ${D} -name "*.la" | xargs rm -f
}
addtask purge_la after do_install before do_package do_populate_sysroot
which you could then call in from your DISTRO config as and when
desired.
p.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 02/17] connman: Package unpackaged .la file
2011-07-05 22:51 ` [PATCH 02/17] connman: Package unpackaged .la file Richard Purdie
@ 2011-07-06 9:14 ` Phil Blundell
2011-07-06 10:34 ` Richard Purdie
0 siblings, 1 reply; 26+ messages in thread
From: Phil Blundell @ 2011-07-06 9:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-07-05 at 23:51 +0100, Richard Purdie wrote:
> +FILES_${PN}-dev += "${libdir}/connman/plugins/*.la"
Actually, in this specific case, I think adding *.la to FILES is the
wrong thing to do. The DSOs in question are plugins, not libraries, and
nobody is ever going to link against them. So the corresponding .la
files (and the .so symlinks, if those are also getting created) really
are just dross and should be deleted.
p.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 15/17] kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues
2011-07-05 22:51 ` [PATCH 15/17] kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues Richard Purdie
@ 2011-07-06 9:15 ` Phil Blundell
0 siblings, 0 replies; 26+ messages in thread
From: Phil Blundell @ 2011-07-06 9:15 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
That should be "fixing", I guess.
p.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 13/17] apt: Package unpackaged files
2011-07-05 22:51 ` [PATCH 13/17] apt: Package " Richard Purdie
@ 2011-07-06 9:17 ` Phil Blundell
2011-07-06 10:25 ` Richard Purdie
0 siblings, 1 reply; 26+ messages in thread
From: Phil Blundell @ 2011-07-06 9:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-07-05 at 23:51 +0100, Richard Purdie wrote:
> -FILES_${PN}-dev = "${libdir}/libapt*.so"
> +FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
Is there a reason why the default FILES from bitbake.conf wouldn't work
there? It looks like both the above would be included.
p.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 13/17] apt: Package unpackaged files
2011-07-06 9:17 ` Phil Blundell
@ 2011-07-06 10:25 ` Richard Purdie
0 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-06 10:25 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-06 at 10:17 +0100, Phil Blundell wrote:
> On Tue, 2011-07-05 at 23:51 +0100, Richard Purdie wrote:
> > -FILES_${PN}-dev = "${libdir}/libapt*.so"
> > +FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
>
> Is there a reason why the default FILES from bitbake.conf wouldn't work
> there? It looks like both the above would be included.
The rest of apt's packaging its horrible and its unclear if there are
other things in the default -dev FILES expression which the apt
packaging wouldn't take well to or not. Really the whole thing needs
rewriting but I wasn't quite in the mood for it ;-).
Cheers,
Richard
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 02/17] connman: Package unpackaged .la file
2011-07-06 9:14 ` Phil Blundell
@ 2011-07-06 10:34 ` Richard Purdie
0 siblings, 0 replies; 26+ messages in thread
From: Richard Purdie @ 2011-07-06 10:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-06 at 10:14 +0100, Phil Blundell wrote:
> On Tue, 2011-07-05 at 23:51 +0100, Richard Purdie wrote:
> > +FILES_${PN}-dev += "${libdir}/connman/plugins/*.la"
>
> Actually, in this specific case, I think adding *.la to FILES is the
> wrong thing to do. The DSOs in question are plugins, not libraries, and
> nobody is ever going to link against them. So the corresponding .la
> files (and the .so symlinks, if those are also getting created) really
> are just dross and should be deleted.
Ever is a strong word, you might want to wrap and customise a plugin or
something :)
Seriously, I'm in two minds on this and had patches both ways. In the
end I decided it was less ugly to package them than have the metadata
covered in .la file deletions which would likely encourage people to
delete library .la files too and not see the subtle difference.
There are also rumours that some libltdl derived plugin modules use
the .la files under certain circumstances. I suspect connman doesn't use
libltdl but I didn't check. I also suspect that if it did need them, the
standard package would need to include them. Since it presumably works
as is, it therefore mustn't need them. Its a useful thing to keep in
mind though since plugins doesn't necessarily mean no need for the .la
files (imagemagik was software that used the .la files for plugins
iirc).
Cheers,
Richard
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2011-07-06 10:39 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-05 22:51 [PATCH 00/17] Various QA/unpackaged files cleanups Richard Purdie
2011-07-05 22:51 ` [PATCH 01/17] gcc: Fix unpackaged files warnings, broken symlink and superfluous files Richard Purdie
2011-07-05 22:51 ` [PATCH 02/17] connman: Package unpackaged .la file Richard Purdie
2011-07-06 9:14 ` Phil Blundell
2011-07-06 10:34 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 03/17] tslib: " Richard Purdie
2011-07-05 22:51 ` [PATCH 04/17] btrfs-tools: Fix manpage creation directory Richard Purdie
2011-07-05 22:51 ` [PATCH 05/17] xcb-proto: Package unshipped files, create python-xcbgen package for python xcbgen code Richard Purdie
2011-07-05 22:51 ` [PATCH 06/17] eds-dbus: Package unpackaged files Richard Purdie
2011-07-05 22:51 ` [PATCH 07/17] systemtap: Don't set prefix to a path including so examples get placed in the correct path and packaged correctly Richard Purdie
2011-07-05 22:51 ` [PATCH 08/17] qt4: Package debug source files Richard Purdie
2011-07-05 22:51 ` [PATCH 09/17] telepathy-python: Remove unneeded and unpackaged files Richard Purdie
2011-07-05 22:51 ` [PATCH 10/17] librsvg: Clean up " Richard Purdie
2011-07-05 22:51 ` [PATCH 11/17] gtk-engines: Package " Richard Purdie
2011-07-05 22:51 ` [PATCH 12/17] x11perf: Packaged " Richard Purdie
2011-07-05 22:51 ` [PATCH 13/17] apt: Package " Richard Purdie
2011-07-06 9:17 ` Phil Blundell
2011-07-06 10:25 ` Richard Purdie
2011-07-05 22:51 ` [PATCH 14/17] git: Package up python and gitweb files into appropriate packages Richard Purdie
2011-07-05 22:51 ` [PATCH 15/17] kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues Richard Purdie
2011-07-06 9:15 ` Phil Blundell
2011-07-05 22:51 ` [PATCH 16/17] opensp: Add unpackaged files Richard Purdie
2011-07-05 22:51 ` [PATCH 17/17] chrpath: Ensure the package respects the docdir variable Richard Purdie
2011-07-06 2:59 ` [PATCH 00/17] Various QA/unpackaged files cleanups Otavio Salvador
2011-07-06 8:03 ` Richard Purdie
2011-07-06 9:06 ` Phil Blundell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.