[oe-commits] org.oe.dev merge of '02896db153506db9332a007c3b54a440e15c95bd'

[rwhitby commit]

merge of '02896db153506db9332a007c3b54a440e15c95bd'
     and 'bd7c8e1bf8c542b214b7d6e21e849e512bb796e1'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: df36391938bd296ae238e5e7c286a075be0015a6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df36391938bd296ae238e5e7c286a075be0015a6
Files:
1
conf/machine/mtx-3a.conf
packages/freetype/freetype_2.3.3.bb
packages/images/nylon-image-mini.bb
packages/xcb/libxcb_0.9.93.bb
Diffs:

#
# mt diff -r02896db153506db9332a007c3b54a440e15c95bd -rdf36391938bd296ae238e5e7c286a075be0015a6
#
# 
# 
# patch "conf/machine/mtx-3a.conf"
#  from [d1f7d5a166503cdd2bcc767495e83cdb8a51323d]
#    to [aa378e002b231e92deaa857037d424a3ea903aaf]
# 
# patch "packages/freetype/freetype_2.3.3.bb"
#  from [4e066043085f52cdd0cfa3ed9c8b69ce68436ab7]
#    to [7fc882b321f36c7bcefb9402a81ff065c0d426b4]
# 
# patch "packages/images/nylon-image-mini.bb"
#  from [4cbffe3c0489c132c323f73eb625ed587c073edb]
#    to [fa47a8388a5cdf939a7afd5a103890b2aee7dc14]
# 
# patch "packages/xcb/libxcb_0.9.93.bb"
#  from [ff378cad920570cce9de47706e9e06dc377ffb04]
#    to [43edc8a9df1419b1259a193fab2280abea7ccd26]
# 
============================================================
--- conf/machine/mtx-3a.conf	d1f7d5a166503cdd2bcc767495e83cdb8a51323d
+++ conf/machine/mtx-3a.conf	aa378e002b231e92deaa857037d424a3ea903aaf
@@ -1,9 +1,9 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine - the orange marvell box
 #@NAME: 4G Systems mtx-3a
 #@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"
============================================================
--- packages/freetype/freetype_2.3.3.bb	4e066043085f52cdd0cfa3ed9c8b69ce68436ab7
+++ packages/freetype/freetype_2.3.3.bb	7fc882b321f36c7bcefb9402a81ff065c0d426b4
@@ -1,12 +1,14 @@ LICENSE = "freetype"
 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
============================================================
--- packages/images/nylon-image-mini.bb	4cbffe3c0489c132c323f73eb625ed587c073edb
+++ packages/images/nylon-image-mini.bb	fa47a8388a5cdf939a7afd5a103890b2aee7dc14
@@ -1,5 +1,8 @@ export IMAGE_BASENAME = "nylon-mini"
 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 bus
 	netbase \
 	wireless-tools"
 
-RDEPENDS = "kernel \
+RDEPENDS += "kernel \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export PACKAGE_INSTALL = "${RDEPENDS}"
 
 IMAGE_LINGUAS = ""
-
-inherit image
-LICENSE = "MIT"
============================================================
--- packages/xcb/libxcb_0.9.93.bb	ff378cad920570cce9de47706e9e06dc377ffb04
+++ packages/xcb/libxcb_0.9.93.bb	43edc8a9df1419b1259a193fab2280abea7ccd26
@@ -1,11 +1,11 @@ HOMEPAGE = "http://xcb.freedesktop.org"
 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"


#
# mt diff -rbd7c8e1bf8c542b214b7d6e21e849e512bb796e1 -rdf36391938bd296ae238e5e7c286a075be0015a6
#
# 
# no changes
#