diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-04-12 14:40:05 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-12 14:40:05 +0000 |
| commit | 0e66d8c3bcf2e00f0f71a198f1d41523c3db0b71 (patch) | |
| tree | 7b40ccc375e1c2c05d209826ee2747eb70d54d22 | |
| parent | 163f7909087afc617a78349c446d8eed1a6ae39d (diff) | |
| parent | 6a7cbb78b154c16fa85c34a9a715d7ca7d9a01be (diff) | |
merge of 5b47c32159e8766b523639396056aa211d4cd410
and dbb7c9f1cb33a45f5a82203f21c265ae3187199e
| -rw-r--r-- | packages/fontconfig/fontconfig_2.2.95.bb | 4 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index 8034f533ad..73e6be37b8 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -6,13 +6,13 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native" SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1" -PR = "r5" +PR = "r6" PACKAGES =+ "fontconfig-utils" FILES_fontconfig-utils = "${bindir}/*" # Work around past breakage in debian.bbclass -RPROVIDES_fontconfig-utils = "libfontconfig-utils" +RREPLACES_fontconfig-utils = "libfontconfig-utils" DEBIAN_NOAUTONAME_fontconfig-utils = "1" S = "${WORKDIR}/fontconfig-${PV}" diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index cdc5898be7..bc4b35514f 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -3,6 +3,8 @@ SECTION = "kernel" MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" +inherit kernel + PACKAGES += "kernel-module-hostap" RPROVIDES_kernel-module-hostap = "hostap-modules" @@ -12,8 +14,6 @@ JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" BASRC = "http://www.orca.cx/zaurus/patches" CHSRC = "http://oz.drigon.com/patches" -inherit kernel - ############################################################## # Compensate for sucky bootloader on all Sharp Zaurus models # |