diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-06-18 11:01:35 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 13:03:01 +0100 |
commit | a0f804a37264592b6546b2478b59d658a45449fd (patch) | |
tree | 9ee8c7e9a1a8c11ce1d4062239e487879e698884 | |
parent | 9aa4e69ee18f937c7fdea302ffd093a3e4b6ec91 (diff) | |
download | poky-a0f804a37264592b6546b2478b59d658a45449fd.tar.gz |
grub: Clean up FILES_* after PACKAGES reoder
(From OE-Core rev: 41dddc175c0b4887629268bc32b7ac18095b15b5)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/grub/grub_0.97.bb | 5 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_1.99.bb | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-bsp/grub/grub_0.97.bb b/meta/recipes-bsp/grub/grub_0.97.bb index 1cde30d5ee..da72c7ad79 100644 --- a/meta/recipes-bsp/grub/grub_0.97.bb +++ b/meta/recipes-bsp/grub/grub_0.97.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ | |||
10 | file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" | 10 | file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" |
11 | 11 | ||
12 | RDEPENDS_${PN} = "diffutils" | 12 | RDEPENDS_${PN} = "diffutils" |
13 | PR = "r5" | 13 | PR = "r6" |
14 | 14 | ||
15 | SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ | 15 | SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ |
16 | file://no-reorder-functions.patch \ | 16 | file://no-reorder-functions.patch \ |
@@ -34,6 +34,3 @@ do_install_append_vmware() { | |||
34 | mkdir -p ${D}/boot/ | 34 | mkdir -p ${D}/boot/ |
35 | ln -sf ../usr/lib/grub/{$TARGET_ARCH}{$TARGET_VENDOR}/ ${D}/boot/grub | 35 | ln -sf ../usr/lib/grub/{$TARGET_ARCH}{$TARGET_VENDOR}/ ${D}/boot/grub |
36 | } | 36 | } |
37 | |||
38 | FILES_${PN}-doc = "${datadir}" | ||
39 | FILES_${PN} = "/boot /usr" | ||
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb index 882f21d5b5..0d49f23591 100644 --- a/meta/recipes-bsp/grub/grub_1.99.bb +++ b/meta/recipes-bsp/grub/grub_1.99.bb | |||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
13 | 13 | ||
14 | DEPENDS = "autogen-native" | 14 | DEPENDS = "autogen-native" |
15 | RDEPENDS_${PN} = "diffutils freetype" | 15 | RDEPENDS_${PN} = "diffutils freetype" |
16 | PR = "r7" | 16 | PR = "r8" |
17 | 17 | ||
18 | SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ | 18 | SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ |
19 | file://grub-install.in.patch \ | 19 | file://grub-install.in.patch \ |
@@ -44,6 +44,4 @@ do_install_append () { | |||
44 | install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom | 44 | install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom |
45 | } | 45 | } |
46 | 46 | ||
47 | FILES_${PN}-doc = "${datadir}" | ||
48 | FILES_${PN} = "/usr /etc" | ||
49 | INSANE_SKIP_${PN} = "arch" | 47 | INSANE_SKIP_${PN} = "arch" |