org.openembedded.dev: b2a69b65b1709b9bbe6a87bf584b952b72f2d6f7

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 2 21:03:29 CEST 2008


revision:            b2a69b65b1709b9bbe6a87bf584b952b72f2d6f7
date:                2008-04-28T11:23:30
author:              xora at openembedded.org
branch:              org.openembedded.dev
changelog:
merge of '5e882379581ef1c98dcefe18574deaaaffd59a0a'
     and '737469a743274fa1dd75ddf61b7dd12da385ed96'

manifest:
format_version "1"

new_manifest [e3b6cf978d7803fb33ae9a1425ed50d0b1011ccc]

old_revision [5e882379581ef1c98dcefe18574deaaaffd59a0a]

add_file "packages/wpa-supplicant/wpa-supplicant_0.5.10.bb"
 content [c9f51fde6a815bc8fdd0a7c70d27dd539588f0ba]

patch "packages/wpa-supplicant/wpa-supplicant-0.5.inc"
 from [2122683c4f4b58f9716ecc268a1807bedb3c2bd4]
   to [96f91121be0d1a9fb9a7bbe2872fa7da5b580c83]

patch "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"
 from [6879fb107b2089dd63bb4da0a6241e2239109b25]
   to [f02e25f92bc6964027a4b862b54b76b24fd88b0b]

patch "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"
 from [04575e5e0d1662c7f57ebe91fc8172de61167e9f]
   to [9a42cee1d3c45798b151c67e814bb6d327fd9053]

old_revision [737469a743274fa1dd75ddf61b7dd12da385ed96]

add_file "conf/machine/htckaiser.conf"
 content [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]

add_file "packages/linux/linux-kaiser_2.6.24+git.bb"
 content [f35b44d6d3ebfde341c328a3b1e8362f8dec89de]

patch "classes/kernel.bbclass"
 from [0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21]
   to [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]

patch "conf/distro/include/preferred-om-2008-versions.inc"
 from [45c4fabe80b7601dd86c45ad8f64a6773594d4e7]
   to [0741783d8c451adac5e47265611069ee7296c2d7]

patch "conf/distro/include/sane-srcrevs.inc"
 from [60843bd58bfb4bf8187725d3994059d432a796a3]
   to [7314e35801b572c3e3928395538ae79453852b2f]

patch "conf/machine/om-gta02.conf"
 from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
   to [8a81b5b7224a98d62de1611265a26386dc77b5f2]
-------------- next part --------------
#
#
# add_file "packages/wpa-supplicant/wpa-supplicant_0.5.10.bb"
#  content [c9f51fde6a815bc8fdd0a7c70d27dd539588f0ba]
# 
# patch "packages/wpa-supplicant/wpa-supplicant-0.5.inc"
#  from [2122683c4f4b58f9716ecc268a1807bedb3c2bd4]
#    to [96f91121be0d1a9fb9a7bbe2872fa7da5b580c83]
# 
# patch "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"
#  from [6879fb107b2089dd63bb4da0a6241e2239109b25]
#    to [f02e25f92bc6964027a4b862b54b76b24fd88b0b]
# 
# patch "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"
#  from [04575e5e0d1662c7f57ebe91fc8172de61167e9f]
#    to [9a42cee1d3c45798b151c67e814bb6d327fd9053]
#
============================================================
--- packages/wpa-supplicant/wpa-supplicant_0.5.10.bb	c9f51fde6a815bc8fdd0a7c70d27dd539588f0ba
+++ packages/wpa-supplicant/wpa-supplicant_0.5.10.bb	c9f51fde6a815bc8fdd0a7c70d27dd539588f0ba
@@ -0,0 +1 @@
+require wpa-supplicant-0.5.inc
============================================================
--- packages/wpa-supplicant/wpa-supplicant-0.5.inc	2122683c4f4b58f9716ecc268a1807bedb3c2bd4
+++ packages/wpa-supplicant/wpa-supplicant-0.5.inc	96f91121be0d1a9fb9a7bbe2872fa7da5b580c83
@@ -8,11 +8,8 @@ PACKAGE_ARCH = "${@base_contains('COMBIN
 MY_ARCH := "${PACKAGE_ARCH}"
 PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
 
-DEFAULT_PREFERENCE = "-2"
-
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://defconfig-gnutls \
-	file://gnutlsfix.patch;patch=1 \
 	file://ifupdown.sh \
 	file://functions.sh"
 
============================================================
--- packages/wpa-supplicant/wpa-supplicant_0.5.5.bb	6879fb107b2089dd63bb4da0a6241e2239109b25
+++ packages/wpa-supplicant/wpa-supplicant_0.5.5.bb	f02e25f92bc6964027a4b862b54b76b24fd88b0b
@@ -1,3 +1,5 @@ require wpa-supplicant-0.5.inc
 require wpa-supplicant-0.5.inc
 
