diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-04 00:00:59 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-04 00:00:59 +0000 |
| commit | 78f5f8df30c8917900332138d6688b7470878d9e (patch) | |
| tree | 18d17a59150bf8ac0cd7aa7235c899a13e0cb153 | |
| parent | bb2a5c981019c80d319c6254c5994b7d158c65bd (diff) | |
| download | openembedded-core-78f5f8df30c8917900332138d6688b7470878d9e.tar.gz openembedded-core-78f5f8df30c8917900332138d6688b7470878d9e.tar.bz2 openembedded-core-78f5f8df30c8917900332138d6688b7470878d9e.zip | |
Various fixes after recent commit breakage
| -rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus.inc | 3 | ||||
| -rw-r--r-- | meta/packages/freetype/freetype-native_2.3.5.bb | 6 | ||||
| -rw-r--r-- | meta/packages/glibc/ldconfig-native_2.5.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gnome/gconf-dbus-native_svn.bb | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d6744a487e..369b24752e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -219,8 +219,7 @@ FILES_${PN}-locale = "${datadir}/locale" FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" # FILESPATH is set in base.bbclass #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -# Giving FILESDIR this default value is pointless as FILESPATH is always searched first - RP -#FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" +FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" ################################################################## # General work and output directories for the build system. diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc index 9659896037..68c8a842ee 100644 --- a/meta/packages/dbus/dbus.inc +++ b/meta/packages/dbus/dbus.inc @@ -79,7 +79,8 @@ do_stage() { install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ } -do_install_append() { +do_install() { + autotools_do_install install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/ diff --git a/meta/packages/freetype/freetype-native_2.3.5.bb b/meta/packages/freetype/freetype-native_2.3.5.bb index b5e8b307cd..a241741ab2 100644 --- a/meta/packages/freetype/freetype-native_2.3.5.bb +++ b/meta/packages/freetype/freetype-native_2.3.5.bb @@ -1,7 +1,5 @@ require freetype_${PV}.bb inherit native -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" EXTRA_OEMAKE= @@ -15,7 +13,3 @@ do_stage() { oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} } -do_install() { - : -} - diff --git a/meta/packages/glibc/ldconfig-native_2.5.bb b/meta/packages/glibc/ldconfig-native_2.5.bb index c221ba1608..1cd691e7bf 100644 --- a/meta/packages/glibc/ldconfig-native_2.5.bb +++ b/meta/packages/glibc/ldconfig-native_2.5.bb @@ -5,6 +5,8 @@ SRC_URI = "file://ldconfig-native-2.5.tar.bz2 \ inherit native +S = "${WORKDIR}/${PN}-${PV}" + do_compile () { $CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c -I. dl-cache.c -o ldconfig } diff --git a/meta/packages/gnome/gconf-dbus-native_svn.bb b/meta/packages/gnome/gconf-dbus-native_svn.bb index bb741be189..38109634a1 100644 --- a/meta/packages/gnome/gconf-dbus-native_svn.bb +++ b/meta/packages/gnome/gconf-dbus-native_svn.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "intltool-native virtual/libintl glib-2.0-native dbus-native dbus-glib-native libxml2-native popt-native gtk-doc-native" +DEPENDS = "intltool-native glib-2.0-native dbus-native dbus-glib-native libxml2-native popt-native gtk-doc-native" DESCRIPTION = "Settings daemon using DBUS for communication." LICENSE = "GPL" PROVIDES = "gconf-native" |