[oe-commits] org.oe.dev merge of '541a0c310166fc18c9883d31cbdbca82af3c977c'

oe commit openembedded-commits at lists.openembedded.org
Sun Sep 9 13:22:41 UTC 2007 

merge of '541a0c310166fc18c9883d31cbdbca82af3c977c'
     and 'c762de4b1817cfe0d3121333cf187eb52e720fab'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 2789ba71ed961f8b197fab26e98f14ee325b49ce
ViewMTN: http://monotone.openembedded.org/revision/info/2789ba71ed961f8b197fab26e98f14ee325b49ce
Files:
1
conf/distro/include/openmoko.inc
packages/linux/linux-openmoko_2.6.21.6.bb
packages/linux/linux-openmoko-devel_svn.bb
conf/distro/include/preferred-openmoko-versions.inc
conf/distro/openmoko.conf
packages/e17/exhibit_cvs.bb
packages/linux/linux-openmoko.inc
packages/linux/linux-openmoko_2.6.22.5.bb
conf/machine/rokre6.conf
packages/linux/linux-ezx_2.6.21.bb
Diffs:

#
# mt diff -r541a0c310166fc18c9883d31cbdbca82af3c977c -r2789ba71ed961f8b197fab26e98f14ee325b49ce
#
# 
# 
# delete "conf/distro/include/openmoko.inc"
# 
# delete "packages/linux/linux-openmoko_2.6.21.6.bb"
# 
# add_file "packages/linux/linux-openmoko-devel_svn.bb"
#  content [c17d36a90011ca85a8c95a6655c73b481ba62318]
# 
# patch "conf/distro/include/preferred-openmoko-versions.inc"
#  from [c000e700c19aa1d9f8dae1d0401c32bb0f8ce603]
#    to [aafbb4810b76b2288e991f20a2c197ea176a05db]
# 
# patch "conf/distro/openmoko.conf"
#  from [8a793c4c4e8b4bf9d2e7b7b95829905e94482cf1]
#    to [f11e22bc56a237fa548e77d0512477cb02da9a98]
# 
# patch "packages/e17/exhibit_cvs.bb"
#  from [fd141a172c394c58b0e20dad078fce7046c83fc4]
#    to [0fb73195eb74fba616a7e95d1b0fc13facb15932]
# 
# patch "packages/linux/linux-openmoko.inc"
#  from [53884bed5e1c3e2804b3dea3539b9e108c9bb809]
#    to [b9222c4501de8897b4b95070063bf7ad153f484d]
# 
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
#  from [642613af5fde8408e42a3b9c4dcb203d437051b0]
#    to [f3b1d99f1b43cbae85ff7d9ceb04575f5f70393c]
# 
============================================================
--- packages/linux/linux-openmoko-devel_svn.bb	c17d36a90011ca85a8c95a6655c73b481ba62318
+++ packages/linux/linux-openmoko-devel_svn.bb	c17d36a90011ca85a8c95a6655c73b481ba62318
@@ -0,0 +1,11 @@
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+
+require linux-openmoko.inc
+
+SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
+SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1"
+
+VANILLA_VERSION = "2.6.22.5"
+MOKOR = "moko11+svnr${SRCREV}"
+PV = "${VANILLA_VERSION}-${MOKOR}"
+PR = "r0"
============================================================
--- conf/distro/include/preferred-openmoko-versions.inc	c000e700c19aa1d9f8dae1d0401c32bb0f8ce603
+++ conf/distro/include/preferred-openmoko-versions.inc	aafbb4810b76b2288e991f20a2c197ea176a05db
@@ -1,60 +1,10 @@
 #
 # Specify which versions of OpenMoko packages to build
 #
 
 #
-# Base
+# Bootloader and Kernel
 #
 
-SRCDATE_uboot = "now"
-SRCDATE_uboot-gta01 = "now"
-SRCDATE_kernel = "now"
-SRCDATE_linux-gta01 = "now"
-SRCDATE_linux-gta01-nobbt = "now"
-SRCDATE_libgsmd = "now"
-SRCDATE_openmoko-session = "now"
-SRCDATE_openmoko-common = "now"
-SRCDATE_openmoko-theme-standard = "now"
-SRCDATE_openmoko-libs = "now"
+SRCREV_pn-linux-openmoko = "2937"
 
