altboot: - CVS -> SVN

- Fix do_install() and do_configure to use  instead of fixed path

4 files changed, 46 insertions, 93 deletions

diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb
index 2762001dbd..f70edc19b6 100644
--- a/packages/altboot/altboot_1.0.5.bb
+++ b/packages/altboot/altboot_1.0.5.bb
@@ -20,9 +20,9 @@ PACKAGE_ARCH = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
 
-SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
+SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=4"
 
-S = "${WORKDIR}/altboot/"
+S = "${WORKDIR}/${TAG}/"
 
 ######################################################################################
 
@@ -35,37 +35,37 @@ do_install() {
 
 	if test -d ${WORKDIR}/altboot/${MACHINE}
 	then
-		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
+		install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc
 	else
-		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
+		install -m 0644 ${S}/altboot*.cfg ${D}/etc
 	fi
 
-	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
-	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
+	install -m 0644 ${S}/altboot.func ${D}/etc
+	install -m 0755 ${S}/init.altboot ${D}/sbin
 
-	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/
+	if test -d ${S}/${MACHINE}/altboot-menu/
 	then
-		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
 	else
-		install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
+		install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
 	fi
 
-	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/
+	if test -d ${S}/${MACHINE}/altboot-menu/Advanced/
 	then
-		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
 	else
-		install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
 	fi
 
-	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc
+	install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+	install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
 }
 
 ######################################################################################
 
 do_configure() {
-	cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_
-	mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot
+	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_
+	mv ${S}/init.altboot_ ${S}/init.altboot
 }
 
 ######################################################################################
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index c52c0972a3..a83d2b5d16 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -34,9 +34,9 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
 
-SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
+SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2"
 
-S = "${WORKDIR}/altboot/"
+S = "${WORKDIR}/${TAG}/"
 
 ######################################################################################
 
@@ -52,30 +52,30 @@ do_install() {
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
 
-	if test -d ${WORKDIR}/altboot/${MACHINE}
+	if test -d ${S}/${MACHINE}
 	then
-		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
+		install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc
 	else
-		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
+		install -m 0644 ${S}/altboot*.cfg ${D}/etc
 	fi
 
-	install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
-	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
-	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
+	install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+	install -m 0644 ${S}/altboot.func ${D}/etc
+	install -m 0755 ${S}/init.altboot ${D}/sbin
 
-	install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
+	install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
 
-	install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+	install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
 
-	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc
+	install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+	install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
 }
 
 ######################################################################################
 
 do_configure() {
-	cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_
-	mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot
+	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_
+	mv ${S}/init.altboot_ ${S}/init.altboot
 }
 
 ######################################################################################
diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb
index 2de4c812b9..d857e5b454 100644
--- a/packages/altboot/altboot_wip.bb
+++ b/packages/altboot/altboot_wip.bb
@@ -38,9 +38,9 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}"
 
-SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
+SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2"
 
-S = "${WORKDIR}/altboot/"
+S = "${WORKDIR}/${TAG}/"
 
 ######################################################################################
 
@@ -57,32 +57,32 @@ do_install() {
 	install -d ${D}/usr/share/sounds
 	install -d ${D}/etc/skel/altboot
 
-	if test -d ${WORKDIR}/altboot/${MACHINE}
+	if test -d ${S}/${MACHINE}
 	then
-		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc/
+		install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
 	else
-		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc/
+		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
 	fi
 
-	install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
-	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
-	install -m 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc
-	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
-	install -m 0755 ${WORKDIR}/altboot/altbootctl ${D}/sbin
+	install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+	install -m 0644 ${S}/altboot.func ${D}/etc
+	install -m 0644 ${S}/altbootctl.conf ${D}/etc
+	install -m 0755 ${S}/init.altboot ${D}/sbin
+	install -m 0755 ${S}/altbootctl ${D}/sbin
 
-	install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
+	install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
 
-	install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+	install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
 
-	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc
+	install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+	install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
 }
 
 ######################################################################################
 
 do_configure() {
-	cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${WORKDIR}/altboot/init.altboot_
-	mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot
+	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
+	mv ${S}/init.altboot_ ${S}/init.altboot
 }
 
 ######################################################################################
diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick
deleted file mode 100644
index b573e7a10c..0000000000
--- a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick
+++ /dev/null
@@ -1,47 +0,0 @@
-# !/bin/sh
-#
-# Copyright Matthias Hentges (c) 2005
-#
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL)
-
-
-M_TITLE="Boot USB Storage"
-
-test "$USB_HOST_AVAILABLE" = "yes" || exit 0
-       
-# This function is activated by init.altboot by calling this script with the "run" option
-run_module() {
-	
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
-	
-	# Mount /proc, etc
-	init_rootfs
-
-	echo "Starting USB..."
-	
-	for module in $USB_STORAGE_MODULES
-	do
-		echo -en "\t - $module: "
-		modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]"
-	done
-		
-	echo -n "Mounting $USB_STORAGE_PARTITION..."  >/dev/tty0
-	
-	mkdir -p /media/usb-storage >/dev/null 2>&1
-	
-	sleep "$USB_STORAGE_WAIT"
-	
-	/bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok  >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed"
-		
-	echo ""	
-	
-	# Check for a real fs and loop-images.
-	check_target "/media/usb-storage" >/dev/tty0		
-}
-
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module "$2";;
-esac
-