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>

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 730989e12ad8a5a3a3cbf63890cfe3df4d873548..b1d2250eb50568fe0335c6f9334eb4bde26bebbd 100644 (file)
--- 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