diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-04-27 11:45:28 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-04-27 11:45:28 +0000 |
| commit | 9bac2420a0f2048881314b2755fe7a2833cf9e12 (patch) | |
| tree | 3d441c5b3c4bf0ff1451847e673937b56a4037ea | |
| parent | 4efe78eced9efc9f98366e8667214af316795e2b (diff) | |
| parent | 2946c01f3c2d31282d1bf9a588135c9ee6bf5f81 (diff) | |
merge of '02896db153506db9332a007c3b54a440e15c95bd'
and 'bd7c8e1bf8c542b214b7d6e21e849e512bb796e1'
| -rw-r--r-- | conf/machine/mtx-3a.conf | 2 | ||||
| -rw-r--r-- | packages/freetype/freetype_2.3.3.bb | 10 | ||||
| -rw-r--r-- | packages/images/nylon-image-mini.bb | 8 | ||||
| -rw-r--r-- | packages/xcb/libxcb_0.9.93.bb | 4 |
4 files changed, 13 insertions, 11 deletions
diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf index 6f963d164e..000b200840 100644 --- a/conf/machine/mtx-3a.conf +++ b/conf/machine/mtx-3a.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the mtx-3a TARGET_ARCH = "arm" -#PACKAGE_ARCHS = "all arm ${MACHINE}" +PACKAGE_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" TARGET_CC_ARCH = "-march=armv5te" diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.3.bb index 79633a3d7f..830328a57f 100644 --- a/packages/freetype/freetype_2.3.3.bb +++ b/packages/freetype/freetype_2.3.3.bb @@ -1,12 +1,14 @@ DESCRIPTION = "Freetype font rendering library" SECTION = "libs" LICENSE = "freetype" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://fix-x86_64-build.patch;patch=1" -# file://no-hardcode.patch;patch=1" -# file://configure.patch;patch=1 \ + file://fix-x86_64-build.patch;patch=1 \ + file://no-hardcode.patch;patch=1 \ + file://configure.patch;patch=1 \ + " + S = "${WORKDIR}/freetype-${PV}" inherit autotools pkgconfig binconfig diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb index e6acd1f2dc..c0ed998449 100644 --- a/packages/images/nylon-image-mini.bb +++ b/packages/images/nylon-image-mini.bb @@ -1,5 +1,8 @@ export IMAGE_BASENAME = "nylon-mini" +inherit image +LICENSE = "MIT" + NYLON_BASE = "base-files base-passwd busybox \ dropbear \ miniinit \ @@ -8,12 +11,9 @@ NYLON_BASE = "base-files base-passwd busybox \ netbase \ wireless-tools" -RDEPENDS = "kernel \ +RDEPENDS += "kernel \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" export PACKAGE_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" - -inherit image -LICENSE = "MIT" diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb index 26eea1d576..aba8d921a3 100644 --- a/packages/xcb/libxcb_0.9.93.bb +++ b/packages/xcb/libxcb_0.9.93.bb @@ -2,10 +2,10 @@ DESCRIPTION = "XCB: an X protocol C binding" SECTION = "x11/libs" LICENSE = "MIT-X" HOMEPAGE = "http://xcb.freedesktop.org" -PR = "r0" +PR = "r1" PARALLEL_MAKE = "" -DEPENDS = "xcb-proto libxau" +DEPENDS = "xcb-proto libxau xslt-native" # DEPENDS += "xsltproc-native gperf-native" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" |