From b83af04c15fa7e91faa3ecd2297937077c14a620 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 14 Aug 2007 18:13:17 +0000 Subject: initscripts: first steps towards working together with RTC TODO: might need more work for systems without a hardware clock --- packages/initscripts/initscripts-1.0/bootmisc.sh | 7 ++++++- packages/initscripts/initscripts-1.0/save-rtc.sh | 17 ++--------------- packages/initscripts/initscripts_1.0.bb | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh index 814dba676c..1c817fab5e 100755 --- a/packages/initscripts/initscripts-1.0/bootmisc.sh +++ b/packages/initscripts/initscripts-1.0/bootmisc.sh @@ -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 start +else + /etc/init.d/hwclock.sh stop fi : exit 0 diff --git a/packages/initscripts/initscripts-1.0/save-rtc.sh b/packages/initscripts/initscripts-1.0/save-rtc.sh index d06aa6d569..de7c2b7646 100644 --- a/packages/initscripts/initscripts-1.0/save-rtc.sh +++ b/packages/initscripts/initscripts-1.0/save-rtc.sh @@ -1,16 +1,3 @@ #! /bin/sh -# -# Copyright Matthias Hentges (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 +#FIXME readd timestamp handling for systems where RTC doesn't survive a reboot +/etc/init.d/hwclock stop diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 39b1eee9c1..aa30833895 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ 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" -- cgit v1.2.3 From 46fe6a7fc0eb3719ad5abcf94a08b17b5d563387 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 14 Aug 2007 18:16:07 +0000 Subject: openmoko-image: create /etc/timestamp during image construction to give a reasonably sane default time setting --- packages/images/openmoko-image.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 65158f679b..0dfd2166f0 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -26,3 +26,5 @@ RDEPENDS = "${PACKAGE_INSTALL}" inherit image LICENSE = MIT + +ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' -- cgit v1.2.3 From d9b1505ec5da5b68865acaca41e8584f9b149072 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 14 Aug 2007 23:00:04 +0000 Subject: linux-gta01: disable kernel logo completely (for now) --- packages/linux/linux-gta01.inc | 10 ++++++---- packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 | 4 ++-- packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 | 4 ++-- packages/linux/linux-gta01_2.6.21.5.bb | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc index 8554d2413c..11729553ab 100644 --- a/packages/linux/linux-gta01.inc +++ b/packages/linux/linux-gta01.inc @@ -13,7 +13,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-gta01" # 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 @@ module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" 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." diff --git a/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 index 16b2ac1dab..a8a4dc6aa7 100644 --- a/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 +++ b/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 @@ -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 diff --git a/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 index 90fc136986..a21b757a94 100644 --- a/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 +++ b/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 @@ -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 diff --git a/packages/linux/linux-gta01_2.6.21.5.bb b/packages/linux/linux-gta01_2.6.21.5.bb index 9463138cf0..a88076d152 100644 --- a/packages/linux/linux-gta01_2.6.21.5.bb +++ b/packages/linux/linux-gta01_2.6.21.5.bb @@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto= SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "r2" +PR = "r3" VANILLA_VERSION = "2.6.21.5" -- cgit v1.2.3 From 51d03d2fe5715230873099c85d8a99707ec3f80d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 14 Aug 2007 23:02:39 +0000 Subject: initscripts/bootmisc.sh: fix upsidedown logic w/ hwclock.sh --- packages/initscripts/initscripts-1.0/bootmisc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh index 1c817fab5e..799cdca12b 100755 --- a/packages/initscripts/initscripts-1.0/bootmisc.sh +++ b/packages/initscripts/initscripts-1.0/bootmisc.sh @@ -69,8 +69,8 @@ if test -e /etc/timestamp then date -s `cat /etc/timestamp` mv -f /etc/timestamp /etc/timestamp.done - /etc/init.d/hwclock.sh start -else /etc/init.d/hwclock.sh stop +else + /etc/init.d/hwclock.sh start fi : exit 0 -- cgit v1.2.3