[oe-commits] org.oe.dev altboot: Do not show SD-Boot option on Poodle

[coredump commit]

altboot: Do not show SD-Boot option on Poodle

Author: coredump at openembedded.org
Branch: org.openembedded.dev
Revision: 87fdd2d36ae67f50ee78c7ecd82a94682bcfe372
ViewMTN: http://monotone.openembedded.org/revision.psp?id=87fdd2d36ae67f50ee78c7ecd82a94682bcfe372
Files:
1
packages/altboot/altboot_0.0.0.bb
packages/altboot/altboot_1.1.0-wip.bb
packages/altboot/files/altboot-menu/15-bootSD
packages/altboot/files/altboot-menu/20-bootCF
packages/altboot/files/altboot-menu/Advanced/40-bootNFS
packages/altboot/files/altboot-menu/Advanced/55-bin-sh
packages/altboot/files/init.altboot
packages/altboot/files/poodle/altboot-2.6.cfg
Diffs:

#
# mt diff -rb0bcbd55beec5b631675f4b12b59fcb5aa69b06f -r87fdd2d36ae67f50ee78c7ecd82a94682bcfe372
#
# 
# 
# patch "packages/altboot/altboot_0.0.0.bb"
#  from [398e773fb5000111968c7ca43f94f6ce19ecf612]
#    to [23de494f904ad306edceae0aef6345bfe14d54ac]
# 
# patch "packages/altboot/altboot_1.1.0-wip.bb"
#  from [cee50eb488f155d80701faa09b7801a4d945d6a4]
#    to [1cd091bd3798bc727aeeab9985e8a617e12b4c8b]
# 
# patch "packages/altboot/files/altboot-menu/15-bootSD"
#  from [1e48c06f0ca1d7a3e51bc848f89f847269990941]
#    to [57fc94f9c87d31b10157075dd1673adb2648e762]
# 
# patch "packages/altboot/files/altboot-menu/20-bootCF"
#  from [fba4031bed4c17451b0795f5ca6d0d1f8ce2d0f6]
#    to [93b3d6e3bf2447a4723c30d9e25fce243993f06b]
# 
# patch "packages/altboot/files/altboot-menu/Advanced/40-bootNFS"
#  from [5a3d353c548c4eebf27ac4ba741d679a6ddb893d]
#    to [ad985b3df5d4762eb1e2e653d019d7c2f991cfce]
# 
# patch "packages/altboot/files/altboot-menu/Advanced/55-bin-sh"
#  from [ab83a15b97c980fe2d91196711445c1cfc6bf840]
#    to [c0b00b8687d282eca3358a0606aa4ce7cb393a5f]
# 
# patch "packages/altboot/files/init.altboot"
#  from [a23050b1013cf1f2c704055cbb32f662c7143802]
#    to [b8a8771c97245572d898d467bc895edd3fe93496]
# 
# patch "packages/altboot/files/poodle/altboot-2.6.cfg"
#  from [429ea866800f635f7a2fe75a2d36f117ab77ed3e]
#    to [74cf0b9e6fad6052a6d2b92d8645f3e78ef7e53d]
# 
============================================================
--- packages/altboot/altboot_0.0.0.bb	398e773fb5000111968c7ca43f94f6ce19ecf612
+++ packages/altboot/altboot_0.0.0.bb	23de494f904ad306edceae0aef6345bfe14d54ac
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = "${PN}-conf"
 
 ######################################################################################
 
-PR = "r49"
+PR = "r50"
 
 ######################################################################################
 
============================================================
--- packages/altboot/altboot_1.1.0-wip.bb	cee50eb488f155d80701faa09b7801a4d945d6a4
+++ packages/altboot/altboot_1.1.0-wip.bb	1cd091bd3798bc727aeeab9985e8a617e12b4c8b
@@ -23,7 +23,7 @@ RDEPENDS_${PN}-conf = "${PN}"
 
 ######################################################################################
 
-WIP_DATE = "20061108"
+WIP_DATE = "20061120"
 PR = "${WIP_DATE}-r1"
 
 ######################################################################################
