From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6670845595705409536 X-Received: by 2002:a2e:8719:: with SMTP id m25mr2200497lji.50.1553177273793; Thu, 21 Mar 2019 07:07:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:59dc:: with SMTP id x28ls333138lfn.9.gmail; Thu, 21 Mar 2019 07:07:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqxTTLhHZY0qFLU95hr3gsNCyQXxrQcxZ7Uau0QKckNVdtkPKluYMVgkwX+WWe407mI/XlXl X-Received: by 2002:a19:7105:: with SMTP id m5mr2172033lfc.154.1553177273116; Thu, 21 Mar 2019 07:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553177273; cv=none; d=google.com; s=arc-20160816; b=hzmBcxz9Lt6+daBscTu518xNTlQ2DBcSwlfcCMvlS6uGxuB7bY6Un9kyPOcZCp3Xz8 ot32swyqTEgRA0lPFU2i3ffJHsQZv3cQsk1+gQHx7mebeasH1ARDgVQUVqXJFQg3bfYq OTdrL1cv2gHsz6HxtFWLR7d40WJfOMQq4wpAzkWzg7BOBLZTbi5rMeTu1Xymn9b8PCB2 n/hbn6sf357b9H/tLrz+x5IyKzLtw+gDrekBsj29ClG7Ps2j8NZ3R5QQPak8GVWYnMT4 IToN/WXIAcjOkJelvubL2XDe5/NsfRs9b0Lbd6IfOtnlXAbs7peTYjFpe7ZF5dT8YpVF Ej2g== 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=M2R/9AIZIDvJHiZZoNmSyIq4FHKfoeBxdV//7EZurv4=; b=Bs71PN3l6gg+kUqsYqhM0jjLGjJGeAc+qAtm4/+EUCMJwhBr3Dv712zGwwwMrwS1gy NPjOTowQcp+5RQTVswF64a/0mVAH3FVk+nJarhuiWJeqMNLn1sQu7nbZXYNlktp2qubX cp9bwCDGQX9IlQWssGtgLCLs2XgklrYxaWiStd4nXsgWWgOciidtVUxpr7UqeQi015+B YR7Eyi1NchhhlgH4LiVbIcjf8UoKIsqcVI4TxNBAfL6UaDfHAhvI60aRPEeuOC+ruIuz JiyvhAhGEZx/+WvxNG9KLO8cp+cIYXNGNFmyYphyXVW0tdb+bdTFRZ7SE6IX8qAVRQir sdhw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h14si329586lja.2.2019.03.21.07.07.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 07:07:53 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x2LE7p8M025845 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Mar 2019 15:07:52 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x2LE7pIR021259; Thu, 21 Mar 2019 15:07:51 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 1/3] meta/image classes: refactor task stamps Date: Thu, 21 Mar 2019 15:07:45 +0100 Message-Id: <20190321140747.573-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190321140747.573-1-claudius.heine.ext@siemens.com> References: <20190321140747.573-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: XfEq2zjuAQVp From: Claudius Heine This patch adds 'DISTRO' and 'MACHINE' to 'PF' and removes the 'WORKDIR' declaration in the 'image.bbclass'. This way each 'PN', 'DISTRO', 'MACHINE' tripel will have their own 'WORKDIR' and 'STAMP' directory. 'stamp-extra-info' settings for 'DISTRO' and 'MACHINE' is no longer necessary for each task. Signed-off-by: Claudius Heine --- meta/classes/ext4-img.bbclass | 2 -- meta/classes/fit-img.bbclass | 2 -- meta/classes/image.bbclass | 16 +++------------- meta/classes/targz-img.bbclass | 2 -- meta/classes/ubi-img.bbclass | 2 -- meta/classes/ubifs-img.bbclass | 2 -- meta/classes/wic-img.bbclass | 4 ---- 7 files changed, 3 insertions(+), 27 deletions(-) diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 29e5f77..5eac507 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -3,8 +3,6 @@ EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ext4.img" -do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" - # Generate ext4 filesystem image do_ext4_image() { rm -f ${EXT4_IMAGE_FILE} diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass index edca09f..be0cbfe 100644 --- a/meta/classes/fit-img.bbclass +++ b/meta/classes/fit-img.bbclass @@ -13,8 +13,6 @@ FIT_IMAGE_FILE ?= "${IMAGE_FULLNAME}.fit.img" IMAGER_INSTALL += "u-boot-tools device-tree-compiler" -do_fit_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" - # Generate fit image do_fit_image() { if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3ba755f..7cbe555 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -1,6 +1,8 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH +PF = "${PN}-${DISTRO}-${MACHINE}" + IMAGE_INSTALL ?= "" IMAGE_TYPE ?= "ext4-img" IMAGE_ROOTFS = "${WORKDIR}/rootfs" @@ -8,7 +10,7 @@ IMAGE_ROOTFS = "${WORKDIR}/rootfs" IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" # Name of the image including distro&machine names -IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" +IMAGE_FULLNAME = "${PF}" # These variables are used by wic and start_vm KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}" @@ -38,8 +40,6 @@ DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}" IMAGE_TRANSIENT_PACKAGES += "isar-cfg-localepurge isar-cfg-rootpw" -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${MACHINE}/${PN}" - ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" @@ -173,10 +173,6 @@ isar_image_cleanup() { ' } -do_fetch[stamp-extra-info] = "${DISTRO}-${MACHINE}" -do_unpack[stamp-extra-info] = "${DISTRO}-${MACHINE}" - -do_rootfs[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_rootfs[depends] = "isar-apt:do_cache_config isar-bootstrap-target:do_bootstrap" do_rootfs[deptask] = "do_deploy_deb" @@ -197,8 +193,6 @@ do_mark_rootfs() { "${IMAGE_ROOTFS}" } -do_mark_rootfs[stamp-extra-info] = "${DISTRO}-${MACHINE}" - addtask mark_rootfs before do_copy_boot_files do_transform_template after do_rootfs do_copy_boot_files() { @@ -227,7 +221,6 @@ do_copy_boot_files() { addtask copy_boot_files before do_build after do_rootfs do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" -do_copy_boot_files[stamp-extra-info] = "${DISTRO}-${MACHINE}" SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}" @@ -256,7 +249,6 @@ do_populate_sdk() { ln -Tfsr ${SDKCHROOT_DIR}/rootfs ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH} } -do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" addtask populate_sdk after do_rootfs @@ -265,7 +257,6 @@ inherit base-apt-helper do_cache_base_repo[depends] = "base-apt:do_cache_config" do_cache_base_repo[lockfiles] = "${REPO_BASE_DIR}/isar.lock" -do_cache_base_repo[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_cache_base_repo() { if [ -d ${WORKDIR}/apt_cache ]; then @@ -319,6 +310,5 @@ do_install_imager_deps() { do_install_imager_deps[depends] = "buildchroot-target:do_build" do_install_imager_deps[deptask] = "do_deploy_deb" do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -do_install_imager_deps[stamp-extra-info] = "${DISTRO}-${MACHINE}" addtask install_imager_deps before do_build diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass index ef3748e..0a0ece7 100644 --- a/meta/classes/targz-img.bbclass +++ b/meta/classes/targz-img.bbclass @@ -5,8 +5,6 @@ TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz" -do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" - do_targz_image() { rm -f ${TARGZ_IMAGE_FILE} sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} . diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass index f61a940..f34ac84 100644 --- a/meta/classes/ubi-img.bbclass +++ b/meta/classes/ubi-img.bbclass @@ -16,8 +16,6 @@ UBI_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubi.img" IMAGER_INSTALL += "mtd-utils" -do_ubi_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" - # Generate ubi filesystem image do_ubi_image() { if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass index ed37357..dcf9eb9 100644 --- a/meta/classes/ubifs-img.bbclass +++ b/meta/classes/ubifs-img.bbclass @@ -14,8 +14,6 @@ UBIFS_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubifs.img" IMAGER_INSTALL += "mtd-utils" -do_ubifs_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" - # Generate ubifs filesystem image do_ubifs_image() { rm -f '${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE}' diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index 5a451a0..3ca8607 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -101,8 +101,6 @@ FAKEROOTCMD ?= "${ISARROOT}/scripts/wic_fakeroot" RECIPE_SYSROOT_NATIVE ?= "/" BUILDCHROOT_DIR = "${BUILDCHROOT_TARGET_DIR}" -do_wic_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" - WIC_CREATE_EXTRA_ARGS ?= "" WICVARS += "\ @@ -141,8 +139,6 @@ do_rootfs_wicenv[prefuncs] = 'set_image_size' WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.img" -do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" - do_wic_image() { buildchroot_do_mounts sudo -s <<'EOSUDO' -- 2.20.1