[oe-commits] org.oe.dev merge of '4d795eb920749e4b57552891946fac066af26b7d'
xora commit
openembedded-commits at lists.openembedded.org
Wed Sep 5 14:56:20 UTC 2007
merge of '4d795eb920749e4b57552891946fac066af26b7d'
and '7181fd7d242ef9d29a89f2d8fa4b4ab5d42801ba'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 110c6ec488c63036fe1cb9a1e304bfb935b57bca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=110c6ec488c63036fe1cb9a1e304bfb935b57bca
Files:
1
packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
classes/base.bbclass
classes/image.bbclass
conf/bitbake.conf
packages/linux/linux-rp-2.6.22/defconfig-akita
packages/linux/linux-rp-2.6.22/defconfig-c7x0
packages/linux/linux-rp_2.6.22.bb
packages/openmoko2/openmoko-common2_svn.bb
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
Diffs:
#
# mt diff -r4d795eb920749e4b57552891946fac066af26b7d -r110c6ec488c63036fe1cb9a1e304bfb935b57bca
#
#
#
# add_file "packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch"
# content [132410cd8e887996e40e7c159d3e9607ea0f460a]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [2b1663ab15a1f73e0b6b194dc89a4f70ff489aa6]
# to [b1117cd7aafdee0621dd4af3531528f543c555fb]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [4fea9c06a9f900ec7a8eaf57e3cf98052d0e8cc4]
# to [d755c69ff62f959cd61f30c99b68d783420b3606]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [6796cbe5628c54112219053af7446c291d38a29b]
# to [cf10662aea8138defdb07d131192ae1de18ec644]
#
============================================================
--- packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch 132410cd8e887996e40e7c159d3e9607ea0f460a
+++ packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch 132410cd8e887996e40e7c159d3e9607ea0f460a
@@ -0,0 +1,92 @@
+Index: applet/applet.c
+===================================================================
+--- applet/applet.c (revision 1633)
++++ applet/applet.c (working copy)
+@@ -1,30 +1,76 @@
++/*
++ * keyboard - Tray applet to toggle matchbox-keyboard's gtk-im
++ *
++ * Copyright 2007, Openedhand Ltd.
++ * Author Stefan Schmidt <stefan at openmoko.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 2 of the license.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ */
++
+ #include <gtk/gtk.h>
++#include <gtk/gtkeventbox.h>
+ #include <matchbox-panel/mb-panel.h>
+ #include <matchbox-panel/mb-panel-scaling-image.h>
+ #include <gtk-im/im-protocol.h>
+
++typedef struct {
++ GtkWidget *event_box;
++ gboolean show;
++} KeyboardApplet;
++
+ static void
+-on_toggled (GtkToggleButton *button)
++on_toggled (GtkWidget *event_box, GdkEventButton *event, KeyboardApplet *applet)
+ {
+- protocol_send_event (gtk_toggle_button_get_active (button) ?
+- INVOKE_KBD_SHOW : INVOKE_KBD_HIDE);
++
++ protocol_send_event (applet->show ? INVOKE_KBD_SHOW : INVOKE_KBD_HIDE);
++
++ if (applet->show)
++ applet->show = FALSE;
++ else
++ applet->show = TRUE;
+ }
+
++static void
++keyboard_applet_free (KeyboardApplet *applet)
++{
++ g_slice_free (KeyboardApplet, applet);
++}
++
+ G_MODULE_EXPORT GtkWidget *
+ mb_panel_applet_create (const char *id, GtkOrientation orientation)
+ {
+- GtkWidget *button, *image;
++ KeyboardApplet *applet;
++ MBPanelScalingImage *image;
++ //GtkImage *image;
+
+- button = gtk_toggle_button_new ();
+- gtk_widget_set_name (button, "MatchboxPanelKeyboard");
+- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
++ /* Create applet data structure */
++ applet = g_slice_new (KeyboardApplet);
+
++ applet->event_box = gtk_event_box_new ();
++ gtk_event_box_set_visible_window (applet->event_box, FALSE);
++
++ gtk_widget_set_name (applet->event_box, "MatchboxPanelKeyboard");
++
+ image = mb_panel_scaling_image_new (orientation, "matchbox-keyboard");
+- gtk_container_add (GTK_CONTAINER (button), image);
+
+- g_signal_connect (button, "toggled", G_CALLBACK (on_toggled), NULL);
++ gtk_container_add (GTK_CONTAINER (applet->event_box), image);
+
+- gtk_widget_show_all (button);
++ g_object_weak_ref (G_OBJECT (applet->event_box),
++ (GWeakNotify) keyboard_applet_free, applet);
+
+- return button;
++ /* Toggle the on release event */
++ g_signal_connect (applet->event_box, "button-release-event",
++ G_CALLBACK (on_toggled), applet);
++
++ gtk_widget_show_all (applet->event_box);
++
++ return applet->event_box;
+ }
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb 2b1663ab15a1f73e0b6b194dc89a4f70ff489aa6
+++ packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b1117cd7aafdee0621dd4af3531528f543c555fb
@@ -6,10 +6,11 @@ PV = "0.0+svn${SRCDATE}"
#DEFAULT_PREFERENCE = "-1"
SECTION = "x11"
PV = "0.0+svn${SRCDATE}"
-PR = "r2"
+PR = "r4"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
- file://80matchboxkeyboard"
+ file://matchbox-keyboard-applet.patch;patch=1;pnum=0 \
+ file://80matchboxkeyboard"
SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1"
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session 4fea9c06a9f900ec7a8eaf57e3cf98052d0e8cc4
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session d755c69ff62f959cd61f30c99b68d783420b3606
@@ -8,7 +8,7 @@ matchbox-window-manager -use_titlebar ye
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
-matchbox-panel-2 --start-applets systray,startup \
- --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar &
+matchbox-panel-2 --start-applets startup \
+ --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar &
exec neod
============================================================
--- packages/openmoko2/openmoko-session2.bb 6796cbe5628c54112219053af7446c291d38a29b
+++ packages/openmoko2/openmoko-session2.bb cf10662aea8138defdb07d131192ae1de18ec644
@@ -1,10 +1,10 @@ RCONFLICTS = "openmoko-session"
DESCRIPTION = "Custom MB session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r30"
+PR = "r31"
SRC_URI = "file://etc"
S = ${WORKDIR}
#
# mt diff -r7181fd7d242ef9d29a89f2d8fa4b4ab5d42801ba -r110c6ec488c63036fe1cb9a1e304bfb935b57bca
#
#
#
# patch "classes/base.bbclass"
# from [d0d8cdb0b25aaa62b66b99e71e401912b449c593]
# to [c46582cf3af337f4c4c1769a3cc4f456f429f294]
#
# patch "classes/image.bbclass"
# from [95a9259837f0da14059da200343397588b5b677f]
# to [469ee07830a49ad3c97a67804413039b7e82c1a0]
#
# patch "conf/bitbake.conf"
# from [27f28821d89de0f8fab490644ac698eedc27f811]
# to [2dc9ee975a901881a1c927dc7a1e682c4dd7246b]
#
# patch "packages/linux/linux-rp-2.6.22/defconfig-akita"
# from [3b4350d48675e15178efe1715de3f38002b7129d]
# to [37ddad6b88ba793e3b10c7e3e24a9d2ba7d92edd]
#
# patch "packages/linux/linux-rp-2.6.22/defconfig-c7x0"
# from [74a3fb8e2f5401c826fb60ca0018e4347559ebf6]
# to [0642b05daa34a16f12836bbb237cdb00105bcbd6]
#
# patch "packages/linux/linux-rp_2.6.22.bb"
# from [dc29be19e8eaf4db51405bb3511a5ad4248ee05b]
# to [282e8a8c96f9e04c16468fe3d53ee1935bcabcd6]
#
# patch "packages/openmoko2/openmoko-common2_svn.bb"
# from [13898cb7774ae7a674521a58eb62b930b1aef045]
# to [2b1fc081aed526f2c6bb9e9e643576153e9b7a10]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [693ce6e2621655052632c3ddfdd9427c170673b8]
# to [e8a1f377f5a46ff991e1c83c538827b48f5f3229]
#
============================================================
--- classes/base.bbclass d0d8cdb0b25aaa62b66b99e71e401912b449c593
+++ classes/base.bbclass c46582cf3af337f4c4c1769a3cc4f456f429f294
@@ -375,10 +375,7 @@ oe_machinstall() {
}
# Remove and re-create ${D} so that is it guaranteed to be empty
-do_install_prepend() {
- rm -rf ${D}
- mkdir -p ${D}
-}
+do_install[cleandirs] = "${D}"
addtask listtasks
do_listtasks[nostamp] = "1"
============================================================
--- classes/image.bbclass 95a9259837f0da14059da200343397588b5b677f
+++ classes/image.bbclass 469ee07830a49ad3c97a67804413039b7e82c1a0
@@ -1,10 +1,10 @@ RDEPENDS += "${IMAGE_INSTALL}"
inherit rootfs_${IMAGE_PKGTYPE}
LICENSE = "MIT"
PACKAGES = ""
RDEPENDS += "${IMAGE_INSTALL}"
-export IMAGE_BASENAME ?= "${PN}"
+IMAGE_BASENAME[export] = "1"
export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
# We need to recursively follow RDEPENDS and RRECOMMENDS for images
============================================================
--- conf/bitbake.conf 27f28821d89de0f8fab490644ac698eedc27f811
+++ conf/bitbake.conf 2dc9ee975a901881a1c927dc7a1e682c4dd7246b
@@ -157,6 +157,7 @@ GITDIR = "${DL_DIR}/git"
CVSDIR = "${DL_DIR}/cvs"
SVNDIR = "${DL_DIR}/svn"
GITDIR = "${DL_DIR}/git"
+BZRDIR = "${DL_DIR}/bzr"
STAMP = "${TMPDIR}/stamps/${PF}"
WORKDIR = "${TMPDIR}/work/${PF}"
@@ -203,7 +204,7 @@ IMAGE_ROOTFS = "${TMPDIR}/rootfs"
##################################################################
IMAGE_ROOTFS = "${TMPDIR}/rootfs"
-IMAGE_BASENAME = "rootfs"
+IMAGE_BASENAME = "${PN}"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
IMAGE_CMD = ""
@@ -372,6 +373,7 @@ FETCHCMD_wget = "/usr/bin/env wget -t 5"
FETCHCMD_svn = "/usr/bin/env svn"
FETCHCMD_cvs = "/usr/bin/env cvs"
FETCHCMD_wget = "/usr/bin/env wget -t 5"
+FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
============================================================
--- packages/linux/linux-rp-2.6.22/defconfig-akita 3b4350d48675e15178efe1715de3f38002b7129d
+++ packages/linux/linux-rp-2.6.22/defconfig-akita 37ddad6b88ba793e3b10c7e3e24a9d2ba7d92edd
@@ -743,6 +743,7 @@ CONFIG_NET_RADIO=y
#
# Wireless 802.11b ISA/PCI cards support
#
+CONFIG_WLAN_80211=y
CONFIG_HERMES=m
# CONFIG_ATMEL is not set
============================================================
--- packages/linux/linux-rp-2.6.22/defconfig-c7x0 74a3fb8e2f5401c826fb60ca0018e4347559ebf6
+++ packages/linux/linux-rp-2.6.22/defconfig-c7x0 0642b05daa34a16f12836bbb237cdb00105bcbd6
@@ -757,6 +757,7 @@ CONFIG_NET_RADIO=y
#
# Wireless 802.11b ISA/PCI cards support
#
+CONFIG_WLAN_80211=y
CONFIG_HERMES=m
# CONFIG_ATMEL is not set
@@ -772,7 +773,6 @@ CONFIG_HOSTAP_CS=m
CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
CONFIG_HOSTAP_CS=m
-CONFIG_NET_WIRELESS=y
#
# PCMCIA network device support
============================================================
--- packages/linux/linux-rp_2.6.22.bb dc29be19e8eaf4db51405bb3511a5ad4248ee05b
+++ packages/linux/linux-rp_2.6.22.bb 282e8a8c96f9e04c16468fe3d53ee1935bcabcd6
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r8"
+PR = "r9"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
============================================================
--- packages/openmoko2/openmoko-common2_svn.bb 13898cb7774ae7a674521a58eb62b930b1aef045
+++ packages/openmoko2/openmoko-common2_svn.bb 2b1fc081aed526f2c6bb9e9e643576153e9b7a10
@@ -1,6 +1,6 @@ SECTION = "openmoko/base"
DESCRIPTION = "Common files for the OpenMoko distribution"
SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
PR = "r3"
inherit openmoko2
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 693ce6e2621655052632c3ddfdd9427c170673b8
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb e8a1f377f5a46ff991e1c83c538827b48f5f3229
@@ -7,7 +7,7 @@ PE = "1"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r1"
+PR = "r2"
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -21,6 +21,5 @@ S = "${WORKDIR}/xorg-server-${PV}"
S = "${WORKDIR}/xorg-server-${PV}"
-IMAGEON_OECONF = "--disable-imageon"
-IMAGEON_OECONF_arm = "--enable-imageon"
+EXTRA_OECONF += "--enable-imageon"
More information about the Openembedded-commits
mailing list