From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231875531357028352 X-Received: by 2002:a1f:2903:0:b0:453:28ee:a769 with SMTP id p3-20020a1f2903000000b0045328eea769mr4085107vkp.1.1683802236995; Thu, 11 May 2023 03:50:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:3e8c:b0:436:13b6:afb3 with SMTP id m12-20020a0561023e8c00b0043613b6afb3ls1731457vsv.5.-pod-prod-gmail; Thu, 11 May 2023 03:50:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Ky9ZFlswjlcgB6/mKFgc4Y+PuZxXD2bqDVbGwxgddkhq08RRH6iqmWP/UXy5Pxkchlbiz X-Received: by 2002:a67:f047:0:b0:42c:761a:90ed with SMTP id q7-20020a67f047000000b0042c761a90edmr7726686vsm.6.1683802236305; Thu, 11 May 2023 03:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802236; cv=none; d=google.com; s=arc-20160816; b=HHNY99tHL9hP9RosIwKgA6HifITDT/oAEj0eqNsdyqgGqFPfP5WWhuZ1Bk4GYF5Hvk uL81LguoPPhX7AZknrfwA6vHIV3+Oalh4zuEeoC+jT5wzbMXe3RcoGE4sq8uZRCbYZz8 cYJ08Br89etIJMiDvf4w+rFv9j9NBonLxP3LRJrKPpjxkIOs32dda0Fm7XjGOb0SCAVN kTan2I0xHRQIDAiKYpCyQxkfeDHSDLfXmBV7wEvFFszFXloWZlFVpgDo9rwpvuW8qDi8 JwKw+eUaGc/DgSbIagA/ofydbWgEjN85MLLmAwF+9eNIsVs5bEKbX5LuTx9ifYjPRl5a XB/A== 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=z3toI1AqWUfahtsB5Ie4olo0XgGG2GGRGi25iDHa2eg=; b=1HGNbN5DnxZRZt42E2mpkjjebYt5e4ZGJ2hzGXad3SCt6mi1SM/kAGumrJDdVxhnwU 7mR169iNeCLb5xgVEM7XYS1YwHKkReEpGedHbTV/GwRalk5b+IFhhrCISMRqFRCmULxl KlFzGXfdORWOV0IqgW5jHo4Rcv6mdcQc7zRz6JVvQvJXcbTan3s9KUef8s/H1V1KIPMy pazB6R7lZqAFavwNem8zqXLRUU8ieLgwkpZgwvZ8ovL9VKoxhn3YJ6Ab1JqF1e1LYSqX x/R3AhAQVGtjFl50HD178sF3IOz3gSkcbrDalZV+v/HGpmaS5aSOoYb0tmRYCInFZM3g 5Rdw== 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 bt22-20020ab03f16000000b0077d3c410308si1015055uab.2.2023.05.11.03.50.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:36 -0700 (PDT) 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.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ03011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:30 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 3/7] imager: Move image types to schroot Date: Thu, 11 May 2023 13:50:16 +0300 Message-Id: <20230511105020.1881496-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-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: GUokHAavv1HD 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 53859eb9..42e4b0c9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -163,7 +163,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() { @@ -235,7 +235,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) @@ -409,6 +408,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 41f2af06..782b60c1 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 - OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" IMAGE_SRC_URI:ova = "file://${OVF_TEMPLATE_FILE}" @@ -35,9 +33,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}' } @@ -80,7 +77,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]}') @@ -97,6 +94,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 5be53f60..9a0bc2b7 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