packages/grub/grub_0.97.bb * Correct GRUB installation in destination directory ...

diff --git a/packages/grub/grub-0.97/menu.lst b/packages/grub/grub-0.97/menu.lst
new file mode 100644 (file)
index 0000000..510e8f8
--- /dev/null
+++ b/packages/grub/grub-0.97/menu.lst
@@ -0,0 +1,6 @@
+# menu.lst
+default 0
+timeout 5
+title   OpenEmbedded Linux (hda1)
+root    (hd0,0)
+kernel  /boot/bzImage root=/dev/hda1 ro 

diff --git a/packages/grub/grub_0.97.bb b/packages/grub/grub_0.97.bb
index 67fca24..ef37af1 100644 (file)
--- a/packages/grub/grub_0.97.bb
+++ b/packages/grub/grub_0.97.bb
@@ -1,12 +1,13 @@
-DESCRIPTION = "GRUB is the GRand Unified Bootloader"
+DESCRIPTION = "GRand Unified Bootloader"
 HOMEPAGE = "http://www.gnu.org/software/grub"
 SECTION = "bootloaders"
 PRIORITY = "optional"
 RDEPENDS = "diffutils"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
-           file://automake-1.10.patch;patch=1"
+           file://automake-1.10.patch;patch=1 \
+           file://menu.lst"
 
 inherit autotools
 
@@ -17,9 +18,12 @@ python __anonymous () {
         raise bb.parse.SkipPackage("incompatible with host %s" % host)
 }
 
-do_install_append_vmware() {
-       mkdir -p ${D}/boot/
-       ln -sf ../usr/lib/grub/{$TARGET_ARCH}{$TARGET_VENDOR}/ ${D}/boot/grub
+do_install_append() {
+        install -d ${D}/boot/
+       ln -sf ../usr/lib/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
+
+       # TODO: better use grub-set-default script here?
+       install -m 0644  ${WORKDIR}/menu.lst ${D}/boot/grub
 }
 
 FILES_${PN}-doc = "${datadir}"