altboot: Unb0rk do_install and SVN path of all altboot .bb's. You'll probably have...

diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb
index 15850e5..094a6de 100644 (file)
--- a/packages/altboot/altboot_1.0.5.bb
+++ b/packages/altboot/altboot_1.0.5.bb
@@ -12,7 +12,7 @@ LICENSE = "GPL"
 
 ######################################################################################
 
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
@@ -20,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
 
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn"
+SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn"
 
 S = "${WORKDIR}/${TAG}/"
 
@@ -33,7 +33,7 @@ do_install() {
        install -d ${D}/etc/altboot.rc
        install -d ${D}/usr/share/doc/altboot
 
-       if test -d ${WORKDIR}/altboot/${MACHINE}
+       if test -d ${S}/${MACHINE}
        then
                install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc
        else

diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index 9544e6b..16dace6 100644 (file)
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -22,7 +22,7 @@ RDEPENDS_${PN}-conf = "${PN}"
 
 ######################################################################################
 
-PR = "r1"
+PR = "r2"
 
 ######################################################################################
 
@@ -34,7 +34,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
 
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn"
+SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn"
 
 S = "${WORKDIR}/${TAG}/"
 

diff --git a/packages/altboot/altboot_1.1.1+wip-20061123.bb b/packages/altboot/altboot_1.1.1+wip-20061123.bb
index bc96c67..1745273 100644 (file)
--- a/packages/altboot/altboot_1.1.1+wip-20061123.bb
+++ b/packages/altboot/altboot_1.1.1+wip-20061123.bb
@@ -26,7 +26,7 @@ RDEPENDS_${PN}-conf = "${PN}"
 WIP_DATE = "20061123"
 
 PV = "1.1.1+wip-${WIP_DATE}"
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
@@ -38,7 +38,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}"
 
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2"
+SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};rev=2"
 
 S = "${WORKDIR}/${TAG}/"
 

diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb
deleted file mode 100644 (file)
index b3ccb70..0000000
--- a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb
+++ /dev/null
@@ -1,124 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: MIT (see COPYING.MIT)
-#
-# Filename: altboot_1.0.5-rc2.bb
-# Date: 21-Feb-06
-
-DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL" 
-
-######################################################################################
-
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
-RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
-
-RDEPENDS_${PN} = "${PN}-conf"
-RDEPENDS_${PN}-conf = "${PN}"
-
-######################################################################################
-
-SVN_REV = "30"
-PR = "r1"
-
-######################################################################################
-
-PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-
-PACKAGE_ARCH_${PN} = "${MACHINE}"
-PACKAGE_ARCH_${PN}-doc = "all"
-PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-
-SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
-
-S = "${WORKDIR}/trunk/"
-
-######################################################################################
-
-FILES_${PN}-conf = "/etc/altboot*cfg"
-
-######################################################################################
-
-MACHINE_DIR = "${MACHINE}"
-MACHINE_DIR_nslu2be = "nslu2le"
-
-do_install() {
-       install -d ${D}/sbin
-       install -d ${D}/etc/altboot-menu        
-       install -d ${D}/etc/altboot.rc
-       install -d ${D}/usr/share/doc/altboot
-       install -d ${D}/usr/share/sounds
-
-       if test -d ${S}/${MACHINE_DIR}
-       then
-               install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
-       else
-               install -m 0644 ${S}/altboot*.cfg ${D}/etc/
-       fi
-
-       install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
-       install -m 0644 ${S}/altboot.func ${D}/etc
-       install -m 0644 ${S}/altboot.sbin ${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
-       
-       ln -s /sbin/init.altboot ${D}/sbin/altboot
-
-       if test -d ${S}/${MACHINE_DIR}/altboot-menu
-       then
-               install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
-               
-               if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
-               then
-                       install -d ${D}/etc/altboot-menu/Advanced
-                       install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-               fi
-       else
-               install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
-               if test -d ${S}/altboot-menu/Advanced
-               then            
-                       install -d ${D}/etc/altboot-menu/Advanced
-                       install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-               fi
-       fi
-       
-       if test -d ${S}/${MACHINE_DIR}/altboot.rc
-       then
-               install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
-               install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc        
-       else
-               install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
-               install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
-       fi
-}
-
-######################################################################################
-
-do_configure() {
-       cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
-       mv ${S}/init.altboot_ ${S}/init.altboot
-}
-
-######################################################################################
-
-pkg_postinst_${PN}() {
-       test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
-       
-       update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-######################################################################################
-
-pkg_postrm_${PN}() {
-       test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
-       
-       update-alternatives --remove init /sbin/init.altboot
-}
-

diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR43.bb b/packages/altboot/altboot_1.1.1+wip-SVNR43.bb
new file mode 100644 (file)
index 0000000..93056c3
--- /dev/null
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR43.bb
@@ -0,0 +1,124 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: MIT (see COPYING.MIT)
+#
+# Filename: altboot_1.0.5-rc2.bb
+# Date: 21-Feb-06
+
+DESCRIPTION = "The altboot bootmanager"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL" 
+
+######################################################################################
+
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_${PN}_append_akita = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
+
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
+
+######################################################################################
+
+SVN_REV = "43"
+PR = "r0"
+
+######################################################################################
+
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = "${MACHINE}"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+
+SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
+
+S = "${WORKDIR}/trunk/"
+
+######################################################################################
+
+FILES_${PN}-conf = "/etc/altboot*cfg"
+
+######################################################################################
+
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
+
+do_install() {
+       install -d ${D}/sbin
+       install -d ${D}/etc/altboot-menu        
+       install -d ${D}/etc/altboot.rc
+       install -d ${D}/usr/share/doc/altboot
+       install -d ${D}/usr/share/sounds
+
+       if test -d ${S}/${MACHINE_DIR}
+       then
+               install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
+       else
+               install -m 0644 ${S}/altboot*.cfg ${D}/etc/
+       fi
+
+       install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+       install -m 0644 ${S}/altboot.func ${D}/etc
+       install -m 0644 ${S}/altboot.sbin ${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
+       
+       ln -s /sbin/init.altboot ${D}/sbin/altboot
+
+       if test -d ${S}/${MACHINE_DIR}/altboot-menu
+       then
+               install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
+               
+               if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
+               then
+                       install -d ${D}/etc/altboot-menu/Advanced
+                       install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+               fi
+       else
+               install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+               if test -d ${S}/altboot-menu/Advanced
+               then            
+                       install -d ${D}/etc/altboot-menu/Advanced
+                       install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+               fi
+       fi
+       
+       if test -d ${S}/${MACHINE_DIR}/altboot.rc
+       then
+               install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
+               install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc        
+       else
+               install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+               install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+       fi
+}
+
+######################################################################################
+
+do_configure() {
+       cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
+       mv ${S}/init.altboot_ ${S}/init.altboot
+}
+
+######################################################################################
+
+pkg_postinst_${PN}() {
+       test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
+       
+       update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+######################################################################################
+
+pkg_postrm_${PN}() {
+       test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
+       
+       update-alternatives --remove init /sbin/init.altboot
+}
+