diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-12-01 15:37:14 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-12-01 15:37:14 +0000 |
| commit | ac5d71cc7baffc7cfb26b0737b04c7543bdd9e79 (patch) | |
| tree | 4ceaf461f69f78f10c6bac3bd9caaad4e1332115 | |
| parent | 4f41031526ad3c5c2b449059ae94e4374d41ada6 (diff) | |
| parent | a6f9994982fb60772155c11b23da02426955c98d (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 3 | ||||
| -rw-r--r-- | packages/fontconfig/fontconfig.inc | 1 | ||||
| -rw-r--r-- | packages/fontconfig/fontconfig_2.6.0.bb | 2 | ||||
| -rw-r--r-- | packages/images/beagleboard-demo-image.bb | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index f8ad6d90f9..e11c2aee23 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -54,12 +54,13 @@ do_build # * armv4t: om-gta01 # * armv5te: c7x0 # * armv6: nokia800 +# * armv6-novfp: htckaiser # * armv7a: beagleboard # * ppc405: dht-walnut # * ppc603e: efika # * i586: qemux86 -for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika qemux86 +for machine in simpad om-gta01 c7x0 nokia800 htckaiser beagleboard dht-walnut efika qemux86 do BUILD_MACHINE=$machine BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" diff --git a/packages/fontconfig/fontconfig.inc b/packages/fontconfig/fontconfig.inc index 9af3540080..e55fa8c768 100644 --- a/packages/fontconfig/fontconfig.inc +++ b/packages/fontconfig/fontconfig.inc @@ -3,6 +3,7 @@ SECTION = "libs" LICENSE = "BSD" DEPENDS = "expat freetype freetype-native zlib" +PR = "r1" # Work around past breakage in debian.bbclass RPROVIDES_fontconfig-utils = "libfontconfig-utils" RREPLACES_fontconfig-utils = "libfontconfig-utils" diff --git a/packages/fontconfig/fontconfig_2.6.0.bb b/packages/fontconfig/fontconfig_2.6.0.bb index d6c1019c1e..5a056b7885 100644 --- a/packages/fontconfig/fontconfig_2.6.0.bb +++ b/packages/fontconfig/fontconfig_2.6.0.bb @@ -3,6 +3,8 @@ LICENSE = "BSD" DESCRIPTION = "A library for configuring and customizing font access." DEPENDS = "expat freetype zlib" +PR = "r1" + SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://fix-pkgconfig.patch;patch=1" diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index 0e62414c6a..3abe81207d 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -1,6 +1,6 @@ # Demo image for beagleboard -IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es" +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" XSERVER ?= "xserver-xorg \ xf86-input-evdev \ |