summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-04 00:00:59 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-04 00:00:59 +0000
commit78f5f8df30c8917900332138d6688b7470878d9e (patch)
tree18d17a59150bf8ac0cd7aa7235c899a13e0cb153
parentbb2a5c981019c80d319c6254c5994b7d158c65bd (diff)
downloadpoky-78f5f8df30c8917900332138d6688b7470878d9e.tar.gz
Various fixes after recent commit breakage
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/packages/dbus/dbus.inc3
-rw-r--r--meta/packages/freetype/freetype-native_2.3.5.bb6
-rw-r--r--meta/packages/glibc/ldconfig-native_2.5.bb2
-rw-r--r--meta/packages/gnome/gconf-dbus-native_svn.bb2
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"
219FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" 219FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
220# FILESPATH is set in base.bbclass 220# FILESPATH is set in base.bbclass
221#FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" 221#FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
222# Giving FILESDIR this default value is pointless as FILESPATH is always searched first - RP 222FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
223#FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
224 223
225################################################################## 224##################################################################
226# General work and output directories for the build system. 225# 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() {
79 install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ 79 install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
80} 80}
81 81
82do_install_append() { 82do_install() {
83 autotools_do_install
83 install -d ${D}/etc/default/volatiles 84 install -d ${D}/etc/default/volatiles
84 install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/ 85 install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/
85 86
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 @@
1require freetype_${PV}.bb 1require freetype_${PV}.bb
2inherit native 2inherit native
3DEPENDS = ""
4FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
5 3
6EXTRA_OEMAKE= 4EXTRA_OEMAKE=
7 5
@@ -15,7 +13,3 @@ do_stage() {
15 oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} 13 oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
16} 14}
17 15
18do_install() {
19 :
20}
21
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 \
5 5
6inherit native 6inherit native
7 7
8S = "${WORKDIR}/${PN}-${PV}"
9
8do_compile () { 10do_compile () {
9 $CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c -I. dl-cache.c -o ldconfig 11 $CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c -I. dl-cache.c -o ldconfig
10} 12}
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 @@
1SECTION = "x11/utils" 1SECTION = "x11/utils"
2DEPENDS = "intltool-native virtual/libintl glib-2.0-native dbus-native dbus-glib-native libxml2-native popt-native gtk-doc-native" 2DEPENDS = "intltool-native glib-2.0-native dbus-native dbus-glib-native libxml2-native popt-native gtk-doc-native"
3DESCRIPTION = "Settings daemon using DBUS for communication." 3DESCRIPTION = "Settings daemon using DBUS for communication."
4LICENSE = "GPL" 4LICENSE = "GPL"
5PROVIDES = "gconf-native" 5PROVIDES = "gconf-native"