[oe-commits] org.oe.dev merge of '976fd3ee118be06b85173fee9f4eaf90e321822d'
oe commit
openembedded-commits at lists.openembedded.org
Wed Aug 15 21:58:32 UTC 2007
merge of '976fd3ee118be06b85173fee9f4eaf90e321822d'
and 'a505ece6d3699f2da6fbe6590ac611befdcc5bdf'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 2fe4b71bd46729f460c8f38c28f97d1d8ee53d84
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2fe4b71bd46729f460c8f38c28f97d1d8ee53d84
Files:
1
packages/images/openmoko-image.bb
packages/initscripts/initscripts-1.0/bootmisc.sh
packages/initscripts/initscripts-1.0/save-rtc.sh
packages/initscripts/initscripts_1.0.bb
packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
packages/linux/linux-gta01.inc
packages/linux/linux-gta01_2.6.21.5.bb
packages/gloox/gloox_0.8.9.bb
packages/gpephone/sms_1.1.bb
Diffs:
#
# mt diff -r976fd3ee118be06b85173fee9f4eaf90e321822d -r2fe4b71bd46729f460c8f38c28f97d1d8ee53d84
#
#
#
# patch "packages/images/openmoko-image.bb"
# from [baa68f491ce9ac84c3a47b7904190c6b594cb0ef]
# to [97b5722f7eef6ce6117016cc573067e30da5f2ee]
#
# patch "packages/initscripts/initscripts-1.0/bootmisc.sh"
# from [04ee5c8267f42bb17d0b7465f613854b9f79b352]
# to [43ecc46db9908042b08383318d0d5821022e2b74]
#
# patch "packages/initscripts/initscripts-1.0/save-rtc.sh"
# from [353d869c5dce5dc015a458b99ee7526623ac136b]
# to [9b1d470537af18827367537206420cc5f66f877e]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [987f1ca2c2c0d5cd92451cb463f65beb68b9a89d]
# to [6c15812e6872f15d45072ac63fb02065a0639077]
#
# patch "packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01"
# from [d37b0d7a88ff3c521069869b88eb1d365aceeffb]
# to [a4fce0d73552488787ac6ff3486cdf1c84546f65]
#
# patch "packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01"
# from [b13800e54f61edf724b8c70fbf5b508ea11f79e9]
# to [e33e541e6f793d94d9fa783562429ff4ac0e7189]
#
# patch "packages/linux/linux-gta01.inc"
# from [7538e9a0489178797d787503f993d57517becf9c]
# to [44323377f4017d36e02429fa4c056b0b73c70cdd]
#
# patch "packages/linux/linux-gta01_2.6.21.5.bb"
# from [e6db6ff2a3c5110427abc294b19a748b07070848]
# to [42a58603d3240f81b7d74124c8ec6cdaa5255b22]
#
============================================================
--- packages/images/openmoko-image.bb baa68f491ce9ac84c3a47b7904190c6b594cb0ef
+++ packages/images/openmoko-image.bb 97b5722f7eef6ce6117016cc573067e30da5f2ee
@@ -26,3 +26,5 @@ LICENSE = MIT
inherit image
LICENSE = MIT
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
============================================================
--- packages/initscripts/initscripts-1.0/bootmisc.sh 04ee5c8267f42bb17d0b7465f613854b9f79b352
+++ packages/initscripts/initscripts-1.0/bootmisc.sh 43ecc46db9908042b08383318d0d5821022e2b74
@@ -62,10 +62,15 @@ fi
/sbin/ldconfig
#
-# Recover the time, if there is a time file
+# Recover the time, if there is a time file (first boot only)
+# If not, set system clock from hardware clock
#
if test -e /etc/timestamp
then
date -s `cat /etc/timestamp`
+ mv -f /etc/timestamp /etc/timestamp.done
+ /etc/init.d/hwclock.sh stop
+else
+ /etc/init.d/hwclock.sh start
fi
: exit 0
============================================================
--- packages/initscripts/initscripts-1.0/save-rtc.sh 353d869c5dce5dc015a458b99ee7526623ac136b
+++ packages/initscripts/initscripts-1.0/save-rtc.sh 9b1d470537af18827367537206420cc5f66f877e
@@ -1,16 +1,3 @@
#! /bin/sh
+#FIXME readd timestamp handling for systems where RTC doesn't survive a reboot
+/etc/init.d/hwclock stop
-#
-# Copyright Matthias Hentges <devel at hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: save-rtc.sh
-# Date: 03-Jul-06
-
-
-# Update the timestamp, if there is already one
-if test -e /etc/timestamp
-then
- echo "Will restore RCT from /etc/timestamp on next boot"
- echo "Delete that file to disable this feature."
- date +%2m%2d%2H%2M%Y > /etc/timestamp
-fi
============================================================
--- packages/initscripts/initscripts_1.0.bb 987f1ca2c2c0d5cd92451cb463f65beb68b9a89d
+++ packages/initscripts/initscripts_1.0.bb 6c15812e6872f15d45072ac63fb02065a0639077
@@ -1,10 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "SysV init scripts"
SECTION = "base"
PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r96"
+PR = "r97"
SRC_URI = "file://halt \
file://ramdisk \
@@ -30,7 +30,7 @@ SRC_URI = "file://halt \
file://device_table.txt \
file://populate-volatile.sh \
file://volatiles \
- file://save-rtc.sh"
+ file://save-rtc.sh"
SRC_URI_append_arm = " file://alignment.sh"
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 d37b0d7a88ff3c521069869b88eb1d365aceeffb
+++ packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 a4fce0d73552488787ac6ff3486cdf1c84546f65
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
#
# Logo configuration
#
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 b13800e54f61edf724b8c70fbf5b508ea11f79e9
+++ packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 e33e541e6f793d94d9fa783562429ff4ac0e7189
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
#
# Logo configuration
#
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
============================================================
--- packages/linux/linux-gta01.inc 7538e9a0489178797d787503f993d57517becf9c
+++ packages/linux/linux-gta01.inc 44323377f4017d36e02429fa4c056b0b73c70cdd
@@ -13,7 +13,8 @@ SRC_URI = "http://ftp.de.kernel.org/pub/
# source and patches
#
SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
- file://defconfig-${VANILLA_VERSION}-${MACHINE}"
+ file://defconfig-${VANILLA_VERSION}-${MACHINE} \
+ file://logo_linux_clut224.ppm"
S = "${WORKDIR}/linux-${VANILLA_VERSION}"
##############################################################
@@ -49,12 +50,13 @@ do_prepatch() {
module_autoload_s3cmci = "s3cmci"
do_prepatch() {
- mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
- rm -Rf patches .pc
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ mv patches patches.old
+ mv .pc .pc.old
}
do_configure() {
- #install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+ install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
if [ ! -e ${WORKDIR}/defconfig-${VANILLA_VERSION}-${MACHINE} ]; then
die "No default configuration for ${MACHINE} available."
============================================================
--- packages/linux/linux-gta01_2.6.21.5.bb e6db6ff2a3c5110427abc294b19a748b07070848
+++ packages/linux/linux-gta01_2.6.21.5.bb 42a58603d3240f81b7d74124c8ec6cdaa5255b22
@@ -1,10 +1,10 @@ MOKOR = "moko10"
require linux-gta01.inc
SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
MOKOR = "moko10"
-PR = "r2"
+PR = "r3"
VANILLA_VERSION = "2.6.21.5"
#
# mt diff -ra505ece6d3699f2da6fbe6590ac611befdcc5bdf -r2fe4b71bd46729f460c8f38c28f97d1d8ee53d84
#
#
#
# add_file "packages/gloox/gloox_0.8.9.bb"
# content [e5b148787da6c6b13fafd472ea9b51956b43c393]
#
# add_file "packages/gpephone/sms_1.1.bb"
# content [2b6bce548b02b1c85d10955304ab13d1e6f845b8]
#
============================================================
--- packages/gloox/gloox_0.8.9.bb e5b148787da6c6b13fafd472ea9b51956b43c393
+++ packages/gloox/gloox_0.8.9.bb e5b148787da6c6b13fafd472ea9b51956b43c393
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+DESCRIPTION = "full-featured Jabber/XMPP client library."
+SECTION = "networking"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "iksemel libidn gnutls"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gpephone/sms_1.1.bb 2b6bce548b02b1c85d10955304ab13d1e6f845b8
+++ packages/gpephone/sms_1.1.bb 2b6bce548b02b1c85d10955304ab13d1e6f845b8
@@ -0,0 +1,13 @@
+LICENSE = "LiPS"
+DESCRIPTION = "GSM Short message application"
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "gtk+ dbus-glib libmsgenabler libabenabler libiac libgpewidget libgpephone"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpephone autotools
+
+FILES_${PN} += "${datadir}/conf ${datadir}/graphic"
More information about the Openembedded-commits
mailing list