summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-03-01 17:32:55 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-03-01 17:59:55 (GMT)
commit0f44acfd04ecc9709d5d47e7484f2481b3c64cd8 (patch)
tree1f67b3e6aca05e6b12a2443ff4062fd688de3fa4 /meta
parentcad40f4fa980672fa7cae9e8db1274bcee367acf (diff)
downloadpoky-0f44acfd04ecc9709d5d47e7484f2481b3c64cd8.tar.gz
u-boot: remove do_install from u-boot.inc
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@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/uboot/u-boot.inc5
-rw-r--r--meta/recipes-bsp/uboot/u-boot_git.bb2
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 () {
31 ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} 31 ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
32} 32}
33addtask deploy before do_build after do_compile 33addtask deploy before do_build after do_compile
34
35do_install() {
36 install -d ${D}${bindir}
37 install -m 755 tools/mkimage ${D}${bindir}/
38}
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 \
7FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}" 7FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"
8 8
9PV = "v2010.12+${PR}+git${SRCPV}" 9PV = "v2010.12+${PR}+git${SRCPV}"
10PR="r0" 10PR="r1"
11 11
12SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 12SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
13 13