summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/images
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-03-15 15:13:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-16 17:36:10 +0000
commit376aa835dd70e646a00706272db6f5ac7f419ce7 (patch)
treed4b28f8c992be4bd52c5d9e276d65665459311b5 /meta/recipes-core/images
parent0c349f06b6b026e9bbd3e9a8188e3d8645fd00d9 (diff)
downloadopenembedded-core-376aa835dd70e646a00706272db6f5ac7f419ce7.tar.gz
openembedded-core-376aa835dd70e646a00706272db6f5ac7f419ce7.tar.bz2
openembedded-core-376aa835dd70e646a00706272db6f5ac7f419ce7.zip
build-appliance-image: fix build errors
Remove any symlinks before creating new ones to avoid potential build errors such as: FileExistsError: [Errno 17] File exists: '../../usr/src/kernel' -> ... ' Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/images')
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index 730989e12a..b1d2250eb5 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -60,6 +60,7 @@ fakeroot do_populate_poky_src () {
cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/
# Create a symlink, needed for out-of-tree kernel modules build
+ rm -f ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build
lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build
echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
@@ -87,6 +88,7 @@ fakeroot do_populate_poky_src () {
echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
# Load tap/tun at startup
+ rm -f ${IMAGE_ROOTFS}/sbin/iptables
lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
echo "tun" >> ${IMAGE_ROOTFS}/etc/modules