diff options
Diffstat (limited to 'meta/classes/image_types.bbclass')
-rw-r--r-- | meta/classes/image_types.bbclass | 44 |
1 files changed, 22 insertions, 22 deletions
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" | |||
42 | ZIP_COMPRESSION_LEVEL ?= "-9" | 42 | ZIP_COMPRESSION_LEVEL ?= "-9" |
43 | 43 | ||
44 | JFFS2_SUM_EXTRA_ARGS ?= "" | 44 | JFFS2_SUM_EXTRA_ARGS ?= "" |
45 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}" | 45 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}" |
46 | 46 | ||
47 | IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cramfs ${EXTRA_IMAGECMD}" | 47 | IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cramfs ${EXTRA_IMAGECMD}" |
48 | 48 | ||
49 | oe_mkext234fs () { | 49 | oe_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 | ||
71 | IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" | 71 | IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" |
@@ -75,16 +75,16 @@ IMAGE_CMD_ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}" | |||
75 | MIN_BTRFS_SIZE ?= "16384" | 75 | MIN_BTRFS_SIZE ?= "16384" |
76 | IMAGE_CMD_btrfs () { | 76 | IMAGE_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 | ||
85 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs ${EXTRA_IMAGECMD} -noappend" | 85 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs ${EXTRA_IMAGECMD} -noappend" |
86 | IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" | 86 | IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" |
87 | IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-lzo ${EXTRA_IMAGECMD} -noappend -comp lzo" | 87 | IMAGE_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. |
99 | IMAGE_CMD_TAR ?= "tar" | 99 | IMAGE_CMD_TAR ?= "tar" |
100 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} ." | 100 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} ." |
101 | 101 | ||
102 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" | 102 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" |
103 | IMAGE_CMD_cpio () { | 103 | IMAGE_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}" | |||
123 | ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" | 123 | ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" |
124 | 124 | ||
125 | IMAGE_CMD_elf () { | 125 | IMAGE_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 | ||
130 | IMAGE_TYPEDEP_elf = "cpio.gz" | 130 | IMAGE_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 | ||
185 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" | 185 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" |
186 | 186 | ||
187 | WKS_FILE ?= "${IMAGE_BASENAME}.${MACHINE}.wks" | 187 | WKS_FILE ?= "${IMAGE_BASENAME}.${MACHINE}.wks" |
188 | WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" | 188 | WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" |
@@ -202,7 +202,7 @@ def wks_search(files, search_path): | |||
202 | WIC_CREATE_EXTRA_ARGS ?= "" | 202 | WIC_CREATE_EXTRA_ARGS ?= "" |
203 | 203 | ||
204 | IMAGE_CMD_wic () { | 204 | IMAGE_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 |
364 | WICVARS ?= "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" | 364 | WICVARS ?= "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" |