* [PATCH 0/4] Remove grub2 to oe-core and make BSPs use it [v2]
@ 2011-09-14 23:15 tom.zanussi
2011-09-14 23:15 ` [PATCH 1/4] meta-intel/common: remove grub-1.98 tom.zanussi
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: tom.zanussi @ 2011-09-14 23:15 UTC (permalink / raw)
To: dvhart, yocto
From: Tom Zanussi <tom.zanussi@intel.com>
This patchset removes grub2 from meta-intel, since it's been moved by
another patchset to oe-core. It also moves all the meta-intel BSPs to
grub2 (1.99).
A future patch will factor out the common parts being added to the
machine configs - this initial patchset essentially just fixes what's
necessary for YOCTO bug #1428 in order to get things working again.
Changes since v2:
Forgot to remove initramfs-live-install in v1, and remove explicit
preferred versions.
The following changes since commit 3b5a3cb7393d0e9a56ff38a0b41c61751afab2b5:
Tom Zanussi (1):
grub2: update license version
are available in the git repository at:
git://git.yoctoproject.org/meta-intel.git tzanussi/move-grub2v2
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/move-grub2v2
Tom Zanussi (4):
meta-intel/common: remove grub-1.98
meta-intel/MAINTAINERS: remove grub
meta-intel: update BSPs to use grub2
meta-intel/common: remove initramfs-live-install .bbappend
MAINTAINERS | 1 -
common/recipes-bsp/grub/grub-1.98/40_custom | 9 -
.../grub/grub-1.98/gentrigtables-compile-fix.patch | 52 ------
.../grub/grub-1.98/grub-install.in.patch | 13 --
.../grub/grub-1.98/uninit-shdr-fix.patch | 31 ----
common/recipes-bsp/grub/grub_1.98.bb | 46 -----
.../initramfs-live-install/init-install.sh | 188 --------------------
.../initramfs-live-install_1.0.bbappend | 2 -
meta-crownbay/conf/machine/crownbay-noemgd.conf | 2 +
meta-crownbay/conf/machine/crownbay.conf | 2 +
meta-emenlow/conf/machine/emenlow.conf | 3 +
meta-fishriver/conf/machine/fishriver.conf | 3 +
meta-fri2/conf/machine/fri2-noemgd.conf | 2 +
meta-fri2/conf/machine/fri2.conf | 3 +
meta-jasperforest/conf/machine/jasperforest.conf | 1 -
meta-n450/conf/machine/n450.conf | 3 +
meta-sugarbay/conf/machine/sugarbay.conf | 2 -
17 files changed, 18 insertions(+), 345 deletions(-)
delete mode 100755 common/recipes-bsp/grub/grub-1.98/40_custom
delete mode 100644 common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch
delete mode 100644 common/recipes-bsp/grub/grub-1.98/grub-install.in.patch
delete mode 100644 common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch
delete mode 100644 common/recipes-bsp/grub/grub_1.98.bb
delete mode 100644 common/recipes-core/initrdscripts/initramfs-live-install/init-install.sh
delete mode 100644 common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] meta-intel/common: remove grub-1.98
2011-09-14 23:15 [PATCH 0/4] Remove grub2 to oe-core and make BSPs use it [v2] tom.zanussi
@ 2011-09-14 23:15 ` tom.zanussi
2011-09-14 23:15 ` [PATCH 2/4] meta-intel/MAINTAINERS: remove grub tom.zanussi
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2011-09-14 23:15 UTC (permalink / raw)
To: dvhart, yocto
From: Tom Zanussi <tom.zanussi@intel.com>
This has been moved into oe-core, so remove it from meta-intel.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
common/recipes-bsp/grub/grub-1.98/40_custom | 9 ---
.../grub/grub-1.98/gentrigtables-compile-fix.patch | 52 --------------------
.../grub/grub-1.98/grub-install.in.patch | 13 -----
.../grub/grub-1.98/uninit-shdr-fix.patch | 31 ------------
common/recipes-bsp/grub/grub_1.98.bb | 46 -----------------
5 files changed, 0 insertions(+), 151 deletions(-)
delete mode 100755 common/recipes-bsp/grub/grub-1.98/40_custom
delete mode 100644 common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch
delete mode 100644 common/recipes-bsp/grub/grub-1.98/grub-install.in.patch
delete mode 100644 common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch
delete mode 100644 common/recipes-bsp/grub/grub_1.98.bb
diff --git a/common/recipes-bsp/grub/grub-1.98/40_custom b/common/recipes-bsp/grub/grub-1.98/40_custom
deleted file mode 100755
index 30dad39..0000000
--- a/common/recipes-bsp/grub/grub-1.98/40_custom
+++ /dev/null
@@ -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
-}
diff --git a/common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch b/common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch
deleted file mode 100644
index d09ecf5..0000000
--- a/common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: grub-1.98/conf/any-emu.mk
-===================================================================
---- grub-1.98.orig/conf/any-emu.mk 2011-02-24 00:54:20.825116207 -0600
-+++ grub-1.98/conf/any-emu.mk 2011-02-24 00:55:55.465116194 -0600
-@@ -820,7 +820,7 @@
- ./gentrigtables > $@
- DISTCLEANFILES += trigtables.c
- gentrigtables: gentrigtables.c
-- $(CC) -o $@ $^ $(CPPFLAGS) -lm
-+ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
- DISTCLEANFILES += gentrigtables
-
- # For grub-mkfont.
-Index: grub-1.98/conf/any-emu.rmk
-===================================================================
---- grub-1.98.orig/conf/any-emu.rmk 2011-02-24 00:54:24.565116208 -0600
-+++ grub-1.98/conf/any-emu.rmk 2011-02-24 00:56:40.665116186 -0600
-@@ -110,7 +110,7 @@
- ./gentrigtables > $@
- DISTCLEANFILES += trigtables.c
- gentrigtables: gentrigtables.c
-- $(CC) -o $@ $^ $(CPPFLAGS) -lm
-+ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
- DISTCLEANFILES += gentrigtables
-
- # For grub-mkfont.
-Index: grub-1.98/conf/common.mk
-===================================================================
---- grub-1.98.orig/conf/common.mk 2011-02-24 00:54:30.345116207 -0600
-+++ grub-1.98/conf/common.mk 2011-02-24 00:57:08.415116181 -0600
-@@ -11159,7 +11159,7 @@
- ./gentrigtables > $@
- DISTCLEANFILES += trigtables.c
- gentrigtables: gentrigtables.c
-- $(CC) -o $@ $^ $(CPPFLAGS) -lm
-+ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
- DISTCLEANFILES += gentrigtables
-
- pkglib_MODULES += setjmp.mod
-Index: grub-1.98/conf/common.rmk
-===================================================================
---- grub-1.98.orig/conf/common.rmk 2011-02-24 00:54:34.035116205 -0600
-+++ grub-1.98/conf/common.rmk 2011-02-24 00:57:31.045116179 -0600
-@@ -736,7 +736,7 @@
- ./gentrigtables > $@
- DISTCLEANFILES += trigtables.c
- gentrigtables: gentrigtables.c
-- $(CC) -o $@ $^ $(CPPFLAGS) -lm
-+ $(BUILD_CC) -o $@ $^ $(BUILD_CPPFLAGS) -I${top_srcdir}/include -lm
- DISTCLEANFILES += gentrigtables
-
- pkglib_MODULES += setjmp.mod
diff --git a/common/recipes-bsp/grub/grub-1.98/grub-install.in.patch b/common/recipes-bsp/grub/grub-1.98/grub-install.in.patch
deleted file mode 100644
index ac96419..0000000
--- a/common/recipes-bsp/grub/grub-1.98/grub-install.in.patch
+++ /dev/null
@@ -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}`"
diff --git a/common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch b/common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch
deleted file mode 100644
index 67af594..0000000
--- a/common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch
+++ /dev/null
@@ -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;
diff --git a/common/recipes-bsp/grub/grub_1.98.bb b/common/recipes-bsp/grub/grub_1.98.bb
deleted file mode 100644
index 1b3040b..0000000
--- a/common/recipes-bsp/grub/grub_1.98.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-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 = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-RDEPENDS = "diffutils freetype"
-PR = "r1"
-
-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://gentrigtables-compile-fix.patch;apply=yes \
- file://40_custom"
-
-inherit autotools
-inherit gettext
-
-EXTRA_OECONF = "--with-platform=pc --target=i386 --disable-grub-mkfont"
-
-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"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] meta-intel/MAINTAINERS: remove grub
2011-09-14 23:15 [PATCH 0/4] Remove grub2 to oe-core and make BSPs use it [v2] tom.zanussi
2011-09-14 23:15 ` [PATCH 1/4] meta-intel/common: remove grub-1.98 tom.zanussi
@ 2011-09-14 23:15 ` tom.zanussi
2011-09-14 23:15 ` [PATCH 3/4] meta-intel: update BSPs to use grub2 tom.zanussi
2011-09-14 23:15 ` [PATCH 4/4] meta-intel/common: remove initramfs-live-install .bbappend tom.zanussi
3 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2011-09-14 23:15 UTC (permalink / raw)
To: dvhart, yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Remove the entry for grub, since it is no longer a part of meta-intel.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
MAINTAINERS | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 328136f..fda48ad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -35,7 +35,6 @@ Maintainers List (try to look for most precise areas first)
COMMON
M: Tom Zanussi <tom.zanussi@intel.com>
-F: common/recipes-bsp/grub/
F: common/recipes-core/
CROWNBAY
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] meta-intel: update BSPs to use grub2
2011-09-14 23:15 [PATCH 0/4] Remove grub2 to oe-core and make BSPs use it [v2] tom.zanussi
2011-09-14 23:15 ` [PATCH 1/4] meta-intel/common: remove grub-1.98 tom.zanussi
2011-09-14 23:15 ` [PATCH 2/4] meta-intel/MAINTAINERS: remove grub tom.zanussi
@ 2011-09-14 23:15 ` tom.zanussi
2011-09-14 23:15 ` [PATCH 4/4] meta-intel/common: remove initramfs-live-install .bbappend tom.zanussi
3 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2011-09-14 23:15 UTC (permalink / raw)
To: dvhart, yocto
From: Tom Zanussi <tom.zanussi@intel.com>
grub2 is now the default, so explicit preferred entries are
unnecessary. It also needs to be installed in the rootfs, so we need
to add it as a dependency.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-crownbay/conf/machine/crownbay-noemgd.conf | 2 ++
meta-crownbay/conf/machine/crownbay.conf | 2 ++
meta-emenlow/conf/machine/emenlow.conf | 3 +++
meta-fishriver/conf/machine/fishriver.conf | 3 +++
meta-fri2/conf/machine/fri2-noemgd.conf | 2 ++
meta-fri2/conf/machine/fri2.conf | 3 +++
meta-jasperforest/conf/machine/jasperforest.conf | 1 -
meta-n450/conf/machine/n450.conf | 3 +++
meta-sugarbay/conf/machine/sugarbay.conf | 2 --
9 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 30c575a..c668f4a 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -34,3 +34,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 96dc784..457bdfc 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -38,3 +38,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index de6794e..39930a0 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -34,3 +34,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 0cee5d0..2fe78e8 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -34,3 +34,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index a871529..b02e037 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -34,3 +34,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 4b81fab..eab4b50 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -37,3 +37,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index 3013fe4..9fdb968 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -36,5 +36,4 @@ GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-PREFERRED_VERSION_grub ?= "1.98"
diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf
index c0ff0cf..79970d1 100644
--- a/meta-n450/conf/machine/n450.conf
+++ b/meta-n450/conf/machine/n450.conf
@@ -37,3 +37,6 @@ GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
ROOTLESS_X = "1"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index ea8d98a..6277e20 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -38,5 +38,3 @@ GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
-PREFERRED_VERSION_grub ?= "1.98"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] meta-intel/common: remove initramfs-live-install .bbappend
2011-09-14 23:15 [PATCH 0/4] Remove grub2 to oe-core and make BSPs use it [v2] tom.zanussi
` (2 preceding siblings ...)
2011-09-14 23:15 ` [PATCH 3/4] meta-intel: update BSPs to use grub2 tom.zanussi
@ 2011-09-14 23:15 ` tom.zanussi
3 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2011-09-14 23:15 UTC (permalink / raw)
To: dvhart, yocto
From: Tom Zanussi <tom.zanussi@intel.com>
This has been moved into oe-core, so remove it and init-install.sh
from meta-intel.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../initramfs-live-install/init-install.sh | 188 --------------------
.../initramfs-live-install_1.0.bbappend | 2 -
2 files changed, 0 insertions(+), 190 deletions(-)
delete mode 100644 common/recipes-core/initrdscripts/initramfs-live-install/init-install.sh
delete mode 100644 common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
diff --git a/common/recipes-core/initrdscripts/initramfs-live-install/init-install.sh b/common/recipes-core/initrdscripts/initramfs-live-install/init-install.sh
deleted file mode 100644
index 7d80190..0000000
--- a/common/recipes-core/initrdscripts/initramfs-live-install/init-install.sh
+++ /dev/null
@@ -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
diff --git a/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend b/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
deleted file mode 100644
index d3420e0..0000000
--- a/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-14 23:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-14 23:15 [PATCH 0/4] Remove grub2 to oe-core and make BSPs use it [v2] tom.zanussi
2011-09-14 23:15 ` [PATCH 1/4] meta-intel/common: remove grub-1.98 tom.zanussi
2011-09-14 23:15 ` [PATCH 2/4] meta-intel/MAINTAINERS: remove grub tom.zanussi
2011-09-14 23:15 ` [PATCH 3/4] meta-intel: update BSPs to use grub2 tom.zanussi
2011-09-14 23:15 ` [PATCH 4/4] meta-intel/common: remove initramfs-live-install .bbappend tom.zanussi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.