diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-11-23 23:17:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 22:22:06 +0000 |
commit | 73861c8053027572c03189771d967ae166bfe9e8 (patch) | |
tree | ab8e6ff2a9db4ef9f988f4feca7df94182a24345 | |
parent | 0d6c01ceb4355583cfcdc3c918382db079d9a959 (diff) | |
download | poky-73861c8053027572c03189771d967ae166bfe9e8.tar.gz |
grub: Use COMPATIBLE_HOST
Drop the anonymous python block in favor of the much simpler
COMPATIBLE_HOST mechanism.
(From OE-Core rev: 36654d6d393cb8c8a545835184a96be4ae0c885d)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/grub/grub_1.99.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb index a077363426..49c26f6fd1 100644 --- a/meta/recipes-bsp/grub/grub_1.99.bb +++ b/meta/recipes-bsp/grub/grub_1.99.bb | |||
@@ -22,6 +22,8 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ | |||
22 | SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" | 22 | SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" |
23 | SRC_URI[sha256sum] = "b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff" | 23 | SRC_URI[sha256sum] = "b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff" |
24 | 24 | ||
25 | COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' | ||
26 | |||
25 | inherit autotools | 27 | inherit autotools |
26 | inherit gettext | 28 | inherit gettext |
27 | 29 | ||
@@ -31,13 +33,6 @@ do_configure() { | |||
31 | oe_runconf | 33 | oe_runconf |
32 | } | 34 | } |
33 | 35 | ||
34 | python __anonymous () { | ||
35 | import re | ||
36 | host = d.getVar('HOST_SYS', 1) | ||
37 | if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', host): | ||
38 | raise bb.parse.SkipPackage("incompatible with host %s" % host) | ||
39 | } | ||
40 | |||
41 | do_install_append () { | 36 | do_install_append () { |
42 | install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom | 37 | install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom |
43 | } | 38 | } |