diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2017-03-15 15:13:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-16 22:11:32 +0000 |
commit | 86bf67a4a5424ebaaf7bfca3be1c360b7718f3ff (patch) | |
tree | b7c3acac50d94ac19728e305cb6b0a702de48601 /meta | |
parent | 5674a08ca57efd11471dd5c7c54b60ea0a22c841 (diff) | |
download | poky-86bf67a4a5424ebaaf7bfca3be1c360b7718f3ff.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/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 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 () { | |||
60 | cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/ | 60 | cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/ |
61 | 61 | ||
62 | # Create a symlink, needed for out-of-tree kernel modules build | 62 | # Create a symlink, needed for out-of-tree kernel modules build |
63 | rm -f ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build | ||
63 | lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build | 64 | lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build |
64 | 65 | ||
65 | echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf | 66 | echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf |
@@ -87,6 +88,7 @@ fakeroot do_populate_poky_src () { | |||
87 | echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers | 88 | echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers |
88 | 89 | ||
89 | # Load tap/tun at startup | 90 | # Load tap/tun at startup |
91 | rm -f ${IMAGE_ROOTFS}/sbin/iptables | ||
90 | lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables | 92 | lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables |
91 | echo "tun" >> ${IMAGE_ROOTFS}/etc/modules | 93 | echo "tun" >> ${IMAGE_ROOTFS}/etc/modules |
92 | 94 | ||