summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image-live.bbclass12
-rw-r--r--meta/classes/image-vm.bbclass22
-rw-r--r--meta/classes/image.bbclass6
-rw-r--r--meta/classes/image_types.bbclass44
-rw-r--r--meta/classes/image_types_uboot.bbclass2
-rw-r--r--meta/classes/rootfs-postcommands.bbclass4
-rw-r--r--meta/classes/syslinux.bbclass2
-rw-r--r--meta/lib/oe/rootfs.py6
-rw-r--r--meta/lib/oeqa/selftest/imagefeatures.py4
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb8
10 files changed, 55 insertions, 55 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index f0e6647ac1..4a634dca96 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -43,7 +43,7 @@ ROOT_LIVE ?= "root=/dev/ram0"
43INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" 43INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
44INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" 44INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
45 45
46ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 46ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4"
47 47
48IMAGE_TYPEDEP_live = "ext4" 48IMAGE_TYPEDEP_live = "ext4"
49IMAGE_TYPEDEP_iso = "ext4" 49IMAGE_TYPEDEP_iso = "ext4"
@@ -144,14 +144,14 @@ build_iso() {
144 if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then 144 if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then
145 # PCBIOS only media 145 # PCBIOS only media
146 mkisofs -V ${BOOTIMG_VOLUME_ID} \ 146 mkisofs -V ${BOOTIMG_VOLUME_ID} \
147 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \ 147 -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \
148 -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ 148 -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \
149 $mkisofs_compress_opts \ 149 $mkisofs_compress_opts \
150 ${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR} 150 ${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR}
151 else 151 else
152 # EFI only OR EFI+PCBIOS 152 # EFI only OR EFI+PCBIOS
153 mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \ 153 mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \
154 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \ 154 -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \
155 -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ 155 -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \
156 $mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \ 156 $mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \
157 -eltorito-alt-boot -eltorito-platform efi \ 157 -eltorito-alt-boot -eltorito-platform efi \
@@ -160,7 +160,7 @@ build_iso() {
160 isohybrid_args="-u" 160 isohybrid_args="-u"
161 fi 161 fi
162 162
163 isohybrid $isohybrid_args ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso 163 isohybrid $isohybrid_args ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso
164} 164}
165 165
166build_fat_img() { 166build_fat_img() {
@@ -252,13 +252,13 @@ build_hddimg() {
252 fi 252 fi
253 fi 253 fi
254 254
255 build_fat_img ${HDDDIR} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg 255 build_fat_img ${HDDDIR} ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg
256 256
257 if [ "${PCBIOS}" = "1" ]; then 257 if [ "${PCBIOS}" = "1" ]; then
258 syslinux_hddimg_install 258 syslinux_hddimg_install
259 fi 259 fi
260 260
261 chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg 261 chmod 644 ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg
262 fi 262 fi
263} 263}
264 264
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index bf57e2c6c5..32c6550037 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -33,14 +33,14 @@ IMAGE_TYPEDEP_hdddirect = "${VM_ROOTFS_TYPE}"
33IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect" 33IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect"
34 34
35VM_ROOTFS_TYPE ?= "ext4" 35VM_ROOTFS_TYPE ?= "ext4"
36ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}" 36ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}"
37 37
38# Used by bootloader 38# Used by bootloader
39LABELS_VM ?= "boot" 39LABELS_VM ?= "boot"
40ROOT_VM ?= "root=/dev/sda2" 40ROOT_VM ?= "root=/dev/sda2"
41# Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM. 41# Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM.
42INITRD_IMAGE_VM ?= "" 42INITRD_IMAGE_VM ?= ""
43INITRD_VM ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_VM}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE_VM}' else ''}" 43INITRD_VM ?= "${@'${IMGDEPLOYDIR}/${INITRD_IMAGE_VM}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE_VM}' else ''}"
44do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if '${INITRD_IMAGE_VM}' else ''}" 44do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if '${INITRD_IMAGE_VM}' else ''}"
45 45
46BOOTDD_VOLUME_ID ?= "boot" 46BOOTDD_VOLUME_ID ?= "boot"
@@ -52,7 +52,7 @@ DISK_SIGNATURE[vardepsexclude] = "DISK_SIGNATURE_GENERATED"
52build_boot_dd() { 52build_boot_dd() {
53 HDDDIR="${S}/hdd/boot" 53 HDDDIR="${S}/hdd/boot"
54 HDDIMG="${S}/hdd.image" 54 HDDIMG="${S}/hdd.image"
55 IMAGE=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect 55 IMAGE=${IMGDEPLOYDIR}/${IMAGE_NAME}.hdddirect
56 56
57 populate_kernel $HDDDIR 57 populate_kernel $HDDDIR
58 58
@@ -104,13 +104,13 @@ build_boot_dd() {
104 dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 104 dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512
105 dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 105 dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512
106 106
107 cd ${DEPLOY_DIR_IMAGE} 107 cd ${IMGDEPLOYDIR}
108 108
109 if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect ]; then 109 if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ]; then
110 rm -f $(readlink -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect) 110 rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect)
111 fi 111 fi
112 112
113 ln -sf ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect 113 ln -sf ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect
114} 114}
115 115
116python do_bootdirectdisk() { 116python do_bootdirectdisk() {
@@ -145,13 +145,13 @@ DISK_SIGNATURE_GENERATED := "${@generate_disk_signature()}"
145 145
146run_qemu_img (){ 146run_qemu_img (){
147 type="$1" 147 type="$1"
148 qemu-img convert -O $type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.$type 148 qemu-img convert -O $type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type
149 149
150 if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type ]; then 150 if [ "${RM_OLD_IMAGE}" = "1" ] && [ -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type ]; then
151 rm -f $(readlink -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type) 151 rm -f $(readlink -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type)
152 fi 152 fi
153 153
154 ln -sf ${IMAGE_NAME}.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type 154 ln -sf ${IMAGE_NAME}.$type ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type
155} 155}
156create_vmdk_image () { 156create_vmdk_image () {
157 run_qemu_img vmdk 157 run_qemu_img vmdk
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 52c740c384..f6ebbca5f3 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -120,7 +120,7 @@ def rootfs_variables(d):
120 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS', 120 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS',
121 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS', 121 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS',
122 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', 122 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS',
123 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED'] 123 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR']
124 variables.extend(rootfs_command_variables(d)) 124 variables.extend(rootfs_command_variables(d))
125 variables.extend(variable_depends(d)) 125 variables.extend(variable_depends(d))
126 return " ".join(variables) 126 return " ".join(variables)
@@ -442,7 +442,7 @@ python () {
442 cmds.append("\t" + image_cmd) 442 cmds.append("\t" + image_cmd)
443 else: 443 else:
444 bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t) 444 bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t)
445 cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}")) 445 cmds.append(localdata.expand("\tcd ${IMGDEPLOYDIR}"))
446 446
447 # Since a copy of IMAGE_CMD_xxx will be inlined within do_image_xxx, 447 # Since a copy of IMAGE_CMD_xxx will be inlined within do_image_xxx,
448 # prevent a redundant copy of IMAGE_CMD_xxx being emitted as a function. 448 # prevent a redundant copy of IMAGE_CMD_xxx being emitted as a function.
@@ -560,7 +560,7 @@ python set_image_size () {
560# 560#
561python create_symlinks() { 561python create_symlinks() {
562 562
563 deploy_dir = d.getVar('DEPLOY_DIR_IMAGE', True) 563 deploy_dir = d.getVar('IMGDEPLOYDIR', True)
564 img_name = d.getVar('IMAGE_NAME', True) 564 img_name = d.getVar('IMAGE_NAME', True)
565 link_name = d.getVar('IMAGE_LINK_NAME', True) 565 link_name = d.getVar('IMAGE_LINK_NAME', True)
566 manifest_name = d.getVar('IMAGE_MANIFEST', True) 566 manifest_name = d.getVar('IMAGE_MANIFEST', True)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 21e2ff9486..5ef6f60b89 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -42,9 +42,9 @@ XZ_THREADS ?= "-T 0"
42ZIP_COMPRESSION_LEVEL ?= "-9" 42ZIP_COMPRESSION_LEVEL ?= "-9"
43 43
44JFFS2_SUM_EXTRA_ARGS ?= "" 44JFFS2_SUM_EXTRA_ARGS ?= ""
45IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}" 45IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}"
46 46
47IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cramfs ${EXTRA_IMAGECMD}" 47IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cramfs ${EXTRA_IMAGECMD}"
48 48
49oe_mkext234fs () { 49oe_mkext234fs () {
50 fstype=$1 50 fstype=$1
@@ -64,8 +64,8 @@ oe_mkext234fs () {
64 eval COUNT=\"$MIN_COUNT\" 64 eval COUNT=\"$MIN_COUNT\"
65 fi 65 fi
66 # Create a sparse image block 66 # Create a sparse image block
67 dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=$ROOTFS_SIZE count=$COUNT bs=1024 67 dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=$ROOTFS_SIZE count=$COUNT bs=1024
68 mkfs.$fstype -F $extra_imagecmd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype -d ${IMAGE_ROOTFS} 68 mkfs.$fstype -F $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype -d ${IMAGE_ROOTFS}
69} 69}
70 70
71IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" 71IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}"
@@ -75,16 +75,16 @@ IMAGE_CMD_ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}"
75MIN_BTRFS_SIZE ?= "16384" 75MIN_BTRFS_SIZE ?= "16384"
76IMAGE_CMD_btrfs () { 76IMAGE_CMD_btrfs () {
77 if [ ${ROOTFS_SIZE} -gt ${MIN_BTRFS_SIZE} ]; then 77 if [ ${ROOTFS_SIZE} -gt ${MIN_BTRFS_SIZE} ]; then
78 dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.btrfs count=${ROOTFS_SIZE} bs=1024 78 dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.btrfs count=${ROOTFS_SIZE} bs=1024
79 mkfs.btrfs ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.btrfs 79 mkfs.btrfs ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.btrfs
80 else 80 else
81 bbfatal "Rootfs is too small for BTRFS (Rootfs Actual Size: ${ROOTFS_SIZE}, BTRFS Minimum Size: ${MIN_BTRFS_SIZE})" 81 bbfatal "Rootfs is too small for BTRFS (Rootfs Actual Size: ${ROOTFS_SIZE}, BTRFS Minimum Size: ${MIN_BTRFS_SIZE})"
82 fi 82 fi
83} 83}
84 84
85IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs ${EXTRA_IMAGECMD} -noappend" 85IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs ${EXTRA_IMAGECMD} -noappend"
86IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" 86IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz"
87IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-lzo ${EXTRA_IMAGECMD} -noappend -comp lzo" 87IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-lzo ${EXTRA_IMAGECMD} -noappend -comp lzo"
88 88
89# By default, tar from the host is used, which can be quite old. If 89# By default, tar from the host is used, which can be quite old. If
90# you need special parameters (like --xattrs) which are only supported 90# you need special parameters (like --xattrs) which are only supported
@@ -97,11 +97,11 @@ IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE
97# In practice, it turned out to be not needed when creating archives and 97# In practice, it turned out to be not needed when creating archives and
98# required when extracting, but it seems prudent to use it in both cases. 98# required when extracting, but it seems prudent to use it in both cases.
99IMAGE_CMD_TAR ?= "tar" 99IMAGE_CMD_TAR ?= "tar"
100IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} ." 100IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} ."
101 101
102do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" 102do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append"
103IMAGE_CMD_cpio () { 103IMAGE_CMD_cpio () {
104 (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio) 104 (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio)
105 # We only need the /init symlink if we're building the real 105 # We only need the /init symlink if we're building the real
106 # image. The -dbg image doesn't need it! By being clever 106 # image. The -dbg image doesn't need it! By being clever
107 # about this we also avoid 'touch' below failing, as it 107 # about this we also avoid 'touch' below failing, as it
@@ -114,7 +114,7 @@ IMAGE_CMD_cpio () {
114 else 114 else
115 touch ${WORKDIR}/cpio_append/init 115 touch ${WORKDIR}/cpio_append/init
116 fi 116 fi
117 (cd ${WORKDIR}/cpio_append && echo ./init | cpio -oA -H newc -F ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio) 117 (cd ${WORKDIR}/cpio_append && echo ./init | cpio -oA -H newc -F ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio)
118 fi 118 fi
119 fi 119 fi
120} 120}
@@ -123,8 +123,8 @@ ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}"
123ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" 123ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console="
124 124
125IMAGE_CMD_elf () { 125IMAGE_CMD_elf () {
126 test -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf && rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf 126 test -f ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf && rm -f ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf
127 mkelfImage --kernel=${ELF_KERNEL} --initrd=${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.cpio.gz --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD} 127 mkelfImage --kernel=${ELF_KERNEL} --initrd=${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.cpio.gz --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD}
128} 128}
129 129
130IMAGE_TYPEDEP_elf = "cpio.gz" 130IMAGE_TYPEDEP_elf = "cpio.gz"
@@ -142,20 +142,20 @@ multiubi_mkfs() {
142 142
143 echo \[ubifs\] > ubinize${vname}-${IMAGE_NAME}.cfg 143 echo \[ubifs\] > ubinize${vname}-${IMAGE_NAME}.cfg
144 echo mode=ubi >> ubinize${vname}-${IMAGE_NAME}.cfg 144 echo mode=ubi >> ubinize${vname}-${IMAGE_NAME}.cfg
145 echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs >> ubinize${vname}-${IMAGE_NAME}.cfg 145 echo image=${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs >> ubinize${vname}-${IMAGE_NAME}.cfg
146 echo vol_id=0 >> ubinize${vname}-${IMAGE_NAME}.cfg 146 echo vol_id=0 >> ubinize${vname}-${IMAGE_NAME}.cfg
147 echo vol_type=dynamic >> ubinize${vname}-${IMAGE_NAME}.cfg 147 echo vol_type=dynamic >> ubinize${vname}-${IMAGE_NAME}.cfg
148 echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg 148 echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg
149 echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg 149 echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg
150 mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} 150 mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args}
151 ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubi ${ubinize_args} ubinize${vname}-${IMAGE_NAME}.cfg 151 ubinize -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubi ${ubinize_args} ubinize${vname}-${IMAGE_NAME}.cfg
152 152
153 # Cleanup cfg file 153 # Cleanup cfg file
154 mv ubinize${vname}-${IMAGE_NAME}.cfg ${DEPLOY_DIR_IMAGE}/ 154 mv ubinize${vname}-${IMAGE_NAME}.cfg ${IMGDEPLOYDIR}/
155 155
156 # Create own symlinks for 'named' volumes 156 # Create own symlinks for 'named' volumes
157 if [ -n "$vname" ]; then 157 if [ -n "$vname" ]; then
158 cd ${DEPLOY_DIR_IMAGE} 158 cd ${IMGDEPLOYDIR}
159 if [ -e ${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ]; then 159 if [ -e ${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ]; then
160 ln -sf ${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs \ 160 ln -sf ${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs \
161 ${IMAGE_LINK_NAME}${vname}.ubifs 161 ${IMAGE_LINK_NAME}${vname}.ubifs
@@ -182,7 +182,7 @@ IMAGE_CMD_ubi () {
182 multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" 182 multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}"
183} 183}
184 184
185IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" 185IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}"
186 186
187WKS_FILE ?= "${IMAGE_BASENAME}.${MACHINE}.wks" 187WKS_FILE ?= "${IMAGE_BASENAME}.${MACHINE}.wks"
188WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" 188WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
@@ -202,7 +202,7 @@ def wks_search(files, search_path):
202WIC_CREATE_EXTRA_ARGS ?= "" 202WIC_CREATE_EXTRA_ARGS ?= ""
203 203
204IMAGE_CMD_wic () { 204IMAGE_CMD_wic () {
205 out="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}" 205 out="${IMGDEPLOYDIR}/${IMAGE_NAME}"
206 wks="${WKS_FULL_PATH}" 206 wks="${WKS_FULL_PATH}"
207 if [ -z "$wks" ]; then 207 if [ -z "$wks" ]; then
208 bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." 208 bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately."
@@ -361,4 +361,4 @@ IMAGE_TYPES_MASKED ?= ""
361 361
362# The WICVARS variable is used to define list of bitbake variables used in wic code 362# The WICVARS variable is used to define list of bitbake variables used in wic code
363# variables from this list is written to <image>.env file 363# variables from this list is written to <image>.env file
364WICVARS ?= "BBLAYERS DEPLOY_DIR_IMAGE HDDDIR IMAGE_BASENAME IMAGE_BOOT_FILES IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD ISODIR MACHINE_ARCH ROOTFS_SIZE STAGING_DATADIR STAGING_DIR_NATIVE STAGING_LIBDIR TARGET_SYS" 364WICVARS ?= "BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE HDDDIR IMAGE_BASENAME IMAGE_BOOT_FILES IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD ISODIR MACHINE_ARCH ROOTFS_SIZE STAGING_DATADIR STAGING_DIR_NATIVE STAGING_LIBDIR TARGET_SYS"
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index f72d9b25ec..6c8c1ff60e 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -2,7 +2,7 @@ inherit image_types kernel-arch
2 2
3oe_mkimage () { 3oe_mkimage () {
4 mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \ 4 mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
5 -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot 5 -d ${IMGDEPLOYDIR}/$1 ${IMGDEPLOYDIR}/$1.u-boot
6 if [ x$3 = x"clean" ]; then 6 if [ x$3 = x"clean" ]; then
7 rm $1 7 rm $1
8 fi 8 fi
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index b38b6a50c5..07e265c5ac 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -15,7 +15,7 @@ ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
15ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' 15ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}'
16 16
17# Write manifest 17# Write manifest
18IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest" 18IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.manifest"
19ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " 19ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; "
20# Set default postinst log file 20# Set default postinst log file
21POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" 21POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
@@ -217,7 +217,7 @@ python write_image_manifest () {
217 from oe.rootfs import image_list_installed_packages 217 from oe.rootfs import image_list_installed_packages
218 from oe.utils import format_pkg_list 218 from oe.utils import format_pkg_list
219 219
220 deploy_dir = d.getVar('DEPLOY_DIR_IMAGE', True) 220 deploy_dir = d.getVar('IMGDEPLOYDIR', True)
221 link_name = d.getVar('IMAGE_LINK_NAME', True) 221 link_name = d.getVar('IMAGE_LINK_NAME', True)
222 manifest_name = d.getVar('IMAGE_MANIFEST', True) 222 manifest_name = d.getVar('IMAGE_MANIFEST', True)
223 223
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 35d9eed00c..9b0c2c7fc6 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -72,7 +72,7 @@ syslinux_hddimg_populate() {
72} 72}
73 73
74syslinux_hddimg_install() { 74syslinux_hddimg_install() {
75 syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg 75 syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg
76} 76}
77 77
78syslinux_hdddirect_install() { 78syslinux_hdddirect_install() {
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 7c620e938b..a348b975c2 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -19,7 +19,7 @@ class Rootfs(object, metaclass=ABCMeta):
19 self.d = d 19 self.d = d
20 self.pm = None 20 self.pm = None
21 self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True) 21 self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True)
22 self.deploy_dir_image = self.d.getVar('DEPLOY_DIR_IMAGE', True) 22 self.deploydir = self.d.getVar('IMGDEPLOYDIR', True)
23 self.progress_reporter = progress_reporter 23 self.progress_reporter = progress_reporter
24 24
25 self.install_order = Manifest.INSTALL_ORDER 25 self.install_order = Manifest.INSTALL_ORDER
@@ -182,12 +182,12 @@ class Rootfs(object, metaclass=ABCMeta):
182 182
183 bb.utils.mkdirhier(self.image_rootfs) 183 bb.utils.mkdirhier(self.image_rootfs)
184 184
185 bb.utils.mkdirhier(self.deploy_dir_image) 185 bb.utils.mkdirhier(self.deploydir)
186 186
187 shutil.copytree(postinst_intercepts_dir, intercepts_dir) 187 shutil.copytree(postinst_intercepts_dir, intercepts_dir)
188 188
189 shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), 189 shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"),
190 self.deploy_dir_image + 190 self.deploydir +
191 "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt") 191 "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt")
192 192
193 execute_pre_post_process(self.d, pre_process_cmds) 193 execute_pre_post_process(self.d, pre_process_cmds)
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py
index 08e382f2b7..d015c49087 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -113,9 +113,9 @@ class ImageFeatures(oeSelfTest):
113 image_name = 'core-image-minimal' 113 image_name = 'core-image-minimal'
114 bitbake(image_name) 114 bitbake(image_name)
115 115
116 deploy_dir = get_bb_var('DEPLOY_DIR_IMAGE') 116 deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE')
117 link_name = get_bb_var('IMAGE_LINK_NAME', image_name) 117 link_name = get_bb_var('IMAGE_LINK_NAME', image_name)
118 image_path = os.path.join(deploy_dir, "%s.ext4" % link_name) 118 image_path = os.path.join(deploy_dir_image, "%s.ext4" % link_name)
119 bmap_path = "%s.bmap" % image_path 119 bmap_path = "%s.bmap" % image_path
120 120
121 # check if result image and bmap file are in deploy directory 121 # check if result image and bmap file are in deploy directory
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 dc621d60a6..1911d4cb52 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
@@ -32,7 +32,7 @@ BA_INCLUDE_SOURCES ??= "0"
32 32
33IMAGE_CMD_ext4_append () { 33IMAGE_CMD_ext4_append () {
34 # We don't need to reserve much space for root, 0.5% is more than enough 34 # We don't need to reserve much space for root, 0.5% is more than enough
35 tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 35 tune2fs -m 0.5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4
36} 36}
37 37
38fakeroot do_populate_poky_src () { 38fakeroot do_populate_poky_src () {
@@ -101,9 +101,9 @@ create_bundle_files () {
101 cd ${WORKDIR} 101 cd ${WORKDIR}
102 mkdir -p Yocto_Build_Appliance 102 mkdir -p Yocto_Build_Appliance
103 cp *.vmx* Yocto_Build_Appliance 103 cp *.vmx* Yocto_Build_Appliance
104 ln -sf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk 104 ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk
105 zip -r ${DEPLOY_DIR_IMAGE}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance 105 zip -r ${IMGDEPLOYDIR}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance
106 ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${DEPLOY_DIR_IMAGE}/Yocto_Build_Appliance.zip 106 ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${IMGDEPLOYDIR}/Yocto_Build_Appliance.zip
107} 107}
108create_bundle_files[vardepsexclude] = "DATETIME" 108create_bundle_files[vardepsexclude] = "DATETIME"
109 109