[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5122/8267] build-appliance-image: fix build errors

[Emmanuele Bassi <ebassi src gnome org>]

commit 86bf67a4a5424ebaaf7bfca3be1c360b7718f3ff
Author: Juro Bystricky <juro bystricky intel com>
Date:   Wed Mar 15 15:13:37 2017 -0700

    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' -> ... '
    
    (From OE-Core rev: 376aa835dd70e646a00706272db6f5ac7f419ce7)
    
    Signed-off-by: Juro Bystricky <juro bystricky intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../images/build-appliance-image_15.0.0.bb         |    2 ++
 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 730989e..b1d2250 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