Various QA/unpackaged files cleanups
cover Various QA/unpackaged files cleanups
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
Signature · 1 line
1.7.4.1
PATCH 1/17 gcc: Fix unpackaged files warnings, broken symlink and superfluous files
--- meta/recipes-devtools/gcc/gcc-package-target.inc | 25 +++++++++++++++++---- 1 files changed, 20 insertions(+), 5 deletions(-)
meta/recipes-devtools/gcc/gcc-package-target.inc +20 -5
@@ -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} }
Signature · 1 line
1.7.4.1
PATCH 2/17 connman: Package unpackaged .la file
--- meta/recipes-connectivity/connman/connman.inc | 2 ++ meta/recipes-connectivity/connman/connman_0.75.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-connectivity/connman/connman.inc +2 -0
@@ -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 = []
meta/recipes-connectivity/connman/connman_0.75.bb +1 -1
@@ -1,5 +1,5 @@ require connman.inc -PR = "r0" +PR = "r1" EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
Signature · 1 line
1.7.4.1
Re: [PATCH 02/17] connman: Package unpackaged .la file
Quoted 1 line · Richard Purdie
+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.
Re: [PATCH 02/17] connman: Package unpackaged .la file
Quoted 8 lines · Phil Blundell
Quoted 1 line · Richard Purdie
+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
PATCH 3/17 tslib: Package unpackaged .la file
In reply to Richard Purdie--- meta/recipes-graphics/tslib/tslib_1.0.bb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-graphics/tslib/tslib_1.0.bb +2 -1
@@ -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"
Signature · 1 line
1.7.4.1
PATCH 4/17 btrfs-tools: Fix manpage creation directory
In reply to Richard Purdie--- .../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
meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch new file +31 -0
@@ -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
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +2 -1
@@ -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"
Signature · 1 line
1.7.4.1
PATCH 5/17 xcb-proto: Package unshipped files, create python-xcbgen package for python xcbgen code
In reply to Richard Purdie--- 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(-)
meta/recipes-graphics/xcb/xcb-proto.inc +4 -1
@@ -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})"
meta/recipes-graphics/xcb/xcb-proto_1.6.bb +1 -1
@@ -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"
Signature · 1 line
1.7.4.1
PATCH 6/17 eds-dbus: Package unpackaged files
In reply to Richard Purdie--- 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(-)
meta/recipes-sato/eds/eds-dbus_2.20.0.bb +5 -2
@@ -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 \
meta/recipes-sato/eds/eds-dbus_git.bb +7 -2
@@ -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 \
Signature · 1 line
1.7.4.1
PATCH 7/17 systemtap: Don't set prefix to a path including so examples get placed in the correct path and packaged correctly
In reply to Richard Purdie--- meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/systemtap/systemtap_git.bb +2 -2
@@ -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 \
Signature · 1 line
1.7.4.1
PATCH 8/17 qt4: Package debug source files
In reply to Richard Purdie--- meta/recipes-qt/qt4/qt4.inc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-qt/qt4/qt4.inc +3 -1
@@ -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}"
Signature · 1 line
1.7.4.1
PATCH 9/17 telepathy-python: Remove unneeded and unpackaged files
In reply to Richard Purdie--- .../telepathy/telepathy-python_0.15.19.bb | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb +8 -1
@@ -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 +}
Signature · 1 line
1.7.4.1
PATCH 10/17 librsvg: Clean up unpackaged files
In reply to Richard Purdie--- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +10 -5
@@ -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() {
Signature · 1 line
1.7.4.1
PATCH 11/17 gtk-engines: Package unpackaged files
In reply to Richard Purdie--- .../gtk-engines/gtk-engines_2.20.2.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +4 -1
@@ -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
Signature · 1 line
1.7.4.1
PATCH 12/17 x11perf: Packaged unpackaged files
In reply to Richard Purdie--- meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-graphics/xorg-app/x11perf_1.5.3.bb +3 -1
@@ -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"
Signature · 1 line
1.7.4.1
PATCH 13/17 apt: Package unpackaged files
In reply to Richard Purdie--- 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(-)
meta/recipes-devtools/apt/apt-package.inc +1 -1
@@ -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
meta/recipes-devtools/apt/apt_0.7.14.bb +2 -2
@@ -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"
Signature · 1 line
1.7.4.1
Re: [PATCH 13/17] apt: Package unpackaged files
meta/recipes-devtools/apt/apt-package.inc FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" · line 65
Quoted 2 lines · Richard Purdie
meta/recipes-devtools/apt/apt-package.inc +1
-1-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.
Re: [PATCH 13/17] apt: Package unpackaged files
Quoted 6 lines · Phil Blundell
meta/recipes-devtools/apt/apt-package.inc FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" · line 65
Quoted 2 lines · Richard Purdie
meta/recipes-devtools/apt/apt-package.inc +1
-1-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
PATCH 14/17 git: Package up python and gitweb files into appropriate packages
In reply to Richard Purdie--- meta/recipes-devtools/git/git.inc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
meta/recipes-devtools/git/git.inc +6 -0
@@ -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"
Signature · 1 line
1.7.4.1
PATCH 15/17 kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues
In reply to Richard Purdie--- 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
meta/recipes-kernel/trace-cmd/kernelshark_git.bb +8 -2
@@ -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 }
meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch new file +43 -0
43 lines not on this page · raw message
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +3 -2
@@ -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}'"
Signature · 1 line
1.7.4.1
Re: [PATCH 15/17] kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues
That should be "fixing", I guess.
p.
PATCH 16/17 opensp: Add unpackaged files
In reply to Richard Purdie--- meta/recipes-devtools/opensp/opensp_1.5.bb | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-devtools/opensp/opensp_1.5.bb +3 -1
@@ -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"
Signature · 1 line
1.7.4.1
PATCH 17/17 chrpath: Ensure the package respects the docdir variable
In reply to Richard PurdieThis resolves unpackaged file QA warnings and an empty -doc package.
--- .../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
meta/recipes-devtools/chrpath/chrpath/standarddoc.patch new file +19 -0
@@ -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
meta/recipes-devtools/chrpath/chrpath_0.13.bb +3 -2
@@ -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"
Signature · 1 line
1.7.4.1
Quoted 1 line · Richard Purdie
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.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 11 lines · Otavio Salvador
Quoted 1 line · Richard Purdie
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
Quoted 11 lines · Otavio Salvador
Quoted 1 line · Richard Purdie
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.