summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/mtx-3a.conf2
-rw-r--r--packages/freetype/freetype_2.3.3.bb8
-rw-r--r--packages/images/nylon-image-mini.bb8
3 files changed, 9 insertions, 9 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..f3b0e0bf6f 100644
--- a/packages/freetype/freetype_2.3.3.bb
+++ b/packages/freetype/freetype_2.3.3.bb
@@ -1,12 +1,12 @@
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"