============================================================
--- packages/altboot/files/altboot-menu/15-bootSD	1e48c06f0ca1d7a3e51bc848f89f847269990941
+++ packages/altboot/files/altboot-menu/15-bootSD	57fc94f9c87d31b10157075dd1673adb2648e762
@@ -7,6 +7,8 @@ M_TITLE="Boot SD card"
 
 M_TITLE="Boot SD card"
 
+test "$DISABLE_SD_BOOT" = yes && exit 0
+
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
============================================================
--- packages/altboot/files/altboot-menu/20-bootCF	fba4031bed4c17451b0795f5ca6d0d1f8ce2d0f6
+++ packages/altboot/files/altboot-menu/20-bootCF	93b3d6e3bf2447a4723c30d9e25fce243993f06b
@@ -7,6 +7,8 @@ M_TITLE="Boot CF card"
 
 M_TITLE="Boot CF card"
 
+test "$DISABLE_CF_BOOT" = yes && exit 0
+
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
============================================================
--- packages/altboot/files/altboot-menu/Advanced/40-bootNFS	5a3d353c548c4eebf27ac4ba741d679a6ddb893d
+++ packages/altboot/files/altboot-menu/Advanced/40-bootNFS	ad985b3df5d4762eb1e2e653d019d7c2f991cfce
@@ -9,6 +9,8 @@ M_TITLE="Boot from NFS"
 
 M_TITLE="Boot from NFS"
 
+test "$DISABLE_NFS_BOOT" = yes && exit 0
+
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 
============================================================
--- packages/altboot/files/altboot-menu/Advanced/55-bin-sh	ab83a15b97c980fe2d91196711445c1cfc6bf840
+++ packages/altboot/files/altboot-menu/Advanced/55-bin-sh	c0b00b8687d282eca3358a0606aa4ce7cb393a5f
@@ -1,6 +1,7 @@ M_TITLE="init=/bin/sh"
 # !/bin/sh
 M_TITLE="init=/bin/sh"
 
+test "$DISABLE_BINSH_BOOT" = yes && exit 0
 
 run_module() {
 	
============================================================
--- packages/altboot/files/init.altboot	a23050b1013cf1f2c704055cbb32f662c7143802
+++ packages/altboot/files/init.altboot	b8a8771c97245572d898d467bc895edd3fe93496
@@ -95,7 +95,9 @@ show_menu() {
 	do	
 		if ! test -d "$1/$file"
 		then			
-			M_TITLE="`$1/$file title`"
+			# NOTE: It is important to use "." here so that the script inherits
+			# the shell environment / all set variables!						
+			M_TITLE="`. $1/$file title`"
 			FLAGS="`$1/$file flags`"
 			
 			if ! test -z "$M_TITLE"
============================================================
--- packages/altboot/files/poodle/altboot-2.6.cfg	429ea866800f635f7a2fe75a2d36f117ab77ed3e
+++ packages/altboot/files/poodle/altboot-2.6.cfg	74cf0b9e6fad6052a6d2b92d8645f3e78ef7e53d
@@ -1,5 +1,5 @@
 #
-# Altboot machine configuration for: Akita / Kernel 2.6
+# Altboot machine configuration for: Poodle / Kernel 2.6
 #
 
 # Handled by /sbin/init.altboot
@@ -10,7 +10,7 @@ SH_SHELL="/bin/sh"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 
-ENABLE_SOUND="yes"
+ENABLE_SOUND="no"
 
 IMAGE_PATH="boot-images"
 IMAGE_TYPE="ext2"
@@ -20,7 +20,7 @@ SD_KERNEL_MODULE=""
 SD_DEVICE="/dev/mmcblk0p1"
 SD_KERNEL_MODULE=""
 
-USB_HOST_AVAILABLE="no"
+USB_HOST_AVAILABLE="yes"
 USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod"
 USB_STORAGE_PARTITION="/dev/sda1"
 USB_STORAGE_WAIT="4"
@@ -39,3 +39,7 @@ CF_MOUNTPOINT="/media/cf"
 
 SD_MOUNTPOINT="/media/card"
 CF_MOUNTPOINT="/media/cf"
+
+# Poodle already boots off SD natively!
+DISABLE_SD_BOOT="yes"
+