[OE-core] [PATCH 05/26] u-boot: remove do_install from u-boot.inc
Saul Wold
sgw at linux.intel.com
Wed Mar 2 18:00:18 UTC 2011
From: Bruce Ashfield <bruce.ashfield at windriver.com>
Fixes [BUGID #777]
The do_install rule in u-boot.inc was installing a host
tool into the target ${bindir}, which is subsequently
stripped with target strip during packaging, and the
obvious error ensues.
The native u-boot recipe has its own install rule, and
the machine specific u-boot doesn't require mkimage or
anything else in the do_install function. So we remove
it completely until it is needed again.
[sgw: PR bump]
Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-bsp/uboot/u-boot.inc | 5 -----
meta/recipes-bsp/uboot/u-boot_git.bb | 2 +-
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
index 1457c04..d1cebee 100644
--- a/meta/recipes-bsp/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
@@ -31,8 +31,3 @@ do_deploy () {
ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
}
addtask deploy before do_build after do_compile
-
-do_install() {
- install -d ${D}${bindir}
- install -m 755 tools/mkimage ${D}${bindir}/
-}
diff --git a/meta/recipes-bsp/uboot/u-boot_git.bb b/meta/recipes-bsp/uboot/u-boot_git.bb
index b3207c6..4686a58 100644
--- a/meta/recipes-bsp/uboot/u-boot_git.bb
+++ b/meta/recipes-bsp/uboot/u-boot_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"
PV = "v2010.12+${PR}+git${SRCPV}"
-PR="r0"
+PR="r1"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
--
1.7.1
More information about the Openembedded-core
mailing list