From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7199542182322110464 X-Received: by 2002:a05:6808:13cc:b0:37b:78cd:3be1 with SMTP id d12-20020a05680813cc00b0037b78cd3be1mr2036788oiw.86.1676274045240; Sun, 12 Feb 2023 23:40:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:4984:0:b0:51a:6e9c:dd6d with SMTP id z126-20020a4a4984000000b0051a6e9cdd6dls481418ooa.10.-pod-prod-gmail; Sun, 12 Feb 2023 23:40:44 -0800 (PST) X-Google-Smtp-Source: AK7set/e1+4Mtii2xnxOS5e0b/umLWwFDpdlwXc8z/7EQgyg3YB1SVWrQYrkqfq5/YyMkOautx6N X-Received: by 2002:a4a:4588:0:b0:517:4246:73f2 with SMTP id y130-20020a4a4588000000b00517424673f2mr12529744ooa.9.1676274044704; Sun, 12 Feb 2023 23:40:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676274044; cv=none; d=google.com; s=arc-20160816; b=PBKOTlmXbQ4VPp9RF7YsGxC2qZ3z7BIx4ZFDXApWnU5Lx5Tsvik7JriitFs+/5r7hp a2JVBzr3jah3Xc1a7yY+ZnB8mI6l6uH5J6rwIgVo766gw3MCr5EBkz4Ejusya4cG2QIj kIDp6WD2Q3LvH78Y2g+m5exO6TFHoXaSCklR8nOjWFJgFUg+sHBh4aCzAlrKJ4eGpiOj k62M2RqfF7+ouW4OD5m002WrpH3g2TeyoHK8F+Y91O+Ku2g3dTk0QIsAQ9fwXjk44rGb W6vdBBkq9sLvdh8iR4x5+znC9htn31WlrKmUphXceWXVkA1o+zi8y09DoKUK2XN0wwpo VGNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=DKnivTavXKrkTLTf8TBkEusrLptRx07Z58JBvWmpGiQ=; b=or9dVkN2iOUln9sKO0JqgxZ+4X/xnmJXYqoiONyWQT13EJqfE6TfacKxnBjB0FwZg4 BKtNGiHxfofOzvWlg0JVDHhKvULpF7Kjmgen3Uhr1F8L1bxD1kp9Il/wtrgWzqUxAhMo G7qVSzqWbwpIxVf1sB7J8+Pw+WeqLFQRSs6qe2iT0uPwYtEsxZc6vSg8Ke5KsVrhl8GY n1utOLr+d4a+zdE0WTLJ6LO15IxpHI/U2aku/c9XMz5A7xWwHPF8u9wYU+qUukce/aA2 iIPULoYbKHdfQs1vNsLpqX78qtEUvZwDSoGjxaI6mYltnr72GVrLHOKIZwRqjGHmzlYB iO/w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id j18-20020a4ad192000000b004f52827c8b8si991373oor.2.2023.02.12.23.40.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Feb 2023 23:40:44 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.. ([85.254.74.215]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31D7eapx003492 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Feb 2023 08:40:42 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 3/6] imager: Move image types to schroot Date: Mon, 13 Feb 2023 09:40:31 +0200 Message-Id: <20230213074034.3949-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230213074034.3949-1-amikan@ilbers.de> References: <20230213074034.3949-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: wtBHLfV3I20Q Run imagetype-related commands inside schroot session during images prepare steps. Signed-off-by: Anton Mikanovich --- meta/classes/image.bbclass | 7 ++- meta/classes/imagetypes_vm.bbclass | 9 +-- meta/classes/imagetypes_wic.bbclass | 89 ++++++++++------------------- 3 files changed, 38 insertions(+), 67 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index f47e301..146d69e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -157,7 +157,7 @@ inherit ${IMGCLASSES} # convenience variables to be used by CMDs IMAGE_FILE_HOST = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.${type}" IMAGE_FILE_CHROOT = "${PP_DEPLOY}/${IMAGE_FULLNAME}.${type}" -SUDO_CHROOT = "sudo chroot ${BUILDCHROOT_DIR}" +SUDO_CHROOT = "imager_run -d ${PP_ROOTFS} -u root --" # hook up IMAGE_CMD_* python() { @@ -229,7 +229,6 @@ python() { imager_build_deps.add(dep) # construct image command - cmds.append('\timage_do_mounts') image_cmd = localdata.getVar('IMAGE_CMD:' + bt_clean) if image_cmd: localdata.setVar('type', bt) @@ -394,6 +393,10 @@ python do_image_tools() { } addtask image_tools before do_build after do_rootfs +# all imagetypes are depend on schroot and isar-apt +do_image_tools[depends] = "${SCHROOT_DEP} isar-apt:do_cache_config" +do_image_tools[deptask] = "do_deploy_deb" + python do_image() { """Virtual task""" pass diff --git a/meta/classes/imagetypes_vm.bbclass b/meta/classes/imagetypes_vm.bbclass index 81ef866..dd84038 100644 --- a/meta/classes/imagetypes_vm.bbclass +++ b/meta/classes/imagetypes_vm.bbclass @@ -4,8 +4,6 @@ # This class allows to generate images for VMware and VirtualBox # -inherit buildchroot - USING_OVA = "${@bb.utils.contains('IMAGE_BASETYPES', 'ova', '1', '0', d)}" FILESEXTRAPATHS:prepend := "${LAYERDIR_core}/classes/vm-img:" @@ -38,9 +36,8 @@ CONVERSION_OPTIONS = "${@set_convert_options(d)}" convert_wic() { rm -f '${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}' - image_do_mounts bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${SOURCE_IMAGE_FILE}" - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + imager_run -p -d ${PP_WORK} -- \ /usr/bin/qemu-img convert -f raw -O ${VIRTUAL_MACHINE_IMAGE_TYPE} ${CONVERSION_OPTIONS} \ '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${VIRTUAL_MACHINE_DISK}' } @@ -83,7 +80,7 @@ IMAGE_CMD:ova() { export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") export OVA_FIRMWARE_UPPERCASE=$(echo ${OVA_FIRMWARE} | tr '[a-z]' '[A-Z]') export OVF_TEMPLATE_STAGE2=$(echo ${OVF_TEMPLATE_FILE} | sed 's/.tmpl$//' ) - sudo -Es chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} <<'EOSUDO' + imager_run -p -d ${PP_WORK} <<'EOIMAGER' set -e export DISK_SIZE_BYTES=$(qemu-img info -f vmdk "${VIRTUAL_MACHINE_DISK}" \ | gawk 'match($0, /^virtual size:.*\(([0-9]+) bytes\)/, a) {print a[1]}') @@ -100,6 +97,6 @@ IMAGE_CMD:ova() { tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.mf fi tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} -EOSUDO +EOIMAGER } IMAGE_CMD:ova[depends] = "${PN}:do_transform_template" diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index b0b27a9..ed3067a 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -83,8 +83,6 @@ python () { bb.build.addtask('do_transform_template', 'do_image_wic', None, d) } -inherit buildchroot - IMAGER_INSTALL:wic += "${WIC_IMAGER_INSTALL}" # wic comes with reasonable defaults, and the proper interface is the wks file ROOTFS_EXTRA ?= "0" @@ -95,7 +93,6 @@ STAGING_DIR ?= "${TMPDIR}" IMAGE_BASENAME ?= "${PN}-${DISTRO}" FAKEROOTCMD ?= "${SCRIPTSDIR}/wic_fakeroot" RECIPE_SYSROOT_NATIVE ?= "/" -BUILDCHROOT_DIR = "${BUILDCHROOT_TARGET_DIR}" WIC_CREATE_EXTRA_ARGS ?= "" WIC_DEPLOY_PARTITIONS ?= "0" @@ -145,26 +142,11 @@ check_for_wic_warnings() { do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" IMAGE_CMD:wic() { - wic_do_mounts generate_wic_image check_for_wic_warnings } -wic_do_mounts[vardepsexclude] += "BITBAKEDIR" -wic_do_mounts() { - buildchroot_do_mounts - sudo -s <<'EOSUDO' - ( flock 9 - set -e - for dir in ${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} ${BITBAKEDIR}; do - mkdir -p ${BUILDCHROOT_DIR}/$dir - if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then - mount --bind --make-private $dir ${BUILDCHROOT_DIR}/$dir - fi - done - ) 9>${MOUNT_LOCKFILE} -EOSUDO -} +SCHROOT_MOUNTS += "${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} ${BITBAKEDIR}" generate_wic_image[vardepsexclude] += "WKS_FULL_PATH BITBAKEDIR TOPDIR" generate_wic_image() { @@ -177,50 +159,39 @@ generate_wic_image() { mkdir -p ${IMAGE_ROOTFS}/../pseudo touch ${IMAGE_ROOTFS}/../pseudo/files.db - # create the temp dir in the buildchroot to ensure uniqueness - WICTMP=$(cd ${BUILDCHROOT_DIR}; mktemp -d -p tmp) - - sudo -E chroot ${BUILDCHROOT_DIR} \ - sh -c ' \ - BITBAKEDIR="$1" - SCRIPTSDIR="$2" - WKS_FULL_PATH="$3" - STAGING_DIR="$4" - MACHINE="$5" - WICTMP="$6" - IMAGE_FULLNAME="$7" - IMAGE_BASENAME="$8" - shift 8 - # The python path is hard-coded as /usr/bin/python3-native/python3 in wic. Handle that. - mkdir -p /usr/bin/python3-native/ - if [ $(head -1 $(which bmaptool) | grep python3) ];then + imager_run -p -d ${PP_WORK} -u root <<'EOIMAGER' + set -e + + # The python path is hard-coded as /usr/bin/python3-native/python3 in wic. Handle that. + mkdir -p /usr/bin/python3-native/ + if [ $(head -1 $(which bmaptool) | grep python3) ];then ln -fs /usr/bin/python3 /usr/bin/python3-native/python3 - else + else ln -fs /usr/bin/python2 /usr/bin/python3-native/python3 - fi - export PATH="$BITBAKEDIR/bin:$PATH" - "$SCRIPTSDIR"/wic create "$WKS_FULL_PATH" \ - --vars "$STAGING_DIR/$MACHINE/imgdata/" \ - -o "/$WICTMP/${IMAGE_FULLNAME}.wic/" \ + fi + + export PATH="${BITBAKEDIR}/bin:$PATH" + + "${SCRIPTSDIR}"/wic create "${WKS_FULL_PATH}" \ + --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ + -o "/tmp/${IMAGE_FULLNAME}.wic/" \ --bmap \ - -e "$IMAGE_BASENAME" $@' \ - my_script "${BITBAKEDIR}" "${SCRIPTSDIR}" "${WKS_FULL_PATH}" "${STAGING_DIR}" \ - "${MACHINE}" "${WICTMP}" "${IMAGE_FULLNAME}" "${IMAGE_BASENAME}" \ - ${WIC_CREATE_EXTRA_ARGS} + -e "${IMAGE_BASENAME}" ${WIC_CREATE_EXTRA_ARGS} + + WIC_DIRECT=$(ls -t -1 /tmp/${IMAGE_FULLNAME}.wic/*.direct | head -1) + mv -f ${WIC_DIRECT} ${PP_DEPLOY}/${IMAGE_FULLNAME}.wic + mv -f ${WIC_DIRECT}.bmap ${PP_DEPLOY}/${IMAGE_FULLNAME}.wic.bmap + # deploy partition files if requested (ending with .p) + if [ "${WIC_DEPLOY_PARTITIONS}" -eq "1" ]; then + # locate *.direct.p partition files + find "/tmp/${IMAGE_FULLNAME}.wic/" -type f -regextype sed -regex ".*\.direct.*\.p[0-9]\{1,\}" | while read f; do + suffix=$(basename $f | sed 's/.*\.direct\(.*\)/\1/') + mv -f ${f} ${PP_DEPLOY}/${IMAGE_FULLNAME}.wic${suffix} + done + fi +EOIMAGER sudo chown -R $(stat -c "%U" ${LAYERDIR_core}) ${LAYERDIR_core} ${LAYERDIR_isar} ${SCRIPTSDIR} || true - WIC_DIRECT=$(ls -t -1 ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head -1) - sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} - mv -f ${WIC_DIRECT} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic - mv -f ${WIC_DIRECT}.bmap ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.bmap - # deploy partition files if requested (ending with .p) - if [ "${WIC_DEPLOY_PARTITIONS}" -eq "1" ]; then - # locate *.direct.p partition files - find ${BUILDCHROOT_DIR}/${WICTMP} -type f -regextype sed -regex ".*\.direct.*\.p[0-9]\{1,\}" | while read f; do - suffix=$(basename $f | sed 's/.*\.direct\(.*\)/\1/') - mv -f ${f} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic${suffix} - done - fi - rm -rf ${BUILDCHROOT_DIR}/${WICTMP} + sudo chown -R $(id -u):$(id -g) ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic* rm -rf ${IMAGE_ROOTFS}/../pseudo } -- 2.34.1