[oe-commits] org.oe.dev merge of '9ce99db5c6574a3d2161e2257da184c55971fddd'

[svolpe commit]

merge of '9ce99db5c6574a3d2161e2257da184c55971fddd'
     and 'be38a6212d33035dc48ae2d5b8ad385a0e2409cc'

Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: 8da9088a1e0c68116c1a9b82d7675b366003da67
ViewMTN: http://monotone.openembedded.org/revision/info/8da9088a1e0c68116c1a9b82d7675b366003da67
Files:
1
packages/pango/pango-directfb_1.18.1.bb
packages/cairo/cairo-directfb_1.4.8.bb
packages/gtk+/gtk+-directfb_2.10.14.bb
packages/linux/linux-handhelds-2.6.inc
Diffs:

#
# mt diff -r9ce99db5c6574a3d2161e2257da184c55971fddd -r8da9088a1e0c68116c1a9b82d7675b366003da67
#
# 
# 
# add_file "packages/pango/pango-directfb_1.18.1.bb"
#  content [74821d9815c3a1f7e30930b2075f86429b06a932]
# 
# patch "packages/cairo/cairo-directfb_1.4.8.bb"
#  from [5887a10b7088e2070a3b744287a0b188a32f9124]
#    to [dd4b0bfeeba15d03d95b48aca0c73fa8348c6b35]
# 
# patch "packages/gtk+/gtk+-directfb_2.10.14.bb"
#  from [e1dcebc66728226c67f37666fb11d9e55d172621]
#    to [adc3811f8a8a931557ef718a1d4b7cd23c8c11b6]
# 
============================================================
--- packages/pango/pango-directfb_1.18.1.bb	74821d9815c3a1f7e30930b2075f86429b06a932
+++ packages/pango/pango-directfb_1.18.1.bb	74821d9815c3a1f7e30930b2075f86429b06a932
@@ -0,0 +1,10 @@
+require pango.inc
+RCONFLICTS = "pango"
+RPROVIDES = "pango-directfb"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc cairo-directfb"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-${PV}.tar.bz2 \
+	   file://no-tests.patch;patch=1"
+
+S = "${WORKDIR}/pango-${PV}"
+RRECOMMENDS_${PN} = "" 
+FILESPATH = "${FILE_DIRNAME}/pango-${PV}:${FILE_DIRNAME}/files"
============================================================
--- packages/cairo/cairo-directfb_1.4.8.bb	5887a10b7088e2070a3b744287a0b188a32f9124
+++ packages/cairo/cairo-directfb_1.4.8.bb	dd4b0bfeeba15d03d95b48aca0c73fa8348c6b35
@@ -1,5 +1,6 @@ RCONFLICTS = "cairo"
 require cairo.inc
 RCONFLICTS = "cairo"
+RPROVIDES = "cairo-directfb"
 DEPENDS = "directfb libsm libpng fontconfig"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 	   file://cairo_directfb_is_similar-typo.patch;patch=1 \
@@ -12,6 +13,6 @@ CFLAGS_append  += " -I${STAGING_INCDIR}/
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/cairo-${PV}"
============================================================
--- packages/gtk+/gtk+-directfb_2.10.14.bb	e1dcebc66728226c67f37666fb11d9e55d172621
+++ packages/gtk+/gtk+-directfb_2.10.14.bb	adc3811f8a8a931557ef718a1d4b7cd23c8c11b6
@@ -1,6 +1,6 @@ require gtk-2.10.inc
 require gtk-2.10.inc
 
-PR = "r1"
+PR = "r2"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
@@ -8,6 +8,7 @@ RCONFLICTS = "gtk+"
 
 
 RCONFLICTS = "gtk+"
+RPROVIDES ="gtk+-directfb"
 DEPENDS = "glib-2.0 pango-directfb atk jpeg libpng gtk-doc libgcrypt cairo-directfb cups"
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"


#
# mt diff -rbe38a6212d33035dc48ae2d5b8ad385a0e2409cc -r8da9088a1e0c68116c1a9b82d7675b366003da67
#
# 
# 
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [9b3c8a9d312251557d97f3ea805ec796b389c4cc]
#    to [81ad97e2eba4d17f9cb187c2c6f0a9b9383fbb8c]
# 
============================================================
--- packages/linux/linux-handhelds-2.6.inc	9b3c8a9d312251557d97f3ea805ec796b389c4cc
+++ packages/linux/linux-handhelds-2.6.inc	81ad97e2eba4d17f9cb187c2c6f0a9b9383fbb8c
@@ -60,8 +60,42 @@ do_deploy() {
 	# format:
 	# name file md5sumfile destination
 	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
+	gen_haret_startup
 }   
    
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_package after do_install
+
+
+gen_haret_startup() {
+	cat >${DEPLOY_DIR_IMAGE}/startup.txt <<EOF 
+# This is startup file for HaRET, Linux bootloader for WinCE
+# http://handhelds.org/wiki/HaRET
+
+set kernel "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}"
+
+# Boot choices. Uncomment 'set' statements in exactly one section
+
+## Choice 1 - Boot from SD/MMC card
+# Have 2 partition on a card:
+# 1st - FAT with HaRET executable, this file and zImage above
+# 2nd - EXT2 with rootfs tarball extracted
+set cmdline "root=/dev/mmcblk0p2 rootdelay=10 console=ttyS0,115200n8 console=tty0"
+
+## Choice 2 - Boot from CD card, setup like above
+#set cmdline "root=/dev/hda2 rootdelay=10 console=ttyS0,115200n8 console=tty0"
+
+## Choice 3 - Boot rootfs image as initramfs (works only for smaller images)
+# have a cpio.gz file below together with zImage, no EXT2 partition required
+#set initrd "<image>.rootfs.cpio.gz"
+#set cmdline "rdinit=/sbin/init console=ttyS0,115200n8 console=tty0"
+
+## Choice 4 - Boot via NFS over USB networking (must be kernel-builtin)
+# 192.168.x.x - Server address (the other side)
+# 192.168.x.x - Handheld's address
+#set cmdline "root=/dev/nfs nfsroot=192.168.x.x:<nfs_path> ip=192.168.y.y:192.168.x.x:192.168.x.x:255.255.255.0:pda:usb0 console=ttyS0,115200n8 console=tty0"
+
+bootlinux
+EOF
+}