Remove grub2 to oe-core and make BSPs use it

PATCH New [email protected] 1 participant 6 messages Sep 14, 2011

lore

Share & tools

lore

[email protected]

author

2011-09-14 05:41 UTC #0 lore raw

cover Remove grub2 to oe-core and make BSPs use it

From: Tom Zanussi <[email protected]>

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.

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-grub2
http://git.yoctoproject.org/cgit.cgi//log/?h=tzanussi/move-grub2

Tom Zanussi (5):
meta-intel/common: remove grub-1.98
meta-intel/MAINTAINERS: remove grub
meta-intel: make 32-bit BSPs use grub2
meta-sugarbay: prefer grub 1.99
meta-jasperforest: prefer grub 1.99

 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 -----------------
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    3 +
 meta-crownbay/conf/machine/crownbay.conf           |    3 +
 meta-emenlow/conf/machine/emenlow.conf             |    3 +
 meta-fishriver/conf/machine/fishriver.conf         |    3 +
 meta-fri2/conf/machine/fri2.conf                   |    3 +
 meta-jasperforest/conf/machine/jasperforest.conf   |    2 +-
 meta-n450/conf/machine/n450.conf                   |    3 +
 meta-sugarbay/conf/machine/sugarbay.conf           |    2 +-
 14 files changed, 20 insertions(+), 154 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

[email protected]

author

2011-09-14 05:41 UTC #1 lore raw

PATCH 1/5 meta-intel/common: remove grub-1.98

From: Tom Zanussi <[email protected]>

This has been moved into oe-core, so remove it from meta-intel.

Signed-off-by Tom Zanussi <[email protected]>

---
 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

common/recipes-bsp/grub/grub-1.98/40_custom deleted +0 -9

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
-}

common/recipes-bsp/grub/grub-1.98/gentrigtables-compile-fix.patch deleted +0 ~~-52~~

52 lines not on this page · raw message

common/recipes-bsp/grub/grub-1.98/grub-install.in.patch deleted +0 ~~-13~~

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}`"

common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch deleted +0 ~~-31~~

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;

common/recipes-bsp/grub/grub_1.98.bb deleted +0 ~~-46~~

46 lines not on this page · raw message

Signature · 1 line

1.7.0.4

[email protected]

author

2011-09-14 05:41 UTC #2 lore raw

PATCH 2/5 meta-intel/MAINTAINERS: remove grub

From: Tom Zanussi <[email protected]>

Remove the entry for grub, since it is no longer a part of meta-intel.

Signed-off-by Tom Zanussi <[email protected]>

---
 MAINTAINERS |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

MAINTAINERS +0 -1

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

Signature · 1 line

1.7.0.4

[email protected]

author

2011-09-14 05:41 UTC #3 lore raw

PATCH 3/5 meta-intel: make 32-bit BSPs use grub2

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Switch all the 32-bit BSPs from legacy (0.97) grub to grub 1.99.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta-crownbay/conf/machine/crownbay-noemgd.conf |    3 +++
 meta-crownbay/conf/machine/crownbay.conf        |    3 +++
 meta-emenlow/conf/machine/emenlow.conf          |    3 +++
 meta-fishriver/conf/machine/fishriver.conf      |    3 +++
 meta-fri2/conf/machine/fri2.conf                |    3 +++
 meta-n450/conf/machine/n450.conf                |    3 +++
 6 files changed, 18 insertions(+), 0 deletions(-)

meta-crownbay/conf/machine/crownbay-noemgd.conf +3 -0

index 30c575a..64a911c 100644
@@ -34,3 +34,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+PREFERRED_VERSION_grub ?= "1.99"

meta-crownbay/conf/machine/crownbay.conf +3 -0

index 96dc784..bde08da 100644
@@ -38,3 +38,6 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+PREFERRED_VERSION_grub ?= "1.99"

meta-emenlow/conf/machine/emenlow.conf +3 -0

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

meta-fishriver/conf/machine/fishriver.conf +3 -0

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

meta-fri2/conf/machine/fri2.conf +3 -0

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

meta-n450/conf/machine/n450.conf +3 -0

index c0ff0cf..431db32 100644
@@ -37,3 +37,6 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
 ROOTLESS_X = "1"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
+PREFERRED_VERSION_grub ?= "1.99"

Signature · 1 line

1.7.0.4

[email protected]

author

2011-09-14 05:41 UTC #4 lore raw

PATCH 4/5 meta-sugarbay: prefer grub 1.99

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Switch from grub 1.98 to 1.99

Signed-off-by Tom Zanussi <[email protected]>

---
 meta-sugarbay/conf/machine/sugarbay.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-sugarbay/conf/machine/sugarbay.conf +1 -1

index ea8d98a..f3e6c35 100644
@@ -39,4 +39,4 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
 
-PREFERRED_VERSION_grub ?= "1.98"
+PREFERRED_VERSION_grub ?= "1.99"

Signature · 1 line

1.7.0.4

[email protected]

author

2011-09-14 05:41 UTC #5 lore raw

PATCH 5/5 meta-jasperforest: prefer grub 1.99

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Switch from grub 1.98 to 1.99

Signed-off-by Tom Zanussi <[email protected]>

---
 meta-jasperforest/conf/machine/jasperforest.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-jasperforest/conf/machine/jasperforest.conf +1 -1

index 3013fe4..20eab77 100644
@@ -36,5 +36,5 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-PREFERRED_VERSION_grub ?= "1.98"
+PREFERRED_VERSION_grub ?= "1.99"

Signature · 1 line

1.7.0.4