diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-03-30 23:29:22 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-03-30 23:29:22 +0000 |
| commit | 2f521a7ff7daacc63bfe2b477e09888dbd544311 (patch) | |
| tree | 24f3fc35ee411a861ce9a1107c9039b0a527bd87 | |
| parent | 0159d92a1de8f5e915c7d0a4f54aec6eb6d9a174 (diff) | |
altboot: Allow for multiple machines using the same source config directories.
| -rw-r--r-- | packages/altboot/altboot_1.1.1+wip-SVNR25.bb | 23 | ||||
| -rw-r--r-- | packages/altboot/altboot_svn.bb | 23 |
2 files changed, 26 insertions, 20 deletions
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb index af15f64508..e806604616 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### 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 diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index d753273fdf..18f73dd6ae 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### 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 |