+SRC_URI += "file://gnutlsfix.patch;patch=1"
+
 PR = "r3"
============================================================
--- packages/wpa-supplicant/wpa-supplicant_0.5.7.bb	04575e5e0d1662c7f57ebe91fc8172de61167e9f
+++ packages/wpa-supplicant/wpa-supplicant_0.5.7.bb	9a42cee1d3c45798b151c67e814bb6d327fd9053
@@ -1,3 +1,5 @@ require wpa-supplicant-0.5.inc
 require wpa-supplicant-0.5.inc
 
+SRC_URI += "file://gnutlsfix.patch;patch=1"
+
 PR = "r1"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/5adb1b60/attachment.htm 
-------------- next part --------------
#
#
# add_file "conf/machine/htckaiser.conf"
#  content [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]
# 
# add_file "packages/linux/linux-kaiser_2.6.24+git.bb"
#  content [f35b44d6d3ebfde341c328a3b1e8362f8dec89de]
# 
# patch "classes/kernel.bbclass"
#  from [0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21]
#    to [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [45c4fabe80b7601dd86c45ad8f64a6773594d4e7]
#    to [0741783d8c451adac5e47265611069ee7296c2d7]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [60843bd58bfb4bf8187725d3994059d432a796a3]
#    to [7314e35801b572c3e3928395538ae79453852b2f]
# 
# patch "conf/machine/om-gta02.conf"
#  from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
#    to [8a81b5b7224a98d62de1611265a26386dc77b5f2]
#
============================================================
--- conf/machine/htckaiser.conf	8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b
+++ conf/machine/htckaiser.conf	8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b
@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@NAME: HTC Kaiser phone
+#@DESCRIPTION: Machine configuration for HTC Kaiser phone
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
+ 
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+ 
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+ 
+TARGET_FPU = "soft"
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
+FEED_ARCH = "armv6"
+PACKAGE_ARCH = "armv6"
+ 
+
+IMAGE_FSTYPES ?= "tar.gz cpio.gz"
+ 
+PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"
+ 
+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard"
+
============================================================
--- packages/linux/linux-kaiser_2.6.24+git.bb	f35b44d6d3ebfde341c328a3b1e8362f8dec89de
+++ packages/linux/linux-kaiser_2.6.24+git.bb	f35b44d6d3ebfde341c328a3b1e8362f8dec89de
@@ -0,0 +1,15 @@
+require linux.inc
+
+PV = "2.6.24+git${SRCREV}"
+
+COMPATIBLE_MACHINE = "htckaiser"
+
+SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \
+           http://baliniak.pl/android/kernel.diff;patch=1"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend() {
+	cp .config ../defconfig
+}
+
============================================================
--- classes/kernel.bbclass	0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21
+++ classes/kernel.bbclass	8d92c5a7b6420490dd6b3115e8146b3fc0a0f854
@@ -470,7 +470,10 @@ do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+
+	if [ -d "${D}lib" ]; then
 	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
+	fi
 
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
 		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	45c4fabe80b7601dd86c45ad8f64a6773594d4e7
+++ conf/distro/include/preferred-om-2008-versions.inc	0741783d8c451adac5e47265611069ee7296c2d7
@@ -1,7 +1,8 @@ PREFERRED_VERSION_busybox = "1.9.1"
 PREFERRED_VERSION_asterisk = "1.4.17"
 PREFERRED_VERSION_busybox = "1.9.1"
-PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus = "1.2.1"
 PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_glib-2.0 = "2.16.1"
 PREFERRED_VERSION_gnash = "0.8.2"
 PREFERRED_VERSION_gpsdrive = "2.10pre4"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
@@ -12,4 +13,3 @@ PREFERRED_VERSION_vte = "0.16.9"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.9"
-
============================================================
--- conf/distro/include/sane-srcrevs.inc	60843bd58bfb4bf8187725d3994059d432a796a3
+++ conf/distro/include/sane-srcrevs.inc	7314e35801b572c3e3928395538ae79453852b2f
@@ -37,7 +37,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "193"
+SRCREV_pn-gsm0710muxd ?= "263"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
============================================================
--- conf/machine/om-gta02.conf	bb34d745d24d709bd9a6fe113c95e816ba6c788a
+++ conf/machine/om-gta02.conf	8a81b5b7224a98d62de1611265a26386dc77b5f2
@@ -34,6 +34,7 @@ ROOT_FLASH_SIZE = "256"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \
@@ -45,7 +46,3 @@ include conf/machine/include/tune-arm920
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
-
-# build YAFFS2
-IMAGE_FSTYPES ?= "jffs2 yaffs2"
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/5adb1b60/attachment-0001.htm 


More information about the commitlog mailing list