[oe-commits] org.oe.dev merge of '838eb6a07e13b6913dd7a7eebee5e18544c4e6ae'
daniel commit
openembedded-commits at lists.openembedded.org
Thu Jan 17 21:02:20 UTC 2008
merge of '838eb6a07e13b6913dd7a7eebee5e18544c4e6ae'
and 'c4c17ca83d23bc51028aa72cd2f94ead9497b597'
Author: daniel at openembedded.org
Branch: org.openembedded.dev
Revision: 3132d9c745c8a24622816b263ac02647c0bbc724
ViewMTN: http://monotone.openembedded.org/revision/info/3132d9c745c8a24622816b263ac02647c0bbc724
Files:
1
packages/uboot/files/glamo-ram-init.patch
packages/images/nslu2-minimal-image.bb
packages/images/nslu2-base-image.bb
packages/python/python-pyqt_4.3.1.bb
packages/python/python-pyqt_4.3.3.bb
packages/roadmap/zroadmap-1.0.12/zroadgps.png
packages/roadmap/files/zroadgps.png
packages/gnome/libart-lgpl/armeb
packages/pointercal/files/e680
packages/roadmap/files/qt
packages/gnome/libart-lgpl/armeb/art_config.h
packages/images/base-image.bb
packages/pointercal/files/e680/pointercal
packages/roadmap/files/qt/qt2-fixes.patch
packages/roadmap/files/qt/qt_canvas.patch
packages/roadmap/files/qt/qt_main.patch
packages/roadmap/files/qt/roadmap.desktop.patch
packages/roadmap/files/qt/roadmap_main.patch
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap.inc
packages/roadmap/zroadmap_1.1.0.bb
classes/base.bbclass
classes/package.bbclass
classes/sanity.bbclass
classes/sip.bbclass
conf/distro/angstrom-2007.1.conf
conf/distro/generic-uclibc.conf
conf/distro/generic.conf
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/documentation.conf
conf/machine/hx4700.conf
conf/machine/magician.conf
contrib/angstrom/build-release.sh
packages/apache2/apache2-native_2.2.3.bb
packages/base-files/base-files/fic-gta01/fstab
packages/base-files/base-files/fic-gta02/fstab
packages/images/minimal-gpe-image.bb
packages/initrdscripts/devimage_0.1.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/matchbox-keyboard/files/fic-gta01-font-size.patch
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/opie-citytime/opie-citytime.inc
packages/pointercal/pointercal_0.0.bb
packages/qmake/qmake2-native_2.10a.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/zroadmap_cvs.bb
packages/spandsp/spandsp_0.0.3.bb
packages/tasks/task-devimage.bb
packages/uboot/uboot-openmoko_svn.bb
Diffs:
#
# mt diff -r838eb6a07e13b6913dd7a7eebee5e18544c4e6ae -r3132d9c745c8a24622816b263ac02647c0bbc724
#
#
#
# delete "packages/uboot/files/glamo-ram-init.patch"
#
# rename "packages/images/nslu2-minimal-image.bb"
# to "packages/images/nslu2-base-image.bb"
#
# rename "packages/python/python-pyqt_4.3.1.bb"
# to "packages/python/python-pyqt_4.3.3.bb"
#
# rename "packages/roadmap/zroadmap-1.0.12/zroadgps.png"
# to "packages/roadmap/files/zroadgps.png"
#
# add_dir "packages/gnome/libart-lgpl/armeb"
#
# add_dir "packages/pointercal/files/e680"
#
# add_dir "packages/roadmap/files/qt"
#
# add_file "packages/gnome/libart-lgpl/armeb/art_config.h"
# content [d94c2cc1288fee878cb8c9791b3b847eaa6b93e7]
#
# add_file "packages/images/base-image.bb"
# content [b505988725f2bce81ebd364549ae0d4a1bcfca4f]
#
# add_file "packages/pointercal/files/e680/pointercal"
# content [746ced31da69780530c774d54918e4a349c92224]
#
# add_file "packages/roadmap/files/qt/qt2-fixes.patch"
# content [83ebf600b82912603be342974976e1632293f259]
#
# add_file "packages/roadmap/files/qt/qt_canvas.patch"
# content [74b0e83a35a344fd9bf34cacb8a7b4406d829290]
#
# add_file "packages/roadmap/files/qt/qt_main.patch"
# content [22e4ac263d7fc8c659d6c9ee48b94afb88c0bfb6]
#
# add_file "packages/roadmap/files/qt/roadmap.desktop.patch"
# content [42b9a60edcb76bd0609020c491eaa1d1fa6fb1b5]
#
# add_file "packages/roadmap/files/qt/roadmap_main.patch"
# content [4d19c6f3d39ebf81201b518228e4ae8376742647]
#
# add_file "packages/roadmap/roadmap.inc"
# content [18f16cbe822cba5f8dd391e023297f98a693d254]
#
# add_file "packages/roadmap/zroadmap.inc"
# content [6f4897b3cbc5a817995412a0c649a7fffc71554b]
#
# add_file "packages/roadmap/zroadmap_1.1.0.bb"
# content [47050a07f10a909f16525fb375ad0bff60a3822e]
#
# patch "classes/base.bbclass"
# from [a42a0cea14f8090cf64528a459fa8b5795e36327]
# to [5efb30de935081fe56703b6432d636a3668d4823]
#
# patch "classes/package.bbclass"
# from [64623cb5ec9aca92b3faacf2075e146fcce623d9]
# to [540a6836514d7f26b1ef8be9ce1d15f0396f6e29]
#
# patch "classes/sanity.bbclass"
# from [808f5e34043a37c456f2b223aace94f414b22349]
# to [a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5]
#
# patch "classes/sip.bbclass"
# from [a9ed0b070fecb4888c0a73be816865c0285ba605]
# to [19431964e31ac4c591edad007b98e47bc3efc3b7]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [3d10520a0111676c1e609a3731b65ea0c93d41e4]
# to [c9c69c3a8cfe32c296bc6533bfbe7d1245734ef7]
#
# patch "conf/distro/generic-uclibc.conf"
# from [24dc46bef762014295a9f6a96c586ddbdea62d06]
# to [2280bf1003490f3615211613df40817df22352d3]
#
# patch "conf/distro/generic.conf"
# from [4c7db192371c90fef979ed8017dcb610a2842914]
# to [d45a46f2df99b280a6fead15ab5f1e1c3b41ab0f]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [bc08487711a74b011fdf760aa1a788af6b5c8a6a]
# to [936fa5b0bafa49c816782957d4d6d7de12cee042]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [07b627e17e9ef591c5ada94c502a4e67b77e885c]
# to [9a85ba9d86a1ceae58415bb7a11eed3fb6d5f333]
#
# patch "conf/documentation.conf"
# from [39b05416fe91d4b5812b04d933b9da47d2659c73]
# to [bdfe2a042dd570980cb40a9e27a56cb7e06f2a57]
#
# patch "conf/machine/hx4700.conf"
# from [1181931b2a5904b7567bc19b2442b84fec80033a]
# to [7073f22f2c781c6ef6eaf11fac2de5ae77d66f5b]
#
# patch "conf/machine/magician.conf"
# from [1ae98222e011e1527f45541f6e78db64c18e0824]
# to [4260af3d8d3a880db6afad5b346400cd59e1fd77]
#
# patch "contrib/angstrom/build-release.sh"
# from [0d3b7a36cc56801803e97fa8da4ec459e9a991cd]
# to [8d77a44ca4304a0ee848142edd6f3c86b6abc9ea]
#
# patch "packages/apache2/apache2-native_2.2.3.bb"
# from [c3cb0bbb21cd4a5129f91f294cc0fa72a617f93f]
# to [244f75f7866e4b1273b09482f434d6dafa38ca65]
#
# patch "packages/base-files/base-files/fic-gta01/fstab"
# from [c6da62315357051beef22facaa950d104eb7fd88]
# to [2fcbd6c217ae7674edb29400178b9a37722b27c5]
#
# patch "packages/base-files/base-files/fic-gta02/fstab"
# from [c6da62315357051beef22facaa950d104eb7fd88]
# to [2fcbd6c217ae7674edb29400178b9a37722b27c5]
#
# patch "packages/images/minimal-gpe-image.bb"
# from [e8665528258e599e44b51e8574508562e66d7af9]
# to [a0dd38c53ff0c3542cb4fb56d015979b65935ee1]
#
# patch "packages/images/nslu2-base-image.bb"
# from [14898795bea95dfcd88ed66ae25730964af725c5]
# to [554cbad7ee3ea28180edebc058b1f80051094c78]
#
# patch "packages/initrdscripts/devimage_0.1.bb"
# from [4d6613a7cf373cad5cd52603f3a02ad18595f16e]
# to [927ed0e937df451327d36b29dac515ed51a08844]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [3be3bf803a686aab18297d3d48a928bc8c6d1084]
# to [388ec458d592dce0a5a48e2ae5cc23b52f898460]
#
# patch "packages/matchbox-keyboard/files/fic-gta01-font-size.patch"
# from [7faa8b53d7e6bc3188ea910931137b054c3e77f4]
# to [ead2a2a2c08495a4ce1a5eb0ecef61e6db31cad0]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [0443c38b2e1463c513fd3a12fa5c0d213e337cec]
# to [801c5d051ce467eb8964dc701bb8040c2d9315bf]
#
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
# from [9ca964cafabb093788ba8d42e42e6cd2c4c01437]
# to [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
#
# patch "packages/opie-citytime/opie-citytime.inc"
# from [943b73ea320db703c06f6bb67b80e6cd8fad52af]
# to [8578cf76f429b5b1670f8c1123ffe3ee90a8d660]
#
# patch "packages/pointercal/pointercal_0.0.bb"
# from [a8a3e606c0d9cb9d7156407a1729b9d398ff5545]
# to [f1a528bf4eccc047ffabc03cb6b323cda0cfac7c]
#
# patch "packages/python/python-pyqt_4.3.3.bb"
# from [ba7b95e381ea4abf18b5fb46f9e7d39d05d8198d]
# to [f4e8b4a75b9b494f6d70e74cc041955ee3af4996]
#
# patch "packages/qmake/qmake2-native_2.10a.bb"
# from [4e99113b60782b4965c8f34d69ca62a338f36078]
# to [d941635b01c58764ba76d411ea57f1b33b4d22eb]
#
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
# from [910392dc4aba52e64d998814ab3c6309cde2d477]
# to [3d494fe1e57842d791e68ad3ac1b63b1692305d6]
#
# patch "packages/roadmap/zroadmap_1.0.12.bb"
# from [f694a330e8568d7ed7fa8ef74193a3d34c3837c7]
# to [defdf4312079c65d41c8d23a255e656af962c476]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [9482663decb86dcafc9a60c4a8270154a0fa35df]
# to [a3e925537e5fc4d227e62224726e06d610c448b3]
#
# patch "packages/spandsp/spandsp_0.0.3.bb"
# from [1d5a36b9e734be02557707c1ed2a60c5e03db3e6]
# to [9b248bfa60d8847873395df1ae5b309eecaaf91f]
#
# patch "packages/tasks/task-devimage.bb"
# from [63338e74dabf0db1286b9ec7c451d8c5d74f36bd]
# to [c195fca95cba58010289c012a9ea93f27f2db4dd]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [c0a89cd0bab0ba4349b2bf440f42a1f17e7fa912]
# to [f7e8df9fab2b480e384525d33ccc0b0221c3f575]
#
============================================================
--- packages/gnome/libart-lgpl/armeb/art_config.h d94c2cc1288fee878cb8c9791b3b847eaa6b93e7
+++ packages/gnome/libart-lgpl/armeb/art_config.h d94c2cc1288fee878cb8c9791b3b847eaa6b93e7
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
============================================================
--- packages/images/base-image.bb b505988725f2bce81ebd364549ae0d4a1bcfca4f
+++ packages/images/base-image.bb b505988725f2bce81ebd364549ae0d4a1bcfca4f
@@ -0,0 +1,76 @@
+# This image is intended to provide a basic configuration that allows
+# you to access a newly flashed device over the network or via the
+# native console, and use ipkg to install (from feeds accessible via
+# the network) any further features you require into internal flash
+# memory or onto attached storage.
+
+# It should be as small as possible, while still achieving that goal.
+
+# The rationale for naming it 'base-image' is that this image is the
+# base upon which you can install any other functionality you desire.
+
+# See the end of this file for further rationale and policy regarding
+# the contents of this image, and the criteria which are used to make
+# decisions about adding and removing packages from this image.
+
+# Although it is only fully tested with the Angstrom distro, this
+# image is intended to be distro-agnostic.
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+DEPENDS = "\
+ task-boot \
+ task-distro-base task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ "
+
+IMAGE_INSTALL = "\
+ task-boot \
+ task-distro-base task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ "
+
+export IMAGE_BASENAME = "base-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
+# Key features of this image are:
+
+# 1) Must be able to mount attached storage devices like SD cards, CF
+# cards, internal disks, external USB disks, etc. Should support
+# various filesystem choices, but ext2 at a minimum. The rationale
+# for this is that you need storage to be able to install significant
+# new functionality.
+
+# 2) Must be able to boot from internal flash, or directly from a
+# filesystem stored on the attached storage. The rationale for this
+# is that you will want to boot from attached storage instead of
+# messing around with ipkg-link.
+
+# Rationale and policy:
+
+# 'base-image' is the smallest possible image which allows you to ssh
+# into a device via it's native network interface, and install
+# packages from feeds across the network into internal flash or onto
+# an attached storage device.
+
+# It is "larger" than minimal-image (which is strictly only that which
+# is required to boot and get ssh access to the device, and nothing
+# else), but is "smaller" than console-image (which has a whole lot of
+# stuff in it which could easily be ipkg installed after boot rather
+# than being in the initial rootfs).
+
+# It is required to always be small enough to fit in the internal
+# flash rootfs partition of an NSLU2 (as an example of the smaller end
+# of flash sizes that OE supports), and features will be removed from
+# the image to ensure that this is always the case. Any feature that
+# can be installed over the network using the package manager after
+# the first boot is always fair game for removal at any time, and
+# patches are welcome to make base-image as small as possible while
+# still retaining the ability to subsequently install that feature.
============================================================
--- packages/pointercal/files/e680/pointercal 746ced31da69780530c774d54918e4a349c92224
+++ packages/pointercal/files/e680/pointercal 746ced31da69780530c774d54918e4a349c92224
@@ -0,0 +1 @@
+-19857 -412 18085522 189 -23922 22734294 65536
============================================================
--- packages/roadmap/files/qt/qt2-fixes.patch 83ebf600b82912603be342974976e1632293f259
+++ packages/roadmap/files/qt/qt2-fixes.patch 83ebf600b82912603be342974976e1632293f259
@@ -0,0 +1,10 @@
+--- src/qt/Makefile~qt2-fixes.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+
+ ifeq ($(DESKTOP),QPE)
+ CFLAGS += -I$(QTDIR)/include -DQWS
+- LIBS += -lqte -lqpe
++ LIBS += -lqpe
+ INSTALLDIR=$(QTDIR)
+ endif
============================================================
--- packages/roadmap/files/qt/qt_canvas.patch 74b0e83a35a344fd9bf34cacb8a7b4406d829290
+++ packages/roadmap/files/qt/qt_canvas.patch 74b0e83a35a344fd9bf34cacb8a7b4406d829290
@@ -0,0 +1,20 @@
+--- src/qt/qt_canvas.cc.old 2007-12-08 20:29:52.000000000 -0600
++++ src/qt/qt_canvas.cc 2007-12-13 02:34:22.000000000 -0600
+@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch
+ *w = r.width();
+ *ascent = fm.ascent();
+ *descent = fm.descent();
+-#ifdef QT_NO_ROTATE
++#ifdef QT_NO_TRANSFORMATIONS
+ if (can_tilt) *can_tilt = 0;
+ #else
+ if (can_tilt) *can_tilt = 1;
+@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo
+
+ void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position,
+ int center, const char* text, int angle) {
+-#ifndef QT_NO_ROTATE
++#ifndef QT_NO_TRANSFORMATIONS
+ if (!pixmap) {
+ return;
+ }
============================================================
--- packages/roadmap/files/qt/qt_main.patch 22e4ac263d7fc8c659d6c9ee48b94afb88c0bfb6
+++ packages/roadmap/files/qt/qt_main.patch 22e4ac263d7fc8c659d6c9ee48b94afb88c0bfb6
@@ -0,0 +1,61 @@
+--- src/qt/qt_main.cc.old 2007-12-08 20:32:34.000000000 -0600
++++ src/qt/qt_main.cc 2007-12-08 20:34:38.000000000 -0600
+@@ -27,6 +27,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <unistd.h>
+ #include "qt_main.h"
+
+ static int signalFd[2];
+@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char*
+ const char* tip,
+ RoadMapCallback callback) {
+
+-#ifndef QWS
+- // For some unknown reason, this toolbar crashes RoadMap
+- // on the Sharp Zaurus.
+- // This should be fixed and the ifndef removed.
+- // Pascal: I believe this has been fixed now.
+-
+ if (toolBar == 0) {
+ addToolbar("");
+ }
+@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char*
+
+ connect(b, SIGNAL(clicked()), cb, SLOT(fire()));
+ }
+-#endif
+ }
+
+ void RMapMainWindow::addToolSpace(void) {
+
+-#ifndef QWS
+- // For some unknown reason, this toolbar crashes RoadMap
+- // on the Sharp Zaurus. This should be fixed and the ifndef
+- // removed.
+-
+ addTool (NULL, NULL, NULL, NULL);
+
+ toolBar->addSeparator();
+-#endif
+ }
+
+
+@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv
+
+ void RMapMainWindow::signalHandler(int sig)
+ {
+- ::write(signalFd[0], &sig, sizeof(sig));
++ write(signalFd[0], &sig, sizeof(sig));
+ }
+
+ void RMapMainWindow::handleSignal()
+ {
+ snSignal->setEnabled(false);
+ int tmp;
+- ::read(signalFd[1], &tmp, sizeof(tmp));
++ read(signalFd[1], &tmp, sizeof(tmp));
+ QString action;
+ switch (tmp) {
+ case SIGTERM: action="SIGTERM"; break;
============================================================
--- packages/roadmap/files/qt/roadmap.desktop.patch 42b9a60edcb76bd0609020c491eaa1d1fa6fb1b5
+++ packages/roadmap/files/qt/roadmap.desktop.patch 42b9a60edcb76bd0609020c491eaa1d1fa6fb1b5
@@ -0,0 +1,16 @@
+--- src/roadmap.desktop.old 2007-12-08 23:15:45.000000000 -0600
++++ src/roadmap.desktop 2007-12-08 23:17:48.000000000 -0600
+@@ -1,11 +1,8 @@
+ [Desktop Entry]
+-Comment=RoadMap
+ Comment=Car Navigation System
+ Exec=roadmap
+-Icon=roadmap.png
++Icon=roadmap
+ Type=Application
+ Name=RoadMap
+ GenericName=Map Viewer
+-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK;
+-FilePattern=*roadmap;*.rdm
+-
++Categories=VectorGraphics;Graphics;Viewer;GTK;
============================================================
--- packages/roadmap/files/qt/roadmap_main.patch 4d19c6f3d39ebf81201b518228e4ae8376742647
+++ packages/roadmap/files/qt/roadmap_main.patch 4d19c6f3d39ebf81201b518228e4ae8376742647
@@ -0,0 +1,16 @@
+--- src/qt/roadmap_main.cc.old 2007-12-08 15:47:05.000000000 -0600
++++ src/qt/roadmap_main.cc 2007-12-07 20:39:15.000000000 -0600
+@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur
+ break;
+
+ case ROADMAP_CURSOR_WAIT:
+- mainWindow->setCursor (QCursor(Qt::WaitCursor));
++ mainWindow->setCursor (QCursor(Qt::waitCursor));
+ break;
+
+ case ROADMAP_CURSOR_CROSS:
+- mainWindow->setCursor (QCursor(Qt::CrossCursor));
++ mainWindow->setCursor (QCursor(Qt::crossCursor));
+ break;
+ }
+ }
============================================================
--- packages/roadmap/roadmap.inc 18f16cbe822cba5f8dd391e023297f98a693d254
+++ packages/roadmap/roadmap.inc 18f16cbe822cba5f8dd391e023297f98a693d254
@@ -0,0 +1,7 @@
+DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX."
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+LICENSE = "GPL"
+
+PARALLEL_MAKE = ""
============================================================
--- packages/roadmap/zroadmap.inc 6f4897b3cbc5a817995412a0c649a7fffc71554b
+++ packages/roadmap/zroadmap.inc 6f4897b3cbc5a817995412a0c649a7fffc71554b
@%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc4c17ca83d23bc51028aa72cd2f94ead9497b597 -r3132d9c745c8a24622816b263ac02647c0bbc724
#
#
# no changes
#
More information about the Openembedded-commits
mailing list