From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6670845595705409536 X-Received: by 2002:a05:600c:2309:: with SMTP id 9mr14431819wmo.52.1553584999042; Tue, 26 Mar 2019 00:23:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:b406:: with SMTP id d6ls2297467wmf.2.canary-gmail; Tue, 26 Mar 2019 00:23:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyA7o054ux9JmpWDd5DlAXIbFjIVrC3KpbbLbNW3rFhLyruf0LOhR2srpZwm62Vu3FVrqEk X-Received: by 2002:a1c:81cc:: with SMTP id c195mr615483wmd.61.1553584998604; Tue, 26 Mar 2019 00:23:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553584998; cv=none; d=google.com; s=arc-20160816; b=saf6FO9DQLs3cTXZCKQUCbKFTCofJt05/rVBeyZXKhgBffgXpjLU8HR0YeDFIh8pAo ZljlKtR1pyfJVogTk/lbvi0Evtb3aDAdjJOJJMOjyoEsew9QVdZf7WjgwXf1lGPGXuo1 7/YfWbRRYbLPXea0P/iYAKf4S5cnWcJJmuT2SbtB1b//CDQdjLIjnJzGOsRCZiMOkPLZ YB8hCaHUdPu9SzSJX9Da/s963UdJXotVkeJSaBUsREDzj97GEs1EI/V51LqaPJ6gA12b UwNownZfmXccm3+HK9RFJYsmBIcDp8nwGMOyTzPw3wpZFpSWlxjwmt0ChFygaM87tt1D RSuA== 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=RaH2xXCs5XspuqqNOxuG+LPxb1oNnLKPkUOqID+pP4c=; b=NslkVkQVgIQERj3d9uyAZYyrnaq4HWeJzwLYKuA/hUjRLEv3nQcEMn6E1NfJ1CwDQo fnOk8UpiZ720sgNNVjNK8QO5MxEMyjoGlJ9psMOWP2ovI8o6Do2fzmbgLAUpta8KN7gC IevJVPSovKqaPiEp8yt2nfPKKHWKgq83XGfAsI9w+GiDFdVqERy1HZCQeEa02KfXROmb NMVm5a87n7pvwHIXwcIQQWJmkKW6hfdHNeA/4FBFkxP5q8060HAFsMpCEGGq9qiLUs3V mZWzEpJas7xb1WsGQfzD+Q+AwQjxfz1FxoHoRkHz4A0TS4PD4QpdGJkDNc4qtt4dDkTT Q7hg== 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 z129si66468wmc.2.2019.03.26.00.23.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 00:23:18 -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 x2Q7NH1p009948 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Mar 2019 08:23:17 +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 x2Q7NHCD004734; Tue, 26 Mar 2019 08:23:17 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 2/4] meta/image classes: refactor task stamps Date: Tue, 26 Mar 2019 08:23:10 +0100 Message-Id: <20190326072312.10863-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326072312.10863-1-claudius.heine.ext@siemens.com> References: <20190326072312.10863-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 3GAPcmBNxThR 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 d83ae35..450b50e 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 ?= "vmlinuz" @@ -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() { @@ -225,7 +219,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}" @@ -254,7 +247,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 @@ -263,7 +255,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 @@ -317,6 +308,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