Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/15 17:18:15+00:00 rpsys.net!RP
openzaurus-2.6: corgi: fix backlight race, update mmc/sd support, start led support

2005/01/15 17:38:34+01:00 vanille.de!mickeyl
add init progress reporting capabilities to rcS. to get progress reporting, apply the elpp patch to your kernel and set VERBOSE=progress in /etc/default/rcS.

BKrev: 41e96388xiGAOrYA-5Qo4SaYygQwkA

3 files changed, 227 insertions, 3 deletions

diff --git a/packages/linux/openzaurus_2.6.11-rc1.bb b/packages/linux/openzaurus_2.6.11-rc1.bb
index e69de29bb2..967d46e48e 100644
--- a/packages/linux/openzaurus_2.6.11-rc1.bb
+++ b/packages/linux/openzaurus_2.6.11-rc1.bb
@@ -0,0 +1,127 @@
+DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices."
+SECTION = "kernel"
+MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
+LICENSE = "GPL"
+#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
+KV = "${@bb.data.getVar('PV',d,True)}"
+PR = "r1"
+
+# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
+# http://www.cs.wisc.edu/~lenz/zaurus/
+# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
+
+# Poodle is broken until JL rediffs against the latest patches
+#http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_base.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
+           file://add-oz-release-string.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-linking-bug.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-cpu.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_pm.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_devices.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_kbd.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_lcd.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/collie_uart.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/collie_batswitch.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/collie_pcmcia.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/sharp_mtd.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/fb_blank_fix-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/arm_scoop_update-r1.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_ssp-r10.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/collie_scoop-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/collie_scoop_pcmcia-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/sharpsl_pcmcia-r3.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/w100-r17.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/class_backlight-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_ssp_extra-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras-r4.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r8.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r9.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r3.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_power-r6.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/ide_fixes-r1.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_mmc-r3.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/mmc_sd-r2.patch;patch=1 \
+file://defconfig-husky \
+file://defconfig-collie \
+file://defconfig-poodle \
+file://defconfig-openzaurus-pxa-2.6 "
+
+SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
+SRC_URI_append_openzaurus-pxa-2.6 = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
+SRC_URI_append_collie = "http://www.rpsys.net/openzaurus/${KV}/jl1/collie_keymap.patch;patch=1"	   
+
+
+S = "${WORKDIR}/linux-${KV}"
+
+inherit kernel
+
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1 
+
+EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
+COMPATIBLE_HOST = "arm.*-linux"
+
+#
+# Create the kernel command line. 
+#
+#CMDLINE_MTDPARTS_poodle   = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home)"
+#CMDLINE_MTDPARTS_corgi    = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)"
+#CMDLINE_MTDPARTS_shepherd = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)"
+#CMDLINE_MTDPARTS_husky    = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)"
+#CMDLINE_MTDPARTS_tosa     = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2"
+
+#CMDLINE_MEM_husky		= "mem=64M"
+
+CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd"
+CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
+
+# configure memory/ramdisk split on collie
+export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
+export rd  = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
+
+CMDLINE_MEM_collie = "mem=${mem}M"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MTDPARTS} ${CMDLINE_MEM}"
+
+do_configure() {
+    
+    install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+
+    if [ "${MACHINE}" == "collie" ] 
+    then
+		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
+		rdsize=`echo "$rd * 1024" | bc`
+		total=`expr $mem + $rd`
+		addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
+	 	if [ "$rd" == "0" ]
+	 	then
+		    echo "No RAMDISK"
+			echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
+		else
+		    echo "RAMDIR = $rdsize on $addr"
+			echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
+			echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
+		fi
+		
+	fi
+	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+    yes '' | oe_runmake oldconfig
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/packages/sysvinit/sysvinit/rcS b/packages/sysvinit/sysvinit/rcS
index e69de29bb2..c011b0d4f4 100644
--- a/packages/sysvinit/sysvinit/rcS
+++ b/packages/sysvinit/sysvinit/rcS
@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+# rcS		Call all S??* scripts in /etc/rcS.d in
+#		numerical/alphabetical order.
+#
+# Version:	@(#)/etc/init.d/rcS  2.76  19-Apr-1999  miquels@cistron.nl
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+runlevel=S
+prevlevel=N
+umask 022
+export PATH runlevel prevlevel
+
+#
+#	See if system needs to be setup. This is ONLY meant to
+#	be used for the initial setup after a fresh installation!
+#
+if [ -x /sbin/unconfigured.sh ]
+then
+  /sbin/unconfigured.sh
+fi
+
+#
+#	Source defaults.
+#
+. /etc/default/rcS
+
+#
+#	Trap CTRL-C &c only in this shell so we can interrupt subprocesses.
+#
+trap ":" INT QUIT TSTP
+
+#
+#	Do we have /proc/progress and want to have a progress display?
+#	If so, calculate the number of scripts and the increasing step
+#
+if [ "$VERBOSE" = progress ]; then
+	mount /proc
+	if [ ! -e /proc/progress ]; then
+		echo "INIT: VERBOSE=progress requested, but /proc/progress not available."
+		echo "INIT: Falling back to VERBOSE=no"
+		VERBOSE=no
+	else
+		set `ls -1 /etc/rc$runlevel.d/S* | wc`
+		numscripts=$1
+		PROGRESS_incstep=`expr 70 / $1`
+		PROGRESS_value=30
+		export PROGRESS_value PROGRESS_incstep
+	fi
+fi
+export VERBOSE
+
+#
+#	Call all parts in order.
+#
+for i in /etc/rcS.d/S??*
+do
+	# Ignore dangling symlinks for now.
+	[ ! -f "$i" ] && continue
+
+	# Handle verbosity
+	[ "$VERBOSE" = very ] && echo "INIT: Running $i..."
+	if [ "$VERBOSE" = progress ]; then
+		export PROGRESS_value=`expr $PROGRESS_value + $PROGRESS_incstep`
+		echo "$PROGRESS_value Starting $i..." >/proc/progress
+	fi
+	
+	case "$i" in
+		*.sh)
+			# Source shell script for speed.
+			(
+				trap - INT QUIT TSTP
+				set start
+				. $i
+			)
+			;;
+		*)
+			# No sh extension, so fork subprocess.
+			$i start
+			;;
+	esac
+done
+
+#
+#	For compatibility, run the files in /etc/rc.boot too.
+#
+[ -d /etc/rc.boot ] && run-parts /etc/rc.boot
+
+#
+#	Finish setup if needed. The comment above about
+#	/sbin/unconfigured.sh applies here as well!
+#
+if [ -x /sbin/setup.sh ]
+then
+  /sbin/setup.sh
+fi
+
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 2131e3c41e..12b16eda56 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -1,10 +1,9 @@
-SECTION = "base"
 DESCRIPTION = "System-V like init."
+SECTION = "base"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-
-PR = "r5"
+PR = "r7"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.