diff options
author | Tian Fang <tfang@fb.com> | 2015-09-24 22:38:27 -0700 |
---|---|---|
committer | Tian Fang <tfang@fb.com> | 2015-09-24 22:38:27 -0700 |
commit | a2191ac71c1ed9b265b19b8025633d543d9e6be9 (patch) | |
tree | 4ad11ba86bf885a7b9e7af1695cbca989ba71d24 | |
parent | 67f44805b41a532b7b440773f7ee6d17dc0e97f4 (diff) | |
download | ast2050-yocto-openbmc-a2191ac71c1ed9b265b19b8025633d543d9e6be9.zip ast2050-yocto-openbmc-a2191ac71c1ed9b265b19b8025633d543d9e6be9.tar.gz |
[u-boot] fix the build issue after last push
Summary:
The S directory was set incorrectly from the last push.
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend | 16 | ||||
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend | 13 |
2 files changed, 9 insertions, 20 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend index ac75c33..50c357f 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend @@ -3,18 +3,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://patch-2013.07/0000-u-boot-aspeed-064.patch \ file://patch-2013.07/0001-u-boot-openbmc.patch \ file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch \ - " - -PV = "v2013.07" - -S = "${WORKDIR}/u-boot-v2013.07" - -# This is an ugly hack, but we want to get this out the door, rather than -# spending forever fiddling with yocto and bitbake. - -do_install_append() { - if [ -e ${WORKDIR}/fw_env.config ] ; then - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - fi -} + " diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend index 0ecbd77..928aca6 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend @@ -1,10 +1,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://patch-2013.07/0000-u-boot-aspeed-064.patch \ +SRC_URI += "file://fw_env.config \ + file://patch-2013.07/0000-u-boot-aspeed-064.patch \ file://patch-2013.07/0001-u-boot-openbmc.patch \ file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch \ - " + " -PV = "v2013.07" - -S = "${WORKDIR}/u-boot-v2013.07" +# Do not install u-boot in rootfs +do_install[postfuncs] += "remove_uboot_from_rootfs" +remove_uboot_from_rootfs() { + rm -rf ${D}/boot/u-boot* +} |