[oe-commits] org.oe.dev kexecboot-initramfs: wait some seconds before startup

[thesing commit]

kexecboot-initramfs: wait some seconds before startup
linux-kexecboot: remove debug output
kexecboot: pass rootdelay to all kernels

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 59560bb699e5c53442482270321f0392e8772228
ViewMTN: http://monotone.openembedded.org/revision/info/59560bb699e5c53442482270321f0392e8772228
Files:
1
packages/kexecboot/initramfs-kexecboot-image.bb
packages/kexecboot/initramfs-kexecboot_1.0.bb
packages/kexecboot/kexecboot_0.3.bb
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie
packages/kexecboot/linux-kexecboot_2.6.26.bb
Diffs:

#
# mt diff -rdf379835be88c87afe28ebc4ac3ec609317fc047 -r59560bb699e5c53442482270321f0392e8772228
#
#
#
# patch "packages/kexecboot/initramfs-kexecboot-image.bb"
#  from [49a37389a0b8c994692be3e879add614ff95ceff]
#    to [73e4f04db5777fdeaca9c8f23d6c269d574e1012]
# 
# patch "packages/kexecboot/initramfs-kexecboot_1.0.bb"
#  from [824b48b2024b712c5c2be285049697318d6dc372]
#    to [d3cfea5e56d92934495f6342d176e974b5c9baf3]
# 
# patch "packages/kexecboot/kexecboot_0.3.bb"
#  from [0ca1d7664f36aed1936462e2c084e6fb1fcfcece]
#    to [549463678e80781a4efa57e3c566d8668953cb08]
# 
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie"
#  from [89b2f472fb93e5c5cc06598c758a90308c3c0106]
#    to [89887186a0de9fe4ac9fad235b3f52a56a8524f6]
# 
# patch "packages/kexecboot/linux-kexecboot_2.6.26.bb"
#  from [287d3bbbebb212c90ad5294bbd7bf094aa17bed4]
#    to [c81d28c54ee3911d010f1fe10568274d5cba04ca]
#
============================================================
--- packages/kexecboot/initramfs-kexecboot-image.bb	49a37389a0b8c994692be3e879add614ff95ceff
+++ packages/kexecboot/initramfs-kexecboot-image.bb	73e4f04db5777fdeaca9c8f23d6c269d574e1012
@@ -5,5 +5,5 @@ export IMAGE_BASENAME = "initramfs-kexec
 
 export IMAGE_BASENAME = "initramfs-kexecboot-image"
 
-IMAGE_INSTALL = "klibc-utils-static-sh klibc-utils-static-mount kexec-static initramfs-kexecboot"
+IMAGE_INSTALL = "initramfs-kexecboot"
 IMAGE_LINGUAS = ""
============================================================
--- packages/kexecboot/initramfs-kexecboot_1.0.bb	824b48b2024b712c5c2be285049697318d6dc372
+++ packages/kexecboot/initramfs-kexecboot_1.0.bb	d3cfea5e56d92934495f6342d176e974b5c9baf3
@@ -1,11 +1,18 @@ DESCRIPTON = "A init script that mounts 
 DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-PR = "r6"
-RDEPENDS = "kexecboot"
+PR = "r7"
+RDEPENDS = "kexecboot klibc-utils-static-mount klibc-utils-static-sh klibc-utils-static-sleep"
+
+FBANGLE = "270"
+INPUTDEV = "/dev/event0"
+
+
 do_compile() {
         cat > init.sh << EOF
 #!/bin/sh
+/bin/sleep 3
 /bin/mount -t proc proc /proc
-/usr/bin/kexecboot -a 270 -i /dev/event0
+echo "0 4 1 7" > /proc/sys/kernel/printk
+/usr/bin/kexecboot -a ${FBANGLE} -i ${INPUTDEV}
 EOF
 }
 
============================================================
--- packages/kexecboot/kexecboot_0.3.bb	0ca1d7664f36aed1936462e2c084e6fb1fcfcece
+++ packages/kexecboot/kexecboot_0.3.bb	549463678e80781a4efa57e3c566d8668953cb08
@@ -1,12 +1,14 @@ LICENSE = "GPL"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 DEPENDS = "klibc"
+RDEPENDS = "kexec-static"
 inherit autotools
 
 # You can create your own *-img.h by doing
 # ./make-image-header.sh <file>.png HAND
 
-SRC_URI = "http://projects.linuxtogo.org/frs/download.php/221/kexecboot-${PV}.tar.gz"
+SRC_URI = "http://projects.linuxtogo.org/frs/download.php/221/kexecboot-${PV}.tar.gz \
+	   file://rootdelay.patch;patch=1"
 S = "${WORKDIR}/kexecboot-${PV}"
 
 
============================================================
--- packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie	89b2f472fb93e5c5cc06598c758a90308c3c0106
+++ packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie	89887186a0de9fe4ac9fad235b3f52a56a8524f6
@@ -251,7 +251,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable"
+CONFIG_CMDLINE="console=ttySA0,115200n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -398,7 +398,7 @@ CONFIG_BLK_DEV_IDE=y
 # Please see Documentation/ide/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDEDISK is not set
+CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECS=y
 # CONFIG_BLK_DEV_IDECD is not set
============================================================
--- packages/kexecboot/linux-kexecboot_2.6.26.bb	287d3bbbebb212c90ad5294bbd7bf094aa17bed4
+++ packages/kexecboot/linux-kexecboot_2.6.26.bb	c81d28c54ee3911d010f1fe10568274d5cba04ca
@@ -1,7 +1,6 @@ require linux-kexecboot.inc
 require linux-kexecboot.inc
 
-PR = "r1"
-FILESDIR = "linux-rp_${PV}"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"