mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
meta-intel: add a /common dir with grub2/live-install changes
Add a /common dir to contain code shared by multiple BSPs in the meta-intel repo, along with a couple recipes to live there temporarily. In this case, there are two BSPs that need to share the common grub2 and associated initramfs-live-install changes (sugarbay and jasperforest). The grub2 and associated initramfs-live-install changes will soon be submitted to the main poky repo, but for now it makes more sense to keep them here - they're needed for live-install of the two BSPs mentioned, but they contain a couple hacks that need to be addressed and are untested with anything else. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
This commit is contained in:
parent
3a6fbfdf01
commit
c5ecc11dec
9
common/recipes-bsp/grub/grub-1.98/40_custom
Executable file
9
common/recipes-bsp/grub/grub-1.98/40_custom
Executable file
|
@ -0,0 +1,9 @@
|
||||||
|
#!/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
|
||||||
|
}
|
13
common/recipes-bsp/grub/grub-1.98/grub-install.in.patch
Normal file
13
common/recipes-bsp/grub/grub-1.98/grub-install.in.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
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}`"
|
31
common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch
Normal file
31
common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
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;
|
45
common/recipes-bsp/grub/grub_1.98.bb
Normal file
45
common/recipes-bsp/grub/grub_1.98.bb
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader"
|
||||||
|
|
||||||
|
DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \
|
||||||
|
intended to unify bootloading across x86 operating systems. In \
|
||||||
|
addition to loading the Linux kernel, it implements the Multiboot \
|
||||||
|
standard, which allows for flexible loading of multiple boot images."
|
||||||
|
|
||||||
|
HOMEPAGE = "http://www.gnu.org/software/grub/"
|
||||||
|
SECTION = "bootloaders"
|
||||||
|
PRIORITY = "optional"
|
||||||
|
|
||||||
|
LICENSE = "GPLv2+"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
|
|
||||||
|
RDEPENDS = "diffutils"
|
||||||
|
PR = "r0"
|
||||||
|
|
||||||
|
SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
|
||||||
|
file://uninit-shdr-fix.patch;apply=yes \
|
||||||
|
file://grub-install.in.patch;apply=yes \
|
||||||
|
file://40_custom"
|
||||||
|
|
||||||
|
inherit autotools
|
||||||
|
inherit gettext
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--with-platform=pc --target=i386"
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
oe_runconf
|
||||||
|
}
|
||||||
|
|
||||||
|
python __anonymous () {
|
||||||
|
import re
|
||||||
|
host = bb.data.getVar('HOST_SYS', d, 1)
|
||||||
|
if not re.match('x86.64.*-linux', host):
|
||||||
|
raise bb.parse.SkipPackage("incompatible with host %s" % host)
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install_append () {
|
||||||
|
install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
|
||||||
|
}
|
||||||
|
|
||||||
|
FILES_${PN}-doc = "${datadir}"
|
||||||
|
FILES_${PN} = "/usr /etc"
|
||||||
|
|
|
@ -0,0 +1,188 @@
|
||||||
|
#!/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} mkpartfs primary ext2 0 $boot_size
|
||||||
|
|
||||||
|
echo "Creating rootfs partition on /dev/${device}2"
|
||||||
|
parted /dev/${device} mkpartfs primary ext2 $rootfs_start $rootfs_end
|
||||||
|
|
||||||
|
echo "Creating swap partition on /dev/${device}3"
|
||||||
|
parted /dev/${device} mkpartfs primary linux-swap $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
|
|
@ -0,0 +1,2 @@
|
||||||
|
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
|
||||||
|
FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
|
Loading…
Reference in New Issue
Block a user