summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2016-04-14 17:49:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:28:22 +0100
commit396e64d58e5f84bd30cedc5552b3c9ed61aa4840 (patch)
tree3cff3055314cbb01c87ec3df65ac8acef7eaa4d5 /meta/recipes-core
parent55068b1908f152c6b17f7ac56ec416a3a66b5a4d (diff)
downloadpoky-396e64d58e5f84bd30cedc5552b3c9ed61aa4840.tar.gz
build-appliance-image: Load TUN at startup
This patch addresses the issue of not being able to execute "runqemu" in the Build Appliance. The root cause of the problem was that TAP/TUN was not available, although required by "runqemu". In addition, the recommended remedy $ sudo modprobe tun would fail for two reasons: modprobe not in PATH (user builder), and "iptables" located in /usr/sbin but expected in /sbin. [YOCTO #9437] (From OE-Core rev: 65db0a29be91a157522cf02ebb21961b8ba55759) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/images/build-appliance-image_14.0.0.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_14.0.0.bb b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
index eeb301df57..07bd14506e 100644
--- a/meta/recipes-core/images/build-appliance-image_14.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
@@ -21,7 +21,7 @@ IMAGE_FSTYPES = "vmdk"
21 21
22inherit core-image module-base 22inherit core-image module-base
23 23
24SRCREV ?= "00c4c9bf0007b964dfa4559fe8fc8687f14cdec3" 24SRCREV ?= "5c8124df2efed4b8691239cd357cf69211b0c844"
25SRC_URI = "git://git.yoctoproject.org/poky \ 25SRC_URI = "git://git.yoctoproject.org/poky \
26 file://Yocto_Build_Appliance.vmx \ 26 file://Yocto_Build_Appliance.vmx \
27 file://Yocto_Build_Appliance.vmxf \ 27 file://Yocto_Build_Appliance.vmxf \
@@ -80,9 +80,13 @@ fakeroot do_populate_poky_src () {
80 # Assume we will need CDROM to install guest additions 80 # Assume we will need CDROM to install guest additions
81 mkdir -p ${IMAGE_ROOTFS}/media/cdrom 81 mkdir -p ${IMAGE_ROOTFS}/media/cdrom
82 82
83 # Allow builder to use sudo to setup tap/tun 83 # Allow builder to use sudo
84 echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers 84 echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
85 85
86 # Load tap/tun at startup
87 ln -sr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
88 echo "tun" >> ${IMAGE_ROOTFS}/etc/modules
89
86 # Use Clearlooks GTK+ theme 90 # Use Clearlooks GTK+ theme
87 mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0 91 mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
88 echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc 92 echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc