[oe-commits] org.oe.dev merge of '9a2acbd7c6e750de804014b2c65884cb8603dc3f'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Sep 16 22:50:48 UTC 2007
merge of '9a2acbd7c6e750de804014b2c65884cb8603dc3f'
and 'ba4c754eca3c2169b8627bc39ededa1946ea4b6c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 31030f5c3077a7204d6970ff1e8615a0ff0531c2
ViewMTN: http://monotone.openembedded.org/revision/info/31030f5c3077a7204d6970ff1e8615a0ff0531c2
Files:
1
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-openmoko-devel_svn.bb
packages/linux/linux.inc
packages/iso-codes
packages/gnome/epiphany_2.19.6.bb
packages/iso-codes/iso-codes_1.4.bb
conf/distro/angstrom-2008.1.conf
conf/distro/include/sane-srcrevs.inc
files/device_table-ezx.txt
packages/ezx/ezxd/ezxd.init
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/a780/defconfig
packages/linux/linux-ezx-2.6.21/e680/defconfig
packages/linux/linux-ezx-2.6.21/rokre2/defconfig
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/tasks/task-openmoko-feed.bb
Diffs:
#
# mt diff -r9a2acbd7c6e750de804014b2c65884cb8603dc3f -r31030f5c3077a7204d6970ff1e8615a0ff0531c2
#
#
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [f9a6e9e5d9354cbb5f7e42fd4f7bcde70c6ab8fc]
# to [8c02835ff0311dd8dfb6c691f61ccde14407e0ab]
#
# patch "packages/linux/linux-openmoko-devel_svn.bb"
# from [c17d36a90011ca85a8c95a6655c73b481ba62318]
# to [0c4e0a1a3b5984a92e7255acd3c74e12e71fd37f]
#
# patch "packages/linux/linux.inc"
# from [eeda309489292a9867f8339d7e9cface90455b79]
# to [fe2aad9ac6339d281fd752e0dfb55dedfd1bc88a]
#
============================================================
--- packages/linux/linux-ezx_2.6.21.bb f9a6e9e5d9354cbb5f7e42fd4f7bcde70c6ab8fc
+++ packages/linux/linux-ezx_2.6.21.bb 8c02835ff0311dd8dfb6c691f61ccde14407e0ab
@@ -68,7 +68,6 @@ SRC_URI += "${BACKLIGHTPATCH}"
SRC_URI += "${BACKLIGHTPATCH}"
-
S = "${WORKDIR}/linux-${PV}"
@@ -96,7 +95,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT
# Uncomment to use root-over-nfs-over-usb
#CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
-# 1024x1024 is the maximum kernel size for boot-over-usb
+# 1024x1024 once was the maximum kernel size for boot-over-usb -- is it still?
#KERNEL_IMAGE_MAXSIZE = "1294336"
###############################################################
============================================================
--- packages/linux/linux-openmoko-devel_svn.bb c17d36a90011ca85a8c95a6655c73b481ba62318
+++ packages/linux/linux-openmoko-devel_svn.bb 0c4e0a1a3b5984a92e7255acd3c74e12e71fd37f
@@ -1,11 +1,54 @@ DESCRIPTION = "Linux 2.6.x (development)
DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+VANILLA_VERSION = "2.6.22.5"
+PV = "${VANILLA_VERSION}-moko11+svnr${SRCREV}"
+PR = "r0"
-require linux-openmoko.inc
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "30008000"
-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"
+require linux.inc
+##############################################################
+# source and patches
+#
+SRCREV_FORMAT = "patches"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+ svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http;name=patches \
+ file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \
+ file://defconfig \
+ file://logo_linux_clut224.ppm"
+S = "${WORKDIR}/linux-${VANILLA_VERSION}"
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+#
+FILES_kernel-image = ""
+ALLOW_EMPTY = "1"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02'
+
+CMDLINE = "unused -- bootloader passes ATAG list"
+
+###############################################################
+# module configs specific to this kernel
+#
+
+# usb
+module_autoload_ohci-hcd = "ohci-hcd"
+module_autoload_hci_usb = "hci_usb"
+module_autoload_g_ether = "g_ether"
+# audio
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
+
+do_prepatch() {
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ mv patches patches.openmoko
+ mv .pc .pc.old
+}
+
+addtask prepatch after do_unpack before do_patch
+
-VANILLA_VERSION = "2.6.22.5"
-MOKOR = "moko11+svnr${SRCREV}"
-PV = "${VANILLA_VERSION}-${MOKOR}"
-PR = "r0"
============================================================
--- packages/linux/linux.inc eeda309489292a9867f8339d7e9cface90455b79
+++ packages/linux/linux.inc fe2aad9ac6339d281fd752e0dfb55dedfd1bc88a
@@ -58,20 +58,29 @@ do_configure_prepend() {
< '${WORKDIR}/defconfig' >>'${S}/.config'
#
- # root-over-nfs-over-usbgadget support. Limited, but should cover some cases.
- # Note that you need to have a proper CMDLINE_NFSROOT_USB set for this to work.
+ # root-over-nfs-over-usb-eth support. Limited, but should cover some cases.
+ # Enable this by setting a proper CMDLINE_NFSROOT_USB.
#
if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
- oenote "Configuring the kernel for root-over-nfs-over-usbgadget with CMDLINE ${CMDLINE_NFSROOT_USB}"
+ oenote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
+ sed -e '/CONFIG_INET/d' \
+ -e '/CONFIG_IP_PNP=/d' \
+ -e '/CONFIG_USB_GADGET=/d' \
+ -e '/CONFIG_USB_GADGET_SELECTED=/d' \
+ -e '/CONFIG_USB_ETH=/d' \
+ -e '/CONFIG_NFS_FS=/d' \
+ -e '/CONFIG_ROOT_NFS=/d' \
+ -e '/CONFIG_CMDLINE=/d' \
+ -i ${S}/.config
echo "CONFIG_INET=y" >> ${S}/.config
echo "CONFIG_IP_PNP=y" >> ${S}/.config
echo "CONFIG_USB_GADGET=y" >> ${S}/.config
+ echo "CONFIG_USB_GADGET_SELECTED=y" >> ${S}/.config
echo "CONFIG_USB_ETH=y" >> ${S}/.config
echo "CONFIG_NFS_FS=y" >> ${S}/.config
echo "CONFIG_ROOT_NFS=y" >> ${S}/.config
echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config
fi
-
yes '' | oe_runmake oldconfig
}
@@ -111,14 +120,14 @@ do_deploy() {
${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
rm -f linux.bin
- else
- ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+ else
+ ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz
gzip -9 linux.bin
uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
rm -f linux.bin.gz
fi
- fi
+ fi
}
do_deploy[dirs] = "${S}"
#
# mt diff -rba4c754eca3c2169b8627bc39ededa1946ea4b6c -r31030f5c3077a7204d6970ff1e8615a0ff0531c2
#
#
#
# add_dir "packages/iso-codes"
#
# add_file "packages/gnome/epiphany_2.19.6.bb"
# content [ef9504844f21d0471510539c90b701bc53554771]
#
# add_file "packages/iso-codes/iso-codes_1.4.bb"
# content [1dd7a642f9975932e113648bfa6d92f402c61eed]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [487c3506ad8cb3ca5d78cfd66fa53492cacba1af]
# to [7cf6cf9abb330a4454395b20a82b0387f94dab20]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [86ede12635b8634bc89c2f7e82da56ea8d4e1e5a]
# to [a04da90ce000626924fee314bf3b57e19ad0d4c8]
#
# patch "files/device_table-ezx.txt"
# from [b65a0afde5edac0fe1c9b1283e652603c24d4ef8]
# to [39da0f7a8df0ffd78d22a014105439799206e7bb]
#
# patch "packages/ezx/ezxd/ezxd.init"
# from [85c4d6682e30dff858fca9a1647058c683e5284d]
# to [f7c1fdf056b8ad78416819cfa54762a3187fcb85]
#
# patch "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
# from [54fc215efd04504bd6949f6c853b8291ab31bf05]
# to [cbd74a97e0ff2c2a00cbd2111d4cb5ffd564fd6d]
#
# patch "packages/linux/linux-ezx-2.6.21/a780/defconfig"
# from [98940162319ba1284117359355914689b7f0d76a]
# to [0e933c30a4d63a963503d4f698df5f63d7e6e277]
#
# patch "packages/linux/linux-ezx-2.6.21/e680/defconfig"
# from [8fc4aafdc2c2f6021e68572027e32c4dc64a893c]
# to [1e0f6498297163b913bae9ecf566efb3c9aea5f0]
#
# patch "packages/linux/linux-ezx-2.6.21/rokre2/defconfig"
# from [f33885ad5f8272ec233e9c5cb7c41d85f528ded1]
# to [4b2bc0b55902873aa715c922fe96fa852919c359]
#
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
# from [b79ae70ebd4748e59c20b3a234ba65c2360a45dd]
# to [2fcdbfacbc7633f1338125153055119f08e7d52b]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [5f6172886061304963281b566cf6cec75971178e]
# to [8c02835ff0311dd8dfb6c691f61ccde14407e0ab]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [8bae7a09e4956d7750cdd285857089383e895865]
# to [ef020702ddfe8a9efbf7175aa35503330afaee31]
#
============================================================
--- packages/gnome/epiphany_2.19.6.bb ef9504844f21d0471510539c90b701bc53554771
+++ packages/gnome/epiphany_2.19.6.bb ef9504844f21d0471510539c90b701bc53554771
@@ -0,0 +1,14 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = "--with-engine=webkit"
+
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
============================================================
--- packages/iso-codes/iso-codes_1.4.bb 1dd7a642f9975932e113648bfa6d92f402c61eed
+++ packages/iso-codes/iso-codes_1.4.bb 1dd7a642f9975932e113648bfa6d92f402c61eed
@@ -0,0 +1,12 @@
+LICENSE = "LGPL"
+
+SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/xml/"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- conf/distro/angstrom-2008.1.conf 487c3506ad8cb3ca5d78cfd66fa53492cacba1af
+++ conf/distro/angstrom-2008.1.conf 7cf6cf9abb330a4454395b20a82b0387f94dab20
@@ -40,5 +40,5 @@ PREFERRED_VERSION_glib-2.0
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ = "2.12.0"
PREFERRED_VERSION_glib-2.0 = "2.14.0"
+PREFERRED_VERSION_pango = "1.18.1"
-
============================================================
--- conf/distro/include/sane-srcrevs.inc 86ede12635b8634bc89c2f7e82da56ea8d4e1e5a
+++ conf/distro/include/sane-srcrevs.inc a04da90ce000626924fee314bf3b57e19ad0d4c8
@@ -11,7 +11,7 @@ SRCREV_pn-eglibc-intermediate ?= "3468"
SRCREV_pn-eglibc ?= "3468"
SRCREV_pn-eglibc-initial ?= "3468"
SRCREV_pn-eglibc-intermediate ?= "3468"
-SRCREV_pn-ezxd ?= "2052"
+SRCREV_pn-ezxd ?= "2058"
SRCREV_pn-elf2flt="1786"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
============================================================
--- files/device_table-ezx.txt b65a0afde5edac0fe1c9b1283e652603c24d4ef8
+++ files/device_table-ezx.txt 39da0f7a8df0ffd78d22a014105439799206e7bb
@@ -1 +1,2 @@
/dev/mux c 660 0 5 250 0 0 1 8
+/dev/input/uinput c 660 0 0 10 223 - - -
============================================================
--- packages/ezx/ezxd/ezxd.init 85c4d6682e30dff858fca9a1647058c683e5284d
+++ packages/ezx/ezxd/ezxd.init f7c1fdf056b8ad78416819cfa54762a3187fcb85
@@ -49,8 +49,8 @@ shut_it_down()
shut_it_down()
{
- if [ -d $EVENTDIR ]; then
- run-parts --reverse --arg=stop $EVENTDIR
+ if [ -d "$EVENTDIR" ]; then
+ run-parts --arg=stop $EVENTDIR
fi
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE
============================================================
--- packages/linux/linux-ezx-2.6.21/a1200/defconfig 54fc215efd04504bd6949f6c853b8291ab31bf05
+++ packages/linux/linux-ezx-2.6.21/a1200/defconfig cbd74a97e0ff2c2a00cbd2111d4cb5ffd564fd6d
@@ -795,7 +795,8 @@ CONFIG_TOUCHSCREEN_PCAP=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
============================================================
--- packages/linux/linux-ezx-2.6.21/a780/defconfig 98940162319ba1284117359355914689b7f0d76a
+++ packages/linux/linux-ezx-2.6.21/a780/defconfig 0e933c30a4d63a963503d4f698df5f63d7e6e277
@@ -792,7 +792,8 @@ CONFIG_TOUCHSCREEN_PCAP=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
============================================================
--- packages/linux/linux-ezx-2.6.21/e680/defconfig 8fc4aafdc2c2f6021e68572027e32c4dc64a893c
+++ packages/linux/linux-ezx-2.6.21/e680/defconfig 1e0f6498297163b913bae9ecf566efb3c9aea5f0
@@ -792,7 +792,8 @@ CONFIG_TOUCHSCREEN_PCAP=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
============================================================
--- packages/linux/linux-ezx-2.6.21/rokre2/defconfig f33885ad5f8272ec233e9c5cb7c41d85f528ded1
+++ packages/linux/linux-ezx-2.6.21/rokre2/defconfig 4b2bc0b55902873aa715c922fe96fa852919c359
@@ -792,7 +792,8 @@ CONFIG_TOUCHSCREEN_PCAP=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
============================================================
--- packages/linux/linux-ezx-2.6.21/rokre6/defconfig b79ae70ebd4748e59c20b3a234ba65c2360a45dd
+++ packages/linux/linux-ezx-2.6.21/rokre6/defconfig 2fcdbfacbc7633f1338125153055119f08e7d52b
@@ -795,7 +795,8 @@ CONFIG_TOUCHSCREEN_PCAP=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
============================================================
--- packages/linux/linux-ezx_2.6.21.bb 5f6172886061304963281b566cf6cec75971178e
+++ packages/linux/linux-ezx_2.6.21.bb 8c02835ff0311dd8dfb6c691f61ccde14407e0ab
@@ -1,8 +1,8 @@ EZX = "ezxdev"
DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
AUTHOR = "The OpenEZX Team <openezx-devel at lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-PR = "${EZX}-r16"
+PR = "${EZX}-r17"
require linux.inc
============================================================
--- packages/tasks/task-openmoko-feed.bb 8bae7a09e4956d7750cdd285857089383e895865
+++ packages/tasks/task-openmoko-feed.bb ef020702ddfe8a9efbf7175aa35503330afaee31
@@ -1,13 +1,14 @@ LICENSE = "MIT"
DESCRIPTION = "OpenMoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r13"
+PR = "r14"
inherit task
RDEPENDS_task-openmoko-feed = "\
aspell enchant \
bluez-hcidump \
+ bootchart \
eet evas ecore embryo epsilon edje efreet emotion epdf \
exhibit edje-viewer \
free42-vga \
More information about the Openembedded-commits
mailing list