diff options
| -rw-r--r-- | openembedded/classes/package.bbclass | 4 | ||||
| -rw-r--r-- | openembedded/conf/distro/poky.conf | 4 | ||||
| -rwxr-xr-x | openembedded/packages/eds/eds-dbus_svn.bb | 3 | ||||
| -rw-r--r-- | openembedded/packages/fontconfig/fontconfig_2.2.95.bb | 4 | ||||
| -rwxr-xr-x | openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb | 2 | ||||
| -rw-r--r-- | openembedded/packages/gtk+/gtk+_2.6.7.bb | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/openembedded/classes/package.bbclass b/openembedded/classes/package.bbclass index fd8d1b7b09..03a533d59a 100644 --- a/openembedded/classes/package.bbclass +++ b/openembedded/classes/package.bbclass | |||
| @@ -84,8 +84,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst | |||
| 84 | # Function to strip a single file, called from RUNSTRIP below | 84 | # Function to strip a single file, called from RUNSTRIP below |
| 85 | # A working 'file' (one which works on the target architecture) | 85 | # A working 'file' (one which works on the target architecture) |
| 86 | # is necessary for this stuff to work. | 86 | # is necessary for this stuff to work. |
| 87 | PACKAGE_DEPENDS ?= "file-native" | 87 | #PACKAGE_DEPENDS ?= "file-native" |
| 88 | DEPENDS_prepend =+ "${PACKAGE_DEPENDS} " | 88 | #DEPENDS_prepend =+ "${PACKAGE_DEPENDS} " |
| 89 | #FIXME: this should be "" when any errors are gone! | 89 | #FIXME: this should be "" when any errors are gone! |
| 90 | IGNORE_STRIP_ERRORS ?= "1" | 90 | IGNORE_STRIP_ERRORS ?= "1" |
| 91 | 91 | ||
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index ad35c65b00..a996183c79 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf | |||
| @@ -69,6 +69,8 @@ PREFERRED_PROVIDER_x11 = "diet-x11" | |||
| 69 | PREFERRED_PROVIDER_gconf=gconf-dbus | 69 | PREFERRED_PROVIDER_gconf=gconf-dbus |
| 70 | PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus | 70 | PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus |
| 71 | 71 | ||
| 72 | PREFERRED_VERSION_gnome-vfs-dbus = "2.12.0+cvs${SRCDATE}" | ||
| 73 | |||
| 72 | 74 | ||
| 73 | # | 75 | # |
| 74 | # CVS Dates to use: | 76 | # CVS Dates to use: |
| @@ -170,3 +172,5 @@ PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" | |||
| 170 | PREFERRED_VERSION_xst ?= "0.15" | 172 | PREFERRED_VERSION_xst ?= "0.15" |
| 171 | 173 | ||
| 172 | PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}" | 174 | PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}" |
| 175 | |||
| 176 | PCMCIA_MANAGER = "pcmciautils" \ No newline at end of file | ||
diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb index 98658a1fae..a402e65a27 100755 --- a/openembedded/packages/eds/eds-dbus_svn.bb +++ b/openembedded/packages/eds/eds-dbus_svn.bb | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | LICENSE = "LGPL" | 1 | LICENSE = "LGPL" |
| 2 | DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv" | 2 | DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv" |
| 3 | RDEPENDS = "gconf dbus-1 db libiconv" | 3 | RDEPENDS = "gconf db libiconv" |
| 4 | #dbus | ||
| 4 | MAINTAINER = "Chris Lord <chris@openedhand.com>" | 5 | MAINTAINER = "Chris Lord <chris@openedhand.com>" |
| 5 | DESCRIPTION = "Evolution database backend server" | 6 | DESCRIPTION = "Evolution database backend server" |
| 6 | PV = "1.4.0+svn${SRCDATE}" | 7 | PV = "1.4.0+svn${SRCDATE}" |
diff --git a/openembedded/packages/fontconfig/fontconfig_2.2.95.bb b/openembedded/packages/fontconfig/fontconfig_2.2.95.bb index 6989b7a053..78b35b1793 100644 --- a/openembedded/packages/fontconfig/fontconfig_2.2.95.bb +++ b/openembedded/packages/fontconfig/fontconfig_2.2.95.bb | |||
| @@ -7,11 +7,13 @@ SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz | |||
| 7 | file://fc-glyphname.patch;patch=1 \ | 7 | file://fc-glyphname.patch;patch=1 \ |
| 8 | file://fc-lang.patch;patch=1 \ | 8 | file://fc-lang.patch;patch=1 \ |
| 9 | file://local.conf" | 9 | file://local.conf" |
| 10 | PR = "r1" | 10 | PR = "r2" |
| 11 | 11 | ||
| 12 | PACKAGES =+ "fontconfig-utils " | 12 | PACKAGES =+ "fontconfig-utils " |
| 13 | FILES_fontconfig-utils = "${bindir}/*" | 13 | FILES_fontconfig-utils = "${bindir}/*" |
| 14 | 14 | ||
| 15 | PKG_fontconfig-utils=fontconfig-utils | ||
| 16 | |||
| 15 | S = "${WORKDIR}/fontconfig-${PV}" | 17 | S = "${WORKDIR}/fontconfig-${PV}" |
| 16 | 18 | ||
| 17 | inherit autotools pkgconfig | 19 | inherit autotools pkgconfig |
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb index 660271d1c0..4a890ac32c 100755 --- a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb +++ b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb | |||
| @@ -89,6 +89,8 @@ do_stage() { | |||
| 89 | for i in ${GNOME_VFS_PLATFORM_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/include/libgnomevfs/; done | 89 | for i in ${GNOME_VFS_PLATFORM_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/include/libgnomevfs/; done |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" | ||
| 93 | |||
| 92 | python populate_packages_prepend () { | 94 | python populate_packages_prepend () { |
| 93 | print bb.data.getVar('FILES_gnome-vfs', d, 1) | 95 | print bb.data.getVar('FILES_gnome-vfs', d, 1) |
| 94 | 96 | ||
diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb index bcfd2b598d..e4e93cacdd 100644 --- a/openembedded/packages/gtk+/gtk+_2.6.7.bb +++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb | |||
| @@ -64,7 +64,7 @@ fi | |||
| 64 | 64 | ||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | PACKAGES_DYANMIC = "gdk-pixbuf-loader-* gtk-immodule-*" | 67 | PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" |
| 68 | 68 | ||
| 69 | python populate_packages_prepend () { | 69 | python populate_packages_prepend () { |
| 70 | import os.path | 70 | import os.path |
