summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-09-10 13:08:46 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-09-15 03:56:13 (GMT)
commit072b217edf7ebea81a3503915223eccdf26af23d (patch)
tree961ecdc19a0ba248bc28996c8e95a03fbfe73a12
parent12c2a2c710bfd48878912fc2296a2b58ee50f48c (diff)
downloadmeta-intel-072b217edf7ebea81a3503915223eccdf26af23d.tar.gz
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 <tom.zanussi@intel.com>
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf2
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf2
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf3
-rw-r--r--meta-fishriver/conf/machine/fishriver.conf3
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf3
-rw-r--r--meta-jasperforest/conf/machine/jasperforest.conf1
-rw-r--r--meta-n450/conf/machine/n450.conf3
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf2
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"
34 34
35GLIBC_ADDONS = "nptl" 35GLIBC_ADDONS = "nptl"
36GLIBC_EXTRA_OECONF = "--with-tls" 36GLIBC_EXTRA_OECONF = "--with-tls"
37
38MACHINE_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"
38 38
39GLIBC_ADDONS = "nptl" 39GLIBC_ADDONS = "nptl"
40GLIBC_EXTRA_OECONF = "--with-tls" 40GLIBC_EXTRA_OECONF = "--with-tls"
41
42MACHINE_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"
34 34
35GLIBC_ADDONS = "nptl" 35GLIBC_ADDONS = "nptl"
36GLIBC_EXTRA_OECONF = "--with-tls" 36GLIBC_EXTRA_OECONF = "--with-tls"
37
38MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
39
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"
34 34
35GLIBC_ADDONS = "nptl" 35GLIBC_ADDONS = "nptl"
36GLIBC_EXTRA_OECONF = "--with-tls" 36GLIBC_EXTRA_OECONF = "--with-tls"
37
38MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
39
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"
34 34
35GLIBC_ADDONS = "nptl" 35GLIBC_ADDONS = "nptl"
36GLIBC_EXTRA_OECONF = "--with-tls" 36GLIBC_EXTRA_OECONF = "--with-tls"
37
38MACHINE_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"
37 37
38GLIBC_ADDONS = "nptl" 38GLIBC_ADDONS = "nptl"
39GLIBC_EXTRA_OECONF = "--with-tls" 39GLIBC_EXTRA_OECONF = "--with-tls"
40
41MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
42
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"
36GLIBC_EXTRA_OECONF = "--with-tls" 36GLIBC_EXTRA_OECONF = "--with-tls"
37 37
38MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" 38MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
39PREFERRED_VERSION_grub ?= "1.98"
40 39
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"
37GLIBC_EXTRA_OECONF = "--with-tls" 37GLIBC_EXTRA_OECONF = "--with-tls"
38 38
39ROOTLESS_X = "1" 39ROOTLESS_X = "1"
40
41MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
42
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"
38GLIBC_EXTRA_OECONF = "--with-tls" 38GLIBC_EXTRA_OECONF = "--with-tls"
39 39
40MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" 40MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
41
42PREFERRED_VERSION_grub ?= "1.98"