sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Various fixes after recent commit breakage

This commit is contained in:
Richard Purdie 2009-01-04 00:00:59 +00:00
parent bb2a5c9810
commit 78f5f8df30
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta/conf/bitbake.conf
View File

@ -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.

3
meta/packages/dbus/dbus.inc
View File

@ -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/

6
meta/packages/freetype/freetype-native_2.3.5.bb
View File

@ -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() {
:
}

2
meta/packages/glibc/ldconfig-native_2.5.bb
View File

@ -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
}

2
meta/packages/gnome/gconf-dbus-native_svn.bb
View File

@ -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"