[oe-commits] org.oe.dev altboot: Allow for multiple machines using the same source config directories.

[rwhitby commit]

altboot: Allow for multiple machines using the same source config directories.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0d8cf148e5590ee21f1255acd02ccacdc3ca01f3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0d8cf148e5590ee21f1255acd02ccacdc3ca01f3
Files:
1
packages/altboot/altboot_1.1.1+wip-SVNR25.bb
packages/altboot/altboot_svn.bb
Diffs:

#
# mt diff -r1a74ce539f71c0ed9a0415b7e1af2d5f8f151508 -r0d8cf148e5590ee21f1255acd02ccacdc3ca01f3
#
# 
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR25.bb"
#  from [56371fac0cda6550b1c8dfdeaadeb334b13ef80b]
#    to [50c12dba8ece029d26149ec5dc18e16065b94ea3]
# 
# patch "packages/altboot/altboot_svn.bb"
#  from [323fdcf97a0124b992b588db7035f55643a7842f]
#    to [74f54f8841b2eac5380207f82a621d58e65f6d4a]
# 
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR25.bb	56371fac0cda6550b1c8dfdeaadeb334b13ef80b
+++ packages/altboot/altboot_1.1.1+wip-SVNR25.bb	50c12dba8ece029d26149ec5dc18e16065b94ea3
@@ -24,7 +24,7 @@ SVN_REV = "25"
 ######################################################################################
 
 SVN_REV = "25"
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
@@ -44,6 +44,9 @@ 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
@@ -52,9 +55,9 @@ do_install() {
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
 
-	if test -d ${S}/${MACHINE}
+	if test -d ${S}/${MACHINE_DIR}
 	then
-		install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
 	else
 		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
 	fi
@@ -68,13 +71,13 @@ do_install() {
 	
 	ln -s /sbin/init.altboot ${D}/sbin/altboot
 
-	if test -d ${S}/${MACHINE}/altboot-menu
+	if test -d ${S}/${MACHINE_DIR}/altboot-menu
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
 		
-		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
+		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
 		then
-			install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${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
@@ -85,10 +88,10 @@ do_install() {
 		fi
 	fi
 	
-	if test -d ${S}/${MACHINE}/altboot.rc
+	if test -d ${S}/${MACHINE_DIR}/altboot.rc
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc	
+		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
============================================================
--- packages/altboot/altboot_svn.bb	323fdcf97a0124b992b588db7035f55643a7842f
+++ packages/altboot/altboot_svn.bb	74f54f8841b2eac5380207f82a621d58e65f6d4a
@@ -24,7 +24,7 @@ PV = "1.1.1+wip-${SRCDATE}"
 ######################################################################################
 
 PV = "1.1.1+wip-${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
@@ -44,6 +44,9 @@ 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
@@ -52,9 +55,9 @@ do_install() {
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
 
-	if test -d ${S}/${MACHINE}
+	if test -d ${S}/${MACHINE_DIR}
 	then
-		install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
 	else
 		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
 	fi
@@ -68,13 +71,13 @@ do_install() {
 	
 	ln -s /sbin/init.altboot ${D}/sbin/altboot
 
-	if test -d ${S}/${MACHINE}/altboot-menu
+	if test -d ${S}/${MACHINE_DIR}/altboot-menu
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
 		
-		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
+		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
 		then
-			install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${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
@@ -85,10 +88,10 @@ do_install() {
 		fi
 	fi
 	
-	if test -d ${S}/${MACHINE}/altboot.rc
+	if test -d ${S}/${MACHINE_DIR}/altboot.rc
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc	
+		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