On Sun, May 20, 2012 at 11:42:16PM -0700, Saul Wold wrote: > Signed-off-by: Saul Wold <[email protected]> > --- > meta/classes/binconfig.bbclass | 2 ++ > meta/conf/bitbake.conf | 8 +++++--- > meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 10 ++++++++++ > meta/recipes-connectivity/libpcap/libpcap.inc | 2 +- > meta/recipes-core/eglibc/eglibc-package.inc | 2 +- > meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- > meta/recipes-core/gettext/gettext_0.16.1.bb | 3 ++- > meta/recipes-core/gettext/gettext_0.18.1.1.bb | 4 +++- > meta/recipes-core/libxml/libxml2.inc | 2 +- > meta/recipes-core/ncurses/ncurses.inc | 2 +- > meta/recipes-extended/cups/cups14.inc | 1 + > meta/recipes-extended/cups/cups_1.4.6.bb | 2 +- > meta/recipes-extended/groff/groff_1.20.1.bb | 4 +++- > meta/recipes-extended/slang/slang_2.2.4.bb | 4 ++-- > meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 14 ++++++++++---- > meta/recipes-gnome/gthumb/gthumb_2.12.4.bb | 12 ++++++++---- > meta/recipes-graphics/directfb/directfb_1.4.15.bb | 2 +- > meta/recipes-graphics/freetype/freetype_2.4.8.bb | 5 +---- > meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +- > meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb | 6 ++++-- > meta/recipes-multimedia/libpng/libpng_1.2.49.bb | 4 +--- > meta/recipes-support/apr/apr-util_1.4.1.bb | 2 +- > meta/recipes-support/apr/apr_1.4.6.bb | 2 +- > meta/recipes-support/curl/curl_7.24.0.bb | 2 +- > meta/recipes-support/db/db_5.1.19.bb | 1 + > meta/recipes-support/gnutls/gnutls.inc | 5 ++--- > meta/recipes-support/gnutls/libtasn1_2.12.bb | 2 +- > meta/recipes-support/gpgme/gpgme_1.3.1.bb | 5 ++--- > meta/recipes-support/icu/icu-3.6.inc | 2 ++ > meta/recipes-support/icu/icu_3.6.bb | 2 +- > meta/recipes-support/libassuan/libassuan_2.0.3.bb | 1 + > meta/recipes-support/libgcrypt/libgcrypt.inc | 4 ---- > .../libgpg-error/libgpg-error_1.10.bb | 6 +----- > meta/recipes-support/libksba/libksba_1.2.0.bb | 1 + > meta/recipes-support/libpcre/libpcre_8.21.bb | 5 +---- > meta/recipes-support/libproxy/libproxy_0.4.7.bb | 3 ++- > meta/recipes-support/libusb/libusb-compat_0.1.3.bb | 4 +--- > meta/recipes-support/libxslt/libxslt_1.1.26.bb | 2 +- > meta/recipes-support/neon/neon_0.29.6.bb | 2 +- > meta/recipes-support/pth/pth_2.0.7.bb | 5 +---- > meta/recipes-support/taglib/taglib_1.6.3.bb | 3 +-- > 41 files changed, 83 insertions(+), 69 deletions(-) > > diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass > index 3deb541..60012c8 100644 > --- a/meta/classes/binconfig.bbclass > +++ b/meta/classes/binconfig.bbclass > @@ -1,3 +1,5 @@ > +FILES_${PN}-dev += "${bindir}/*-config" > + > # The namespaces can clash here hence the two step replace > def get_binconfig_mangle(d): > s = "-e ''" > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 7073018..a8485c3 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -253,7 +253,7 @@ SOLIBSDEV_darwin = ".dylib" > SOLIBSDEV_darwin8 = ".dylib" > SOLIBSDEV_darwin9 = ".dylib" > > -PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" > +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" > PACKAGES_DYNAMIC = "${PN}-locale-*" > FILES = "" > > @@ -261,7 +261,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* > ${libdir}/lib*${SOLIBS} > ${sysconfdir} ${sharedstatedir} ${localstatedir} \ > ${base_bindir}/* ${base_sbindir}/* \ > ${base_libdir}/*${SOLIBS} \ > - ${datadir}/${BPN} ${libdir}/${BPN}/* \ > + ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ > ${datadir}/pixmaps ${datadir}/applications \ > ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ > ${libdir}/bonobo/servers" > @@ -272,7 +272,9 @@ SECTION_${PN}-doc = "doc" > > FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ > ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ > - ${datadir}/aclocal ${base_libdir}/*.o" > + ${datadir}/aclocal ${base_libdir}/*.o \ > + ${libdir}/${BPN}/*.la \ > + ${base_libdir}/*${SOLIBSDEV} ${base_libdir}/*.la" > SECTION_${PN}-dev = "devel" > ALLOW_EMPTY_${PN}-dev = "1" > RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" > diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb > b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb > index 92d65c1..098b6d4 100644 > --- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb > +++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb > @@ -6,8 +6,12 @@ LICENSE="GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ > > file://src/pm-pmu.c;beginline=1;endline=22;md5=3c1ddbc54e735fb4a0386e14c78a3147" > > +<<<<<<< Updated upstream > PR = "r1" > RDEPENDS_${PN} = "grep" > +======= > +PR = "r2" > +>>>>>>> Stashed changes > > SRC_URI = "http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz"; > > @@ -20,5 +24,11 @@ do_configure_prepend () { > autoreconf -f -i -s > } > > +<<<<<<< Updated upstream > SRC_URI[md5sum] = "1742a556089c36c3a89eb1b957da5a60" > SRC_URI[sha256sum] = > "8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b" > +======= > +FILES_${PN} += "${libdir}/${BPN}/*" > +FILES_${PN}-dbg += "${libdir}/${BPN}/bin/.debug \ > + ${datadir}/doc/pm-utils/README.debugging" > +>>>>>>> Stashed changes
^ some rebase leftovers
the rest looks ok, but I'm pretty scared from such changes, does your
buildhistory diffs show just *-config file moves or something else too?
When you're at it, does it make sense to move also ${PN}-doc
${PN}-locale before ${PN} in PACKAGES? Both have well defined FILES
patterns, so ${PN} last can be used as catch all.
Cheers,
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