-#
-# Examples
-#
-SRCDATE_openmoko-stylus-demo = "now"
-SRCDATE_openmoko-stylus-demo-simple = "now"
-SRCDATE_openmoko-finger-demo = "now"
-SRCDATE_openmoko-panel-demo = "now"
-SRCDATE_openmoko-panel-demo-simple = "now"
-
-#
-# PIM
-#
-SRCDATE_openmoko-contacts = "now"
-SRCDATE_openmoko-dates = "now"
-
-#
-# Applications
-#
-SRCDATE_openmoko-appmanager = "now"
-SRCDATE_openmoko-chordmaster = "now"
-SRCDATE_openmoko-dialer = "now"
-SRCDATE_openmoko-footer = "now"
-SRCDATE_openmoko-phone = "now"
-SRCDATE_openmoko-mainmenu = "now"
-SRCDATE_openmoko-taskmanager = "now"
-
-#
-# Multimedia
-#
-SRCDATE_openmoko-simplemediaplayer = "now"
-
-#
-# Panel Plugins
-#
-SRCDATE_openmoko-panel-clock = "now"
-SRCDATE_openmoko-panel-battery = "now"
-SRCDATE_openmoko-panel-mainmenu = "now"
-SRCDATE_openmoko-panel-gsm = "now"
-SRCDATE_openmoko-panel-gps = "now"
-SRCDATE_openmoko-panel-bt = "now"
-SRCDATE_openmoko-panel-usb = "now"
============================================================
--- conf/distro/openmoko.conf	8a793c4c4e8b4bf9d2e7b7b95829905e94482cf1
+++ conf/distro/openmoko.conf	f11e22bc56a237fa548e77d0512477cb02da9a98
@@ -29,3 +29,10 @@ FEED_URIS = "\
   updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
   updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \
   updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 "
+
+# 2.18 seems to break badly on 64-bit systems
+PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
+
+require conf/distro/include/preferred-openmoko-versions.inc
+
============================================================
--- packages/e17/exhibit_cvs.bb	fd141a172c394c58b0e20dad078fce7046c83fc4
+++ packages/e17/exhibit_cvs.bb	0fb73195eb74fba616a7e95d1b0fc13facb15932
@@ -1,5 +1,5 @@ DESCRIPTION = "Exhibit is the ETK pictur
 DESCRIPTION = "Exhibit is the ETK picture viewer"
-DEPENDS = "evas ecore edje etk epsilon engrave"
+DEPENDS = "evas ecore epsilon edje eet etk efreet"
 LICENSE = "MIT"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
============================================================
--- packages/linux/linux-openmoko.inc	53884bed5e1c3e2804b3dea3539b9e108c9bb809
+++ packages/linux/linux-openmoko.inc	b9222c4501de8897b4b95070063bf7ad153f484d
@@ -1,4 +1,3 @@
-DESCRIPTION = "2.6 Linux Development Kernel for FIC SmartPhones shipping w/ OpenMoko"
 SECTION = "kernel"
 AUTHOR = "Harald Welte <laforge at openmoko.org>"
 HOMEPAGE = "http://www.openmoko.org"
@@ -13,6 +12,8 @@ DEFCONFIG = "defconfig-${VANILLA_VERSION
 ##############################################################
 # source and patches
 #
+SRCREV_FORMAT = "patches"
+
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            file://${DEFCONFIG} \
            file://logo_linux_clut224.ppm"
============================================================
--- packages/linux/linux-openmoko_2.6.22.5.bb	642613af5fde8408e42a3b9c4dcb203d437051b0
+++ packages/linux/linux-openmoko_2.6.22.5.bb	f3b1d99f1b43cbae85ff7d9ceb04575f5f70393c
@@ -1,9 +1,11 @@
+DESCRIPTION = "Linux 2.6.x (stable) kernel for FIC SmartPhones shipping w/ OpenMoko"
+
 require linux-openmoko.inc
 
 SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
 SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1"
 
-MOKOR = "moko11"
-PR = "${MOKOR}-r2"
-
 VANILLA_VERSION = "2.6.22.5"
+MOKOR = "moko11+svnr${SRCREV}"
+PV = "${VANILLA_VERSION}-${MOKOR}"
+PR = "r2"


#
# mt diff -rc762de4b1817cfe0d3121333cf187eb52e720fab -r2789ba71ed961f8b197fab26e98f14ee325b49ce
#
# 
# 
# add_file "conf/machine/rokre6.conf"
#  content [ece99da8e7ed762f80283fa0d3bb0bff732d8418]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [3fba5817ee1b10b077d3b01f0616ad1732492df5]
#    to [41eb0c964071eaa3a39a267466f9ca7188c0820e]
# 
============================================================
--- conf/machine/rokre6.conf	ece99da8e7ed762f80283fa0d3bb0bff732d8418
+++ conf/machine/rokre6.conf	ece99da8e7ed762f80283fa0d3bb0bff732d8418
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX ROKR E6
+#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E6
+
+require conf/machine/include/motorola-ezx-base.inc
+
+# there is no touchscreen
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
============================================================
--- packages/linux/linux-ezx_2.6.21.bb	3fba5817ee1b10b077d3b01f0616ad1732492df5
+++ packages/linux/linux-ezx_2.6.21.bb	41eb0c964071eaa3a39a267466f9ca7188c0820e
@@ -69,7 +69,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 ALLOW_EMPTY  = "1"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(a780|e680|a1200)'
+COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
 
 # For now the code for serial console is disabled in compress.c
 #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "

More information about the Openembedded-commits mailing list