[oe-commits] org.oe.dev merge of '15bd9ab3bb169e676b199f732c73e4daa38511ce'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sun Sep 9 06:08:04 UTC 2007
merge of '15bd9ab3bb169e676b199f732c73e4daa38511ce'
and '23eca17a29c5cd3c74a163af0f580f4e2b481162'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 31f5a286594a5bbefbd62d34485ab695172c7f17
ViewMTN: http://monotone.openembedded.org/revision/info/31f5a286594a5bbefbd62d34485ab695172c7f17
Files:
1
conf/distro/include/sane-srcrevs.inc
conf/machine/include/tune-pentium.inc
conf/machine/include/tune-pentiumpro.inc
packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch
classes/package_ipk.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/openmoko.conf
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/tasks/task-openmoko.bb
packages/uboot/uboot-openmoko_svn.bb
site/ix86-common
Diffs:
#
# mt diff -r15bd9ab3bb169e676b199f732c73e4daa38511ce -r31f5a286594a5bbefbd62d34485ab695172c7f17
#
#
# no changes
#
#
# mt diff -r23eca17a29c5cd3c74a163af0f580f4e2b481162 -r31f5a286594a5bbefbd62d34485ab695172c7f17
#
#
#
# add_file "conf/distro/include/sane-srcrevs.inc"
# content [a91d71aa246c9939199aabe9bafe087f0b860a4d]
#
# add_file "conf/machine/include/tune-pentium.inc"
# content [b1b8208e7f5420ff66a9411c623677b0c1d186c2]
#
# add_file "conf/machine/include/tune-pentiumpro.inc"
# content [b36cd1f6f642ce7dcc57af112d847eb098fb29ae]
#
# add_file "packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch"
# content [132410cd8e887996e40e7c159d3e9607ea0f460a]
#
# patch "classes/package_ipk.bbclass"
# from [89bc8829d8e01336d5c7388a5fa756a042940a40]
# to [55ae1d1bc1b49ed1ae4a1a93746b0063fda0d25b]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [8a3187bfeabfc7d9f5c299a7ba5cd346e3aba275]
# to [07f73119ae13cbfa759edeaf36c895f08edaf726]
#
# patch "conf/distro/openmoko.conf"
# from [e0c801f07369b559ca30a4b14350a95774ebaedd]
# to [8a793c4c4e8b4bf9d2e7b7b95829905e94482cf1]
#
# patch "conf/machine/i586-generic.conf"
# from [c5fd72db431ef2ed503db0c88c5b22e788be90bd]
# to [006a74a863afd1f923bb67cedef39bf4391cffd0]
#
# patch "conf/machine/i686-generic.conf"
# from [669fc531794bbc10ec2d56acd9c276fa190eb66f]
# to [ee687be060f3975c6581a344e0fcff555311c4c0]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [2b1663ab15a1f73e0b6b194dc89a4f70ff489aa6]
# to [b1117cd7aafdee0621dd4af3531528f543c555fb]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [4fea9c06a9f900ec7a8eaf57e3cf98052d0e8cc4]
# to [473fde484283e9e9ecdc176e1bda70a0d3f7fc9f]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [6796cbe5628c54112219053af7446c291d38a29b]
# to [cf10662aea8138defdb07d131192ae1de18ec644]
#
# patch "packages/tasks/task-openmoko.bb"
# from [8f483a0572038a79f60bddab9863f323e93bbef2]
# to [0c2dfe8b69490ce7bd6d86af3f88cff0d0439864]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [e2be2c8abbfa2f529e0ca0879acb4195c4db28ac]
# to [a9daac10326cc7c8c5b0dfea1c25a605b5855bc9]
#
# patch "site/ix86-common"
# from [d8fa481822d52ac3e2192ceabc012ca07c564206]
# to [816379b5c0b279c98a6108161517dcc6d67a9eb0]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc a91d71aa246c9939199aabe9bafe087f0b860a4d
+++ conf/distro/include/sane-srcrevs.inc a91d71aa246c9939199aabe9bafe087f0b860a4d
@@ -0,0 +1,74 @@
+#Ggenerated with
+# bitbake -s | grep svnr | awk '{print "SRCREV_pn-" $1 "=" $2}' | \
+# sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 "=\"" $3}' | \
+# awk -F "-r" '{print $1"\""}'
+
+# This will miss recipes that have skippackage set (e.g. uclibc)
+
+SRCREV_pn-dfu-util="2866"
+SRCREV_pn-dfu-util-native="2866"
+SRCREV_pn-eglibc="3376"
+SRCREV_pn-eglibc-initial="3376"
+SRCREV_pn-eglibc-intermediate="3376"
+SRCREV_pn-elf2flt="1786"
+SRCREV_pn-gnuradio="6316"
+SRCREV_pn-hildon-1="13599"
+SRCREV_pn-libgsmd="2806"
+SRCREV_pn-libmokogsmd2="2780"
+SRCREV_pn-libmokojournal2="2780"
+SRCREV_pn-libmokopanelui2="2892"
+SRCREV_pn-libmokoui2="2868"
+SRCREV_pn-libowl="277"
+SRCREV_pn-libxosd="627"
+SRCREV_pn-llvm-gcc4="41698"
+SRCREV_pn-llvm-gcc4-cross="41698"
+SRCREV_pn-matchbox-desktop-2="1649"
+SRCREV_pn-matchbox-keyboard="1583"
+SRCREV_pn-matchbox-panel-2="1626"
+SRCREV_pn-neod="2901"
+SRCREV_pn-openmoko-appmanager="1851"
+SRCREV_pn-openmoko-calculator="2404"
+SRCREV_pn-openmoko-calculator2="2789"
+SRCREV_pn-openmoko-common="397"
+SRCREV_pn-openmoko-common2="2679"
+SRCREV_pn-openmoko-contacts="2298"
+SRCREV_pn-openmoko-contacts2="335"
+SRCREV_pn-openmoko-dates="467"
+SRCREV_pn-openmoko-dialer="2811"
+SRCREV_pn-openmoko-dialer2="2869"
+SRCREV_pn-openmoko-feedreader2="2905"
+SRCREV_pn-openmoko-finger-demo="1671"
+SRCREV_pn-openmoko-firststart2="2873"
+SRCREV_pn-openmoko-footer="2354"
+SRCREV_pn-openmoko-icon-theme-standard="2232"
+SRCREV_pn-openmoko-icon-theme-standard2="2840"
+SRCREV_pn-openmoko-keyboard="1631"
+SRCREV_pn-openmoko-libs="2367"
+SRCREV_pn-openmoko-mediaplayer2="2883"
+SRCREV_pn-openmoko-messages="2276"
+SRCREV_pn-openmoko-panel-battery="2897"
+SRCREV_pn-openmoko-panel-bt="2896"
+SRCREV_pn-openmoko-panel-clock="2567"
+SRCREV_pn-openmoko-panel-demo="1622"
+SRCREV_pn-openmoko-panel-demo-simple="1328"
+SRCREV_pn-openmoko-panel-gps="2900"
+SRCREV_pn-openmoko-panel-gsm="2894"
+SRCREV_pn-openmoko-panel-mainmenu="2567"
+SRCREV_pn-openmoko-panel-usb="2893"
+SRCREV_pn-openmoko-session="152"
+SRCREV_pn-openmoko-simplemediaplayer="1688"
+SRCREV_pn-openmoko-sound-theme-standard="2827"
+SRCREV_pn-openmoko-stylus-demo="2324"
+SRCREV_pn-openmoko-stylus-demo-simple="1818"
+SRCREV_pn-openmoko-taskmanager="1663"
+SRCREV_pn-openmoko-tasks="320"
+SRCREV_pn-openmoko-tasks2="320"
+SRCREV_pn-openmoko-theme-standard="2370"
+SRCREV_pn-openmoko-theme-standard-qvga="2370"
+SRCREV_pn-openmoko-today="2556"
+SRCREV_pn-openmoko-today2="2919"
+SRCREV_pn-openmoko-today2-folders="2680"
+SRCREV_pn-opentapi="2012"
+SRCREV_pn-sphyrna="43"
+SRCREV_pn-webkit-gtk="webcore"
+SRCREV_pn-xoo="1623"
============================================================
--- conf/machine/include/tune-pentium.inc b1b8208e7f5420ff66a9411c623677b0c1d186c2
+++ conf/machine/include/tune-pentium.inc b1b8208e7f5420ff66a9411c623677b0c1d186c2
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentium"
+PACKAGE_ARCH = "i586"
+
============================================================
--- conf/machine/include/tune-pentiumpro.inc b36cd1f6f642ce7dcc57af112d847eb098fb29ae
+++ conf/machine/include/tune-pentiumpro.inc b36cd1f6f642ce7dcc57af112d847eb098fb29ae
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentiumpro"
+PACKAGE_ARCH = "i686"
+
============================================================
--- 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;
+ }
============================================================
--- classes/package_ipk.bbclass 89bc8829d8e01336d5c7388a5fa756a042940a40
+++ classes/package_ipk.bbclass 55ae1d1bc1b49ed1ae4a1a93746b0063fda0d25b
@@ -82,6 +82,10 @@ package_update_index_ipk () {
touch ${DEPLOY_DIR_IPK}/$arch/Packages
ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
fi
+ if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then
+ touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages
+ ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -p ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -l ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages.filelist -m ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/
+ fi
done
}
@@ -102,8 +106,10 @@ package_generate_ipkg_conf () {
priority=$(expr $priority + 5)
if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
- echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK}
fi
+ if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then
+ echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK}
+ fi
done
}
============================================================
--- conf/distro/angstrom-2008.1.conf 8a3187bfeabfc7d9f5c299a7ba5cd346e3aba275
+++ conf/distro/angstrom-2008.1.conf 07f73119ae13cbfa759edeaf36c895f08edaf726
@@ -21,10 +21,6 @@ PREFERRED_VERSION_gcc-cross = "4
PREFERRED_VERSION_gcc = "4.2.1"
PREFERRED_VERSION_gcc-cross = "4.2.1"
-PREFERRED_VERSION_binutils = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
-
#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
PREFERRED_VERSION_linux-libc-headers = "2.6.22"
============================================================
--- conf/distro/openmoko.conf e0c801f07369b559ca30a4b14350a95774ebaedd
+++ conf/distro/openmoko.conf 8a793c4c4e8b4bf9d2e7b7b95829905e94482cf1
@@ -11,7 +11,7 @@ DISTRO_NAME = "OpenMoko"
#
DISTRO = "openmoko"
DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = "P1-August-Snapshot-${DATE}"
+DISTRO_VERSION = "P1-September-Snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
============================================================
--- conf/machine/i586-generic.conf c5fd72db431ef2ed503db0c88c5b22e788be90bd
+++ conf/machine/i586-generic.conf 006a74a863afd1f923bb67cedef39bf4391cffd0
@@ -24,3 +24,6 @@ MACHINE_TASK_PROVIDER = "task-base"
MACHINE_TASK_PROVIDER = "task-base"
+#tune for pentium cpu
+require conf/machine/include/tune-pentium.inc
+
============================================================
--- conf/machine/i686-generic.conf 669fc531794bbc10ec2d56acd9c276fa190eb66f
+++ conf/machine/i686-generic.conf ee687be060f3975c6581a344e0fcff555311c4c0
@@ -22,3 +22,6 @@ MACHINE_TASK_PROVIDER = "task-base"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_TASK_PROVIDER = "task-base"
+#tune for pentium pro cpu
+require conf/machine/include/tune-pentiumpro.inc
+
============================================================
--- 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 473fde484283e9e9ecdc176e1bda70a0d3f7fc9f
@@ -9,6 +9,6 @@ matchbox-panel-2 --start-applets systray
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 &
+ --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}
============================================================
--- packages/tasks/task-openmoko.bb 8f483a0572038a79f60bddab9863f323e93bbef2
+++ packages/tasks/task-openmoko.bb 0c2dfe8b69490ce7bd6d86af3f88cff0d0439864
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r60"
+PR = "r61"
inherit task
@@ -98,6 +98,7 @@ RDEPENDS_task-openmoko-base = "\
# openmoko-appmanager \
matchbox-keyboard-inputmethod \
matchbox-keyboard-im \
+ matchbox-keyboard-applet \
matchbox-stroke \
openmoko-terminal2 \
openmoko-keyboard \
============================================================
--- packages/uboot/uboot-openmoko_svn.bb e2be2c8abbfa2f529e0ca0879acb4195c4db28ac
+++ packages/uboot/uboot-openmoko_svn.bb a9daac10326cc7c8c5b0dfea1c25a605b5855bc9
@@ -1,19 +1,21 @@ PROVIDES = "virtual/bootloader"
DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
AUTHOR = "Harald Welte <laforge at openmoko.org>"
LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
PROVIDES = "virtual/bootloader"
-PV = "1.2.0+git${SRCDATE}+svn${SRCDATE}"
+PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}"
PR = "r0"
+SRCREV_FORMAT = "patches"
+
UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "\
- git://www.denx.de/git/u-boot.git/;protocol=git \
- svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
+ git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \
+ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
file://uboot-eabi-fix-HACK.patch \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
"
============================================================
--- site/ix86-common d8fa481822d52ac3e2192ceabc012ca07c564206
+++ site/ix86-common 816379b5c0b279c98a6108161517dcc6d67a9eb0
@@ -166,6 +166,9 @@ ac_libnet_%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list