From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6677870985578807296 X-Received: by 2002:adf:eb01:: with SMTP id s1mr1309657wrn.5.1554812999740; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5582:: with SMTP id i2ls4405640wrv.1.gmail; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwR1LPxMLS3oucsXkDQnl53pv65zvZ8rqKYuWly9r32/Loj/ry1faumN5ujwiJFbKDYKHWD X-Received: by 2002:a5d:6189:: with SMTP id j9mr1276232wru.0.1554812999284; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554812999; cv=none; d=google.com; s=arc-20160816; b=rgkvS0/sJ5RgE8WIRBYUUtm/HAp4WPvMC0AkLQybMn+y0yIV8odM4YDFfjlVtbQaot qkIPK09ZtebDz/Qvqzyq7INleAwAPcviynXAj0HvsuhRUeVZRuvrH38zdBQRJNq9OF7n 3kDotXLOrGOSiu14xSNHzsKfxcKZXSpKdUOrSIZuu6btqcl0YxtKl0GpCGbWQC5YMocQ V0008myzzMSPiDufTnH7Shz73PgFsDkmFpYOWhaSXYSm/AfzxhT/aaeNqP1PVWp/qbQk NtwxMppwZ6wmqmiFE/53KN7PwOL27jKwlVbNFzKaB7B0R/jjNY/6EWmvLg32zzFPmRuG lSsA== 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=yGXA38LZNcSU+TeR+NiK32KqmG6INnjWOAQP3nQe+M0=; b=PK3oRURCW/k2P1U0wD0Zmb7xqFU1EaKNVoi2dGoO9u/XzSmj9sg6Y7IbIgbmUmJXmP KojP5+weWHz43ibQZsLtUtSiRIXmx+pJ/hO4JQKJbtc8XHcq6xJwSWjyMspIhAz7nH1x r8OSko+u8hQ4BJckJvkx4qk9yu2jESfM6Y88LBAZN+u1fiaxjQofV1MdrEI9/tpKBfsU e5wB5xgpn5n5FL1lX2A6XiQ2vjFjXTGf5f8JioQHHCZbLB6HCNV1CD2iPcG9E1k7UAYK KHb/MwAWaol9rDoKsYf19+D/P/VW89AiWAwwXBVaPgYpQvq7w8STfNX/zgLHnproRpQd JD+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s8si693868wme.0.2019.04.09.05.29.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 05:29:59 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x39CTw4A012880 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Apr 2019 14:29:58 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x39CTvkE031413; Tue, 9 Apr 2019 14:29:58 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 5/8] meta/image classes: refactor task stamps Date: Tue, 9 Apr 2019 14:29:12 +0200 Message-Id: <20190409122915.14249-6-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409122915.14249-1-claudius.heine.ext@siemens.com> References: <20190409122915.14249-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: IT1mn320das2 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 2620de9..4c698e5 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -5,8 +5,6 @@ EXT4_IMAGE_FILE = "${IMAGE_FULLNAME}.ext4.img" IMAGER_INSTALL += "e2fsprogs" -do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" - # Generate ext4 filesystem image do_ext4_image() { rm -f '${DEPLOY_DIR_IMAGE}/${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 e6e8542..660f85c 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 87042f4..5141a93 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} --one-file-system -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 09d9f2e..7a4a29b 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -89,8 +89,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 += "\ @@ -129,8 +127,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