From fb179604f2a16c75e27099b8d1471786e59f4ea6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 28 Oct 2006 19:33:04 +0000 Subject: [PATCH] packages: various .debug packaging fixes git-svn-id: https://svn.o-hand.com/repos/poky/trunk@831 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/alsa/alsa-lib_1.0.10.bb | 2 +- meta/packages/db/db_4.1.25.bb | 4 ++-- meta/packages/db/db_4.2.52.bb | 4 ++-- meta/packages/db/db_4.3.29.bb | 4 ++-- meta/packages/flac/flac_1.1.2.bb | 2 +- meta/packages/jpeg/jpeg_6b.bb | 2 +- meta/packages/lame/lame_3.96.1.bb | 2 +- meta/packages/libfakekey/libfakekey_svn.bb | 5 ----- meta/packages/libgpg-error/libgpg-error_1.0.bb | 2 +- meta/packages/libxml/libxml2_2.6.22.bb | 2 +- meta/packages/libxml/libxml2_cvs.bb | 2 +- .../matchbox-applet-inputmanager_0.6.bb | 2 +- .../matchbox-applet-startup-monitor_0.1.bb | 2 +- meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb | 11 +++++++---- meta/packages/matchbox-desktop/matchbox-desktop_svn.bb | 8 ++++++-- meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb | 2 +- .../matchbox-panel-manager/matchbox-panel-manager_0.1.bb | 2 +- meta/packages/matchbox-panel/matchbox-panel.inc | 2 +- meta/packages/matchbox-stroke/matchbox-stroke_svn.bb | 2 +- meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb | 2 +- meta/packages/matchbox-wm/matchbox-wm_1.1.bb | 2 +- meta/packages/matchbox-wm/matchbox-wm_svn.bb | 2 +- meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb | 2 +- meta/packages/pango/pango_1.10.2.bb | 2 +- meta/packages/settings-daemon/settings-daemon_svn.bb | 2 +- 25 files changed, 38 insertions(+), 36 deletions(-) diff --git a/meta/packages/alsa/alsa-lib_1.0.10.bb b/meta/packages/alsa/alsa-lib_1.0.10.bb index 6269496..ea293b5 100644 --- a/meta/packages/alsa/alsa-lib_1.0.10.bb +++ b/meta/packages/alsa/alsa-lib_1.0.10.bb @@ -25,6 +25,6 @@ do_stage () { PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev" FILES_libasound = "${libdir}/libasound.so*" -FILES_alsa-server = "${bindir}" +FILES_alsa-server = "${bindir}/*" FILES_alsa-conf = "${datadir}" FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/" diff --git a/meta/packages/db/db_4.1.25.bb b/meta/packages/db/db_4.1.25.bb index 381c69a..04426bd 100644 --- a/meta/packages/db/db_4.1.25.bb +++ b/meta/packages/db/db_4.1.25.bb @@ -37,11 +37,11 @@ PACKAGES += " ${PN}-bin" # Package contents FILES_${PN} = "${libdir}/libdb*so*" -FILES_${PN}-bin = "${bindir}" +FILES_${PN}-bin = "${bindir}/*" # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package -FILES_${PN}-dev = "${includedir} ${libdir}" +FILES_${PN}-dev = "${includedir} ${libdir}/*" #configuration - set in local.conf to override DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild" diff --git a/meta/packages/db/db_4.2.52.bb b/meta/packages/db/db_4.2.52.bb index 9e5978f..261e6f5 100644 --- a/meta/packages/db/db_4.2.52.bb +++ b/meta/packages/db/db_4.2.52.bb @@ -45,11 +45,11 @@ PACKAGES += " ${PN}-bin" # Package contents FILES_${PN} = "${libdir}/libdb-4*so*" -FILES_${PN}-bin = "${bindir}" +FILES_${PN}-bin = "${bindir}/*" # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package -FILES_${PN}-dev = "${includedir} ${libdir}" +FILES_${PN}-dev = "${includedir} ${libdir}/*" #configuration - set in local.conf to override DB4_CONFIG ?= " --disable-cryptography --disable-queue --disable-replication --disable-verify --enable-hash" diff --git a/meta/packages/db/db_4.3.29.bb b/meta/packages/db/db_4.3.29.bb index a4059aa..d8f9372 100644 --- a/meta/packages/db/db_4.3.29.bb +++ b/meta/packages/db/db_4.3.29.bb @@ -48,11 +48,11 @@ PACKAGES += " ${PN}-bin" # Package contents FILES_${PN} = "${libdir}/libdb-4*so*" -FILES_${PN}-bin = "${bindir}" +FILES_${PN}-bin = "${bindir}/*" # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package -FILES_${PN}-dev = "${includedir} ${libdir}" +FILES_${PN}-dev = "${includedir} ${libdir}/*" #configuration - set in local.conf to override DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild --enable-compat185" diff --git a/meta/packages/flac/flac_1.1.2.bb b/meta/packages/flac/flac_1.1.2.bb index cbfaaa0..078190d 100644 --- a/meta/packages/flac/flac_1.1.2.bb +++ b/meta/packages/flac/flac_1.1.2.bb @@ -21,7 +21,7 @@ EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ --without-id3lib" PACKAGES += "libflac libflac++ liboggflac liboggflac++" -FILES_${PN} = "${bindir}" +FILES_${PN} = "${bindir}/*" FILES_libflac = "${libdir}/libFLAC.so.*" FILES_libflac++ = "${libdir}/libFLAC++.so.*" FILES_liboggflac = "${libdir}/libOggFLAC.so.*" diff --git a/meta/packages/jpeg/jpeg_6b.bb b/meta/packages/jpeg/jpeg_6b.bb index 0960a7a..39e161f 100644 --- a/meta/packages/jpeg/jpeg_6b.bb +++ b/meta/packages/jpeg/jpeg_6b.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "libtool-cross" DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format." PACKAGES =+ "jpeg-tools " -FILES_jpeg-tools = "${bindir}" +FILES_jpeg-tools = "${bindir}/*" LICENSE ="jpeg" SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ file://debian.patch;patch=1 \ diff --git a/meta/packages/lame/lame_3.96.1.bb b/meta/packages/lame/lame_3.96.1.bb index b732a8c..10eb845 100644 --- a/meta/packages/lame/lame_3.96.1.bb +++ b/meta/packages/lame/lame_3.96.1.bb @@ -11,7 +11,7 @@ inherit autotools PACKAGES += "libmp3lame libmp3lame-dev" FILES_${PN} = "${bindir}/lame" FILES_libmp3lame = "${libdir}/libmp3lame.so.*" -FILES_libmp3lame-dev = "${includedir} ${libdir}" +FILES_libmp3lame-dev = "${includedir} ${libdir}/*" FILES_${PN}-dev = "" do_configure() { diff --git a/meta/packages/libfakekey/libfakekey_svn.bb b/meta/packages/libfakekey/libfakekey_svn.bb index eec4d65..abbbad0 100644 --- a/meta/packages/libfakekey/libfakekey_svn.bb +++ b/meta/packages/libfakekey/libfakekey_svn.bb @@ -11,13 +11,8 @@ S = "${WORKDIR}/${PN}" inherit autotools pkgconfig gettext -FILES_${PN} = "${libdir} \ - ${datadir}/applications \ - ${datadir}/pixmaps" - do_stage () { install -d ${STAGING_INCDIR}/fakekey install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR} } - diff --git a/meta/packages/libgpg-error/libgpg-error_1.0.bb b/meta/packages/libgpg-error/libgpg-error_1.0.bb index c290538..115a9c1 100644 --- a/meta/packages/libgpg-error/libgpg-error_1.0.bb +++ b/meta/packages/libgpg-error/libgpg-error_1.0.bb @@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ # move libgpg-error-config into -dev package FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" +FILES_${PN}-dev += "${bindir}/*" inherit autotools binconfig pkgconfig diff --git a/meta/packages/libxml/libxml2_2.6.22.bb b/meta/packages/libxml/libxml2_2.6.22.bb index fae00a6..f295010 100644 --- a/meta/packages/libxml/libxml2_2.6.22.bb +++ b/meta/packages/libxml/libxml2_2.6.22.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" -FILES_${PN}-utils += "${bindir}" +FILES_${PN}-utils += "${bindir}/*" SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \ file://no-testapi.patch;patch=1" diff --git a/meta/packages/libxml/libxml2_cvs.bb b/meta/packages/libxml/libxml2_cvs.bb index 14a5ebb..9f8b317 100644 --- a/meta/packages/libxml/libxml2_cvs.bb +++ b/meta/packages/libxml/libxml2_cvs.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" -FILES_${PN}-utils += "${bindir}" +FILES_${PN}-utils += "${bindir}/*" PV = "2.6.23+cvs${SRCDATE}" S = "${WORKDIR}/${PN}" diff --git a/meta/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/meta/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb index 85dee09..d868f14 100644 --- a/meta/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb +++ b/meta/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb @@ -8,5 +8,5 @@ S = "${WORKDIR}/mb-applet-input-manager-${PV}" inherit autotools pkgconfig -FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps" +FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps" diff --git a/meta/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb b/meta/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb index d5f0d24..f2ef25a 100644 --- a/meta/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb +++ b/meta/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb @@ -8,5 +8,5 @@ S = "${WORKDIR}/mb-applet-startup-monitor-${PV}" inherit autotools pkgconfig -FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps" +FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps" diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb index 5b1e472..1b842d7 100644 --- a/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -9,16 +9,19 @@ EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" inherit autotools pkgconfig -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/applications \ ${libdir}/matchbox/desktop/*.so \ ${datadir}/matchbox-desktop \ ${datadir}/pixmaps \ ${sysconfdir}/matchbox" -FILES_${PN}-dev = "${libdir}/matchbox-desktop \ - ${includedir}/matchbox-desktop \ - ${datadir}/matchbox/desktop/modules/*a" +FILES_${PN}-dev += "${libdir}/matchbox-desktop \ + ${includedir}/matchbox-desktop \ + ${libdir}/matchbox/desktop/*.*a \ + ${datadir}/matchbox/desktop/modules/*a" + +FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/" do_stage() { install -d ${STAGING_INCDIR}/matchbox-desktop/ diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb index 6f2365c..3d041bf 100644 --- a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb +++ b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb @@ -13,17 +13,21 @@ S = ${WORKDIR}/${PN} inherit autotools pkgconfig -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/applications \ ${libdir}/matchbox/desktop/*.so \ ${datadir}/matchbox-desktop \ ${datadir}/pixmaps \ ${sysconfdir}/matchbox" -FILES_${PN}-dev = "${libdir}/matchbox-desktop \ +FILES_${PN}-dev += "${libdir}/matchbox-desktop \ ${includedir}/matchbox-desktop \ + ${libdir}/matchbox/desktop/*.*a \ ${datadir}/matchbox/desktop/modules/*a" +FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/" + + do_stage() { install -d ${STAGING_INCDIR}/matchbox-desktop/ install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/matchbox-desktop/ diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index d2514d9..e561e84 100644 --- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -15,7 +15,7 @@ inherit autotools pkgconfig gettext EXTRA_OECONF = "--disable-cairo" -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/applications \ ${datadir}/pixmaps \ ${datadir}/matchbox-keyboard" diff --git a/meta/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb b/meta/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb index 1023a6a..fea6953 100644 --- a/meta/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb +++ b/meta/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb @@ -8,5 +8,5 @@ S = "${WORKDIR}/${PN}-${PV}" inherit autotools pkgconfig -FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps" +FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps" diff --git a/meta/packages/matchbox-panel/matchbox-panel.inc b/meta/packages/matchbox-panel/matchbox-panel.inc index d5d3551..26f1543 100644 --- a/meta/packages/matchbox-panel/matchbox-panel.inc +++ b/meta/packages/matchbox-panel/matchbox-panel.inc @@ -16,7 +16,7 @@ EXTRA_OECONF_append_poodle = " --enable-small-icons " EXTRA_OECONF_append_mnci = " --enable-small-icons " EXTRA_OECONF_append_integral13 = " --enable-small-icons " -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/applications \ ${datadir}/pixmaps" diff --git a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb b/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb index 9bbbe89..a019c16 100644 --- a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb +++ b/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb @@ -12,7 +12,7 @@ S = ${WORKDIR}/${PN} inherit autotools pkgconfig gettext -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/applications \ ${datadir}/pixmaps \ ${datadir}/matchbox-stroke" diff --git a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb index c158f59..cc21ede 100644 --- a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/matchbox-window-manager-${PV}" inherit autotools pkgconfig update-alternatives -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ ${sysconfdir}/matchbox \ ${datadir}/themes/blondie/matchbox \ diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb index 406a278..2d7c575 100644 --- a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb +++ b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/matchbox-window-manager-${PV}" inherit autotools pkgconfig update-alternatives -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ ${sysconfdir}/matchbox \ ${datadir}/themes/blondie/matchbox \ diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb index ad37976..262a3b9 100644 --- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/meta/packages/matchbox-wm/matchbox-wm_svn.bb @@ -19,7 +19,7 @@ ALTERNATIVE_LINK = "${bindir}/x-window-manager" ALTERNATIVE_PATH = "${bindir}/matchbox-session" ALTERNATIVE_PRIORITY = "10" -FILES_${PN} = "${bindir} \ +FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ ${sysconfdir}/matchbox \ ${datadir}/themes/blondie/matchbox \ diff --git a/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb index 4ac4435..34b7b04 100644 --- a/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb +++ b/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb @@ -16,7 +16,7 @@ EXTRA_OECONF = "--enable-shared --disable-sdl --with-x" PACKAGES = "mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev" -FILES_${PN} = "${bindir}" +FILES_${PN} = "${bindir}/*" FILES_libmpeg2 = "${libdir}/libmpeg2.so.*" FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*" FILES_libmpeg2-dev = "${libdir}/libmpeg2.so \ diff --git a/meta/packages/pango/pango_1.10.2.bb b/meta/packages/pango/pango_1.10.2.bb index 74730e1..76fab4d 100644 --- a/meta/packages/pango/pango_1.10.2.bb +++ b/meta/packages/pango/pango_1.10.2.bb @@ -21,7 +21,7 @@ EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ --disable-debug" -FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*" +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" LIBV = "1.4.0" diff --git a/meta/packages/settings-daemon/settings-daemon_svn.bb b/meta/packages/settings-daemon/settings-daemon_svn.bb index 13a1a64..00cca1a 100644 --- a/meta/packages/settings-daemon/settings-daemon_svn.bb +++ b/meta/packages/settings-daemon/settings-daemon_svn.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/${PN}" inherit autotools pkgconfig gettext gconf -FILES_${PN} = "${bindir} ${sysconfdir}" +FILES_${PN} = "${bindir}/* ${sysconfdir}" do_install_append () { install -d ${D}/${sysconfdir}/X11/Xsession.d -- 2.7.4