diff options
Diffstat (limited to 'meta/recipes-core/images/build-appliance-image_15.0.0.bb')
-rw-r--r-- | meta/recipes-core/images/build-appliance-image_15.0.0.bb | 39 |
1 files changed, 22 insertions, 17 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 705ff63cf7..6e222dfaa7 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | SUMMARY = "An image containing the build system itself" | 1 | SUMMARY = "An image containing the build system itself" |
2 | DESCRIPTION = "An image containing the build system that you can boot and run using either VirtualBox, VMware Player or VMware Workstation." | 2 | DESCRIPTION = "An image containing the build system that you can boot and run using either VirtualBox, VMware Player or VMware Workstation." |
3 | HOMEPAGE = "http://www.yoctoproject.org/documentation/build-appliance" | 3 | HOMEPAGE = "https://docs.yoctoproject.org/overview-manual/yp-intro.html#archived-components" |
4 | 4 | ||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 6 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
@@ -11,7 +11,7 @@ IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegro | |||
11 | 11 | ||
12 | IMAGE_FEATURES += "x11-base package-management splash" | 12 | IMAGE_FEATURES += "x11-base package-management splash" |
13 | 13 | ||
14 | QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' | 14 | QB_MEM ?= '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' |
15 | 15 | ||
16 | # Ensure there's enough space to do a core-image-sato build, with rm_work enabled | 16 | # Ensure there's enough space to do a core-image-sato build, with rm_work enabled |
17 | IMAGE_ROOTFS_EXTRA_SPACE = "41943040" | 17 | IMAGE_ROOTFS_EXTRA_SPACE = "41943040" |
@@ -22,10 +22,12 @@ APPEND += "rootfstype=ext4 quiet" | |||
22 | DEPENDS = "zip-native python3-pip-native" | 22 | DEPENDS = "zip-native python3-pip-native" |
23 | IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" | 23 | IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" |
24 | 24 | ||
25 | inherit core-image module-base setuptools3 | 25 | inherit core-image setuptools3 features_check |
26 | 26 | ||
27 | SRCREV ?= "e56305dd709ae2af2da7a7599984b3ad18c4970f" | 27 | REQUIRED_DISTRO_FEATURES += "xattr" |
28 | SRC_URI = "git://git.yoctoproject.org/poky \ | 28 | |
29 | SRCREV ?= "cf69c6843fb62ab2ebee361f3d1a1141f1a6b01a" | ||
30 | SRC_URI = "git://git.yoctoproject.org/poky;branch=master \ | ||
29 | file://Yocto_Build_Appliance.vmx \ | 31 | file://Yocto_Build_Appliance.vmx \ |
30 | file://Yocto_Build_Appliance.vmxf \ | 32 | file://Yocto_Build_Appliance.vmxf \ |
31 | file://README_VirtualBox_Guest_Additions.txt \ | 33 | file://README_VirtualBox_Guest_Additions.txt \ |
@@ -34,7 +36,7 @@ SRC_URI = "git://git.yoctoproject.org/poky \ | |||
34 | RECIPE_NO_UPDATE_REASON = "Recipe is recursive and handled as part of the release process" | 36 | RECIPE_NO_UPDATE_REASON = "Recipe is recursive and handled as part of the release process" |
35 | BA_INCLUDE_SOURCES ??= "0" | 37 | BA_INCLUDE_SOURCES ??= "0" |
36 | 38 | ||
37 | IMAGE_CMD_ext4_append () { | 39 | IMAGE_CMD:ext4:append () { |
38 | # We don't need to reserve much space for root, 0.5% is more than enough | 40 | # We don't need to reserve much space for root, 0.5% is more than enough |
39 | tune2fs -m 0.5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4 | 41 | tune2fs -m 0.5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4 |
40 | } | 42 | } |
@@ -61,14 +63,9 @@ fakeroot do_populate_poky_src () { | |||
61 | # Place the README_VirtualBox_Toaster file in builders home folder. | 63 | # Place the README_VirtualBox_Toaster file in builders home folder. |
62 | cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/ | 64 | cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/ |
63 | 65 | ||
64 | # Create a symlink, needed for out-of-tree kernel modules build | ||
65 | if [ ! -e ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build ]; then | ||
66 | rm -f ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build | ||
67 | lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build | ||
68 | fi | ||
69 | |||
70 | 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 |
71 | echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/builder/.bashrc | 67 | echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/builder/.bashrc |
68 | echo "export TERM=xterm-color" >> ${IMAGE_ROOTFS}/home/builder/.bashrc | ||
72 | 69 | ||
73 | # Also save (for reference only) the actual SRCREV used to create this image | 70 | # Also save (for reference only) the actual SRCREV used to create this image |
74 | echo "export BA_SRCREV=${SRCREV}" >> ${IMAGE_ROOTFS}/home/builder/.bashrc | 71 | echo "export BA_SRCREV=${SRCREV}" >> ${IMAGE_ROOTFS}/home/builder/.bashrc |
@@ -93,7 +90,7 @@ fakeroot do_populate_poky_src () { | |||
93 | 90 | ||
94 | # Load tap/tun at startup | 91 | # Load tap/tun at startup |
95 | rm -f ${IMAGE_ROOTFS}/sbin/iptables | 92 | rm -f ${IMAGE_ROOTFS}/sbin/iptables |
96 | lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables | 93 | ln -rs ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables |
97 | echo "tun" >> ${IMAGE_ROOTFS}/etc/modules | 94 | echo "tun" >> ${IMAGE_ROOTFS}/etc/modules |
98 | 95 | ||
99 | # Use Clearlooks GTK+ theme | 96 | # Use Clearlooks GTK+ theme |
@@ -114,7 +111,15 @@ fakeroot do_populate_poky_src () { | |||
114 | chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/.cache | 111 | chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/.cache |
115 | } | 112 | } |
116 | 113 | ||
117 | IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; " | 114 | fakeroot do_tweak_image () { |
115 | # add a /lib64 symlink | ||
116 | # this is needed for building rust-native on a 64-bit build appliance | ||
117 | ln -rs ${IMAGE_ROOTFS}/lib ${IMAGE_ROOTFS}/lib64 | ||
118 | } | ||
119 | |||
120 | IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src do_tweak_image" | ||
121 | # For pip usage above | ||
122 | do_image[network] = "1" | ||
118 | 123 | ||
119 | addtask rootfs after do_unpack | 124 | addtask rootfs after do_unpack |
120 | 125 | ||
@@ -128,9 +133,9 @@ create_bundle_files () { | |||
128 | cd ${WORKDIR} | 133 | cd ${WORKDIR} |
129 | mkdir -p Yocto_Build_Appliance | 134 | mkdir -p Yocto_Build_Appliance |
130 | cp *.vmx* Yocto_Build_Appliance | 135 | cp *.vmx* Yocto_Build_Appliance |
131 | ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk | 136 | ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk |
132 | ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.vhdx Yocto_Build_Appliance/Yocto_Build_Appliance.vhdx | 137 | ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic.vhdx Yocto_Build_Appliance/Yocto_Build_Appliance.vhdx |
133 | ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.vhd Yocto_Build_Appliance/Yocto_Build_Appliance.vhd | 138 | ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic.vhd Yocto_Build_Appliance/Yocto_Build_Appliance.vhd |
134 | zip -r ${IMGDEPLOYDIR}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance | 139 | zip -r ${IMGDEPLOYDIR}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance |
135 | ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${IMGDEPLOYDIR}/Yocto_Build_Appliance.zip | 140 | ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${IMGDEPLOYDIR}/Yocto_Build_Appliance.zip |
136 | } | 141 | } |