From 072b217edf7ebea81a3503915223eccdf26af23d Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Sat, 10 Sep 2011 08:08:46 -0500 Subject: meta-intel: update BSPs to use grub2 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 --- 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 30c575a4..c668f4a3 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 96dc7843..457bdfce 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 de6794ea..39930a02 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 0cee5d05..2fe78e8d 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 a8715294..b02e0374 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 4b81fab0..eab4b505 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 3013fe40..9fdb9688 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 c0ff0cf5..79970d16 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 ea8d98a6..6277e208 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" -- cgit v1.2.3-54-g00ecf