Remove grub2 to oe-core and make BSPs use it [v2]

deleted file mode 100755
index 30dad39..0000000
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec tail -n +3 $0
-# This file provides an easy way to add custom menu entries.  Simply type the
-# menu entries you want to add after this comment.  Be careful not to change
-# the 'exec tail' line above.
-menuentry "Yocto Linux" {
-    set root=(hd0,1)
-    linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet
-}

52 lines not on this page · raw message

deleted file mode 100644
index ac96419..0000000
@@ -1,13 +0,0 @@
-Index: grub-1.98/util/grub-install.in
-===================================================================
---- grub-1.98.orig/util/grub-install.in	2011-01-25 23:47:05.587521825 -0600
-+++ grub-1.98/util/grub-install.in	2011-01-25 23:47:23.867521822 -0600
-@@ -306,7 +306,7 @@
- 
- if [ "x${devabstraction_module}" = "x" ] ; then
-     if [ x"${install_device}" != x ]; then
--      if echo "${install_device}" | grep -qx "(.*)" ; then
-+      if echo "${install_device}" | grep -q "(.*)" ; then
-         install_drive="${install_device}"
-       else
-         install_drive="`$grub_probe --target=drive --device ${install_device}`"

deleted file mode 100644
index 67af594..0000000
@@ -1,31 +0,0 @@
-Index: grub-1.98/loader/i386/bsdXX.c
-===================================================================
---- grub-1.98.orig/loader/i386/bsdXX.c	2011-01-25 00:12:14.967535179 -0600
-+++ grub-1.98/loader/i386/bsdXX.c	2011-01-25 00:13:16.387535169 -0600
-@@ -80,7 +80,7 @@
- {
-   Elf_Ehdr e;
-   Elf_Shdr *s;
--  char *shdr;
-+  char *shdr = NULL;
-   grub_addr_t curload, module;
-   grub_err_t err;
- 
-@@ -148,7 +148,7 @@
- {
-   Elf_Ehdr e;
-   Elf_Shdr *s;
--  char *shdr;
-+  char *shdr = NULL;
-   grub_addr_t curload, module;
-   grub_err_t err;
- 
-@@ -223,7 +223,7 @@
-   grub_err_t err;
-   Elf_Ehdr e;
-   Elf_Shdr *s;
--  char *shdr;
-+  char *shdr = NULL;
-   unsigned symoff, stroff, symsize, strsize;
-   grub_addr_t curload;
-   grub_freebsd_addr_t symstart, symend, symentsize, dynamic;

46 lines not on this page · raw message

index 30c575a..c668f4a 100644
@@ -34,3 +34,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"

index 96dc784..457bdfc 100644
@@ -38,3 +38,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"

index de6794e..39930a0 100644
@@ -34,3 +34,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+

index 0cee5d0..2fe78e8 100644
@@ -34,3 +34,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+

index a871529..b02e037 100644
@@ -34,3 +34,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"

index 4b81fab..eab4b50 100644
@@ -37,3 +37,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+

index 3013fe4..9fdb968 100644
@@ -36,5 +36,4 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-PREFERRED_VERSION_grub ?= "1.98"
 

index c0ff0cf..79970d1 100644
@@ -37,3 +37,6 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
 ROOTLESS_X = "1"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+

index ea8d98a..6277e20 100644
@@ -38,5 +38,3 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
-PREFERRED_VERSION_grub ?= "1.98"

deleted file mode 100644
index 7d80190..0000000
@@ -1,188 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (C) 2008 Intel
-#
-# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
-#
-
-# We need 20 Mb for the boot partition
-boot_size=20
-
-# 5% for the swap
-swap_ratio=5
-
-found="no"
-
-echo "Searching for a hard drive..."
-for device in 'hda' 'hdb' 'sda' 'sdb'
-  do
-  if [ -e /sys/block/${device}/removable ]; then
-      if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then
-	  found="yes"
-
-	  while true; do
-	      echo "Found drive at /dev/${device}. Do you want to install poky there ? [y/n]"
-	      read answer
-	      if [ "$answer" = "y" ] ; then
-		  break
-	      fi
-	  
-	      if [ "$answer" = "n" ] ; then
-		  found=no
-		  break
-	      fi
-
-	      echo "Please answer by y or n"
-	  done
-      fi
-  fi
-
-  if [ "$found" = "yes" ]; then
-      break;
-  fi
-
-done
-
-if [ "$found" = "no" ]; then
-      exit 1      
-fi
-
-echo "Installing image on /dev/${device}"
-
-#
-# The udev automounter can cause pain here, kill it
-#
-rm -f /etc/udev/scripts/mount*
-
-#
-# Unmount anything the automounter had mounted
-#
-umount /dev/${device} 2> /dev/null || /bin/true
-umount /dev/${device}1 2> /dev/null || /bin/true
-umount /dev/${device}2 2> /dev/null || /bin/true
-umount /dev/${device}3 2> /dev/null || /bin/true
-umount /dev/${device}4 2> /dev/null || /bin/true
-umount /dev/${device}5 2> /dev/null || /bin/true
-umount /dev/${device}6 2> /dev/null || /bin/true
-
-if [ ! -b /dev/sda ] ; then
-    mknod /dev/sda b 8 0
-fi
-
-if [ ! -b /dev/sdb ] ; then
-    mknod /dev/sdb b 8 16
-fi
-
-if [ ! -b /dev/loop0 ] ; then
-    mknod /dev/loop0 b 7 0
-fi
-
-mkdir -p /tmp
-cat /proc/mounts > /etc/mtab
-
-disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//")
-
-swap_size=$((disk_size*5/100))
-rootfs_size=$((disk_size-boot_size-swap_size))
-
-rootfs_start=$((boot_size + 1))
-rootfs_end=$((rootfs_start+rootfs_size))
-swap_start=$((rootfs_end+1))
-
-bootfs=/dev/${device}1
-rootfs=/dev/${device}2
-swap=/dev/${device}3
-
-echo "*****************"
-echo "Boot partition size:   $boot_size MB (/dev/${device}1)"
-echo "Rootfs partition size: $rootfs_size MB (/dev/${device}2)"
-echo "Swap partition size:   $swap_size MB (/dev/${device}3)"
-echo "*****************"
-echo "Deleting partition table on /dev/${device} ..."
-dd if=/dev/zero of=/dev/${device} bs=512 count=2
-
-echo "Creating new partition table on /dev/${device} ..."
-parted /dev/${device} mklabel msdos
-
-echo "Creating boot partition on /dev/${device}1"
-parted /dev/${device} mkpart primary 0 $boot_size
-
-echo "Creating rootfs partition on /dev/${device}2"
-parted /dev/${device} mkpart primary $rootfs_start $rootfs_end 
-
-echo "Creating swap partition on /dev/${device}3"
-parted /dev/${device} mkpart primary $swap_start $disk_size
-
-parted /dev/${device} print
-
-echo "Formatting /dev/${device}1 to ext2..."
-mkfs.ext3 $bootfs
-
-echo "Formatting /dev/${device}2 to ext3..."
-mkfs.ext3 $rootfs
-
-echo "Formatting swap partition...(/dev/${device}3)"
-mkswap $swap
-
-mkdir /ssd
-mkdir /rootmnt
-mkdir /bootmnt
-
-mount $rootfs /ssd
-mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
-
-echo "Copying rootfs files..."
-cp -a /rootmnt/* /ssd
-
-if [ -d /ssd/etc/ ] ; then
-    echo "$swap                swap             swap       defaults              0  0" >> /ssd/etc/fstab
-
-    # We dont want udev to mount our root device while we're booting...
-    if [ -d /ssd/etc/udev/ ] ; then
-	echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist
-    fi
-fi
-
-if [ -f /ssd/etc/grub.d/40_custom ] ; then
-    sed -i "s@__ROOTFS__@$rootfs@g" /ssd/etc/grub.d/40_custom
-    sed -i "s/__VIDEO_MODE__/$3/g" /ssd/etc/grub.d/40_custom
-    sed -i "s/__VGA_MODE__/$4/g" /ssd/etc/grub.d/40_custom
-    mount $bootfs /bootmnt
-    cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
-    umount /bootmnt
-    force="--force"
-fi
-
-umount /ssd
-umount /rootmnt
-
-echo "Preparing boot partition..."
-mount $bootfs /ssd
-grub-install $force --root-directory=/ssd /dev/${device}
-
-echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map
-
-if [ -f /ssd/40_custom ] ; then
-    mv /ssd/40_custom /ssd/boot/grub/grub.cfg
-    sed -i "/#/d" /ssd/boot/grub/grub.cfg
-    sed -i "/exec tail/d" /ssd/boot/grub/grub.cfg
-    chmod 0444 /ssd/boot/grub/grub.cfg
-else
-    echo "default 0" > /ssd/boot/grub/menu.lst
-    echo "timeout 30" >> /ssd/boot/grub/menu.lst
-    echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst
-    echo "root (hd0,1)" >> /ssd/boot/grub/menu.lst
-    echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
-fi
-
-cp /media/$1/vmlinuz /ssd/boot/
-
-umount /ssd
-sync
-
-echo "Remove your installation media, and press ENTER"
-
-read enter
-
-echo "Rebooting..."
-reboot -f

deleted file mode 100644
index d3420e0..0000000
@@ -1,2 +0,0 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"

index 328136f..fda48ad 100644
@@ -35,7 +35,6 @@ Maintainers List (try to look for most precise areas first)
 
 COMMON
 M:	Tom Zanussi <[email protected]>
-F:	common/recipes-bsp/grub/
 F:	common/recipes-core/
 
 CROWNBAY