From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a05:6512:1107:b0:44a:62dc:dd0f with SMTP id l7-20020a056512110700b0044a62dcdd0fmr4342209lfg.479.1650005800021; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f16:b0:449:f5bf:6f6a with SMTP id y22-20020a0565123f1600b00449f5bf6f6als5947259lfa.2.gmail; Thu, 14 Apr 2022 23:56:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPg4wKauwFvd9b+ervhMCWMHG4DfI/3AJFuBoxRaUeel4gcEOXvsVqWLaWXm20T+1p7c45 X-Received: by 2002:a05:6512:12c3:b0:44a:27c2:b0a2 with SMTP id p3-20020a05651212c300b0044a27c2b0a2mr4283009lfg.325.1650005798669; Thu, 14 Apr 2022 23:56:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005798; cv=pass; d=google.com; s=arc-20160816; b=jWrC1vtJkGJGzUVHuGjeiZcCzlSyFMrzuD55dsslOzS9psrOTftAge4TUaGZP0WVc2 J8BOtLlcX/nXQ1xubvshEM0CcXyC9Tv42hEtERh0NlgBc01A9PAC3J1VH2SMJbw4E9yD SYFJys/WMBfMgJiO/yHPGH/7vWXZKCBdBKZTJ8zugalSG2zgSrUJ9SzSZzSzw6OGnDI8 AM5+RD7Wj9/pajMmnmaAzQrZH2FjFelSHT9WbYw0yNlJSIiIbKZBZCFMYQUP6fF+bE91 45sk7GTdkU5UmsOjDHoF7B3Lcx5SStC9L3bAESjIM40XWdj/CoRItThpfEXch9fS2cA+ rErg== ARC-Message-Signature: i=2; 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:dkim-signature; bh=lHIplNhv8qWtlvk26nKUEJeYn/eyjq7hYZi/ZPRUhZ4=; b=FwwxPBI4S/lz+p6OvFx2uo54kH7xnLb8ltD6Ug6qg3fP1VGP9SVH/xySIHDYUP1K2K EYGhhxw2rAdKU5ReDU1yA4HAyvlywGmDPeyXqMa4w33IOw1wQXDsbqFcYmhQehQyhgSx nUn/a0eaKVZgoEyUDR2/CNh09gya0he2fLNvhFmeUC8Zporraig0xgBqaPwqozOIXxRC ntNXWgF4USgmOl37y/x4rRzQiwCZXTsHRYILs8u2KWAmiZzQu0YqvbOyadh9SDOlUQ0O SjTtp8a7LOCrQlGXijhSRV4B0LB6mL3LysXhfvczv8kyjK57o3nDQsQnaEhaYD656adt Bz7A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SnbwAH1f; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::615 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20615.outbound.protection.outlook.com. [2a01:111:f400:7d00::615]) by gmr-mx.google.com with ESMTPS id m2-20020a0565120a8200b0044af4a5b540si48020lfu.7.2022.04.14.23.56.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:38 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::615 as permitted sender) client-ip=2a01:111:f400:7d00::615; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SnbwAH1f; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::615 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MV4aAUS9PtA2azHaxDUjX1DK5/Q+uUnT55bys0fgQ6fFiaHHVSwR4fhulS7psgkVaZSABrQM48JAt/FtH3KPud2xcwFM0GWZqEfdTIRZu0deqpWX0sPfD159Xta2Dm9o2R0Td2Rd2GxWdv5B4CEL/mnzmdo8B26KUHSSS0sUQ5RM4HdtrWIXdIsTPw7HpF/KeRs/ODJ+y8Jexivr5e5gP3mLtpEvJvnWVBwwzow/dFbdb813o407b8O7+vjO83k2fiP1lBcI9rFNjNA23WhwNQuqsaGA2hwhECWvUHVhAPig9DYbjCvLUteOltzrhJ5CpeJFXppej5JfnmjrQaQUcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lHIplNhv8qWtlvk26nKUEJeYn/eyjq7hYZi/ZPRUhZ4=; b=a0RwZGdM63VVA9TAGh1XLM/qscArzSCq2E7G4YklRAR1eTwj8i+HpxbaVpehcYxDi7y21IfOusv04bA+J8eEQBO46Ezo8lu8rhLB4s23LZSjiEfEoqe0/iRmv+5svAvQ54qoFrGFkDm+j+6l2idoQxybITjDDOq5/CoViNp9ItLN8YbcZS+DRJDGyUwx+eRg9G8Lcdl9oI3Ico02pNfnL+hQaxgl2vhU+umugxANVvWbdlTQeyX/UDEqvIJb+LJ6RLLWe1lRm/fqOfVlRJ0mJxnHLfmcVqpmP2mz1jDn7yCjZqFGjlfiJJdXqxsAC4J9xdYbCpAd6rZp5tCTlhmwGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lHIplNhv8qWtlvk26nKUEJeYn/eyjq7hYZi/ZPRUhZ4=; b=SnbwAH1fOQgAIa5Jm0/O6VHu8i9EOssXgDK41e5pVUmNocJNryUwyRp/lVjbb2qBrx8T3AACRAfNGW9c9taR0hCBYemjdQ5Sc3GrxYhDPQPc+1paeS5sZF+Wf4OIamxIRJa8UA0wmCO7zghBUe4cdm6uG2TefxnmCrn1b9oVjXhn0iiEAQ+8LENV9Uy5Tmzx0kxA6y1cgLp0tGc4spVxwvSy3M9CY42xMVmk3ozmOZsSPpKvB5Au15t3RVkewTY4wv6LmRFDVev9izvBZvaN9sjGoSe06qBhwGvRJTpmblF+eM0vvL7P47yaAMMNnO9jYC51J4vRTGkoViuocFCsVQ== Received: from DB8PR03CA0032.eurprd03.prod.outlook.com (2603:10a6:10:be::45) by PA4PR10MB4461.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:100::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:37 +0000 Received: from DB5EUR01FT056.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:be:cafe::53) by DB8PR03CA0032.outlook.office365.com (2603:10a6:10:be::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by DB5EUR01FT056.mail.protection.outlook.com (10.152.5.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:36 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 15 Apr 2022 08:56:36 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 15 Apr 2022 08:56:35 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 1/7] image: remove IMAGE_SUFFIX Date: Fri, 15 Apr 2022 08:56:11 +0200 Message-ID: <20220415065617.1910954-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: adriaan.schmidt@siemens.com X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--10.336100-8.000000 X-TMASE-MatchedRID: IIyI5q76PIUQwVtkLIfLLXr9azWb8PX1hi9FMLqxZlReu6aRt5rYyff6 ZSoNZQrICwWRLqiC/Uoz1brXqR2bWa3aC25avUuaOUMH3UOqTuB4lxq7pFBUUY1GwXh+kBzqmTM khNp6sQUvfU/riSJXkQXkFZhSLf2GCBG3yFdIPKTE1vMT2mVskU9h1xunNeYingIgpj8eDcAZ1C dBJOsoY8RB0bsfrpPIfiAqrjYtFiQE5m8DEVpZULfnadCslCIFwvAel6fG+EVcNLSNvi2SJn7cG d19dSFd X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--10.336100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 83C873BD57D754A92F58020C07D480B23573B048251157F3FD3CC9EADB65218D2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0603db5c-a984-4198-70f0-08da1ead15ca X-MS-TrafficTypeDiagnostic: PA4PR10MB4461:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 13Vdw6nSSsLlWhia0LltkbhHL0lb2XJ/zWwiuhPCGT6fndEn0tsiPQmqgPiaE4jLiDd1vz5VuP16Rjw+ptzE69AvRMlTtFbFKrUYB0DSKhlyitooVs5SpM3jfZkaKX5mSzBvGXM2OUWEjSCOONOHGwX3h4LUkRKJ4psBY75f5QaMXx5EIcjmFlrfQNYtLCL5oeI//CDwBkA47X0kge2lA5048VzgIq218KgvUrr2ScBOAmVsUOMMDsNyAzIsEzdGRO3O2qZJVyIUN6GHBoxzUs5hXSQbil7zKX1fROArYrlCgFhaf3LFl6KrjLVWRwnu+F2b+YJGfMc78+gXhx8EJUVZROiFYuuwTpvah6a6jSoKDRQ7bayUPGOQkVlh4OSKv8ELCcAeZzZWvzOBGRAFssSlN9nGbvaXs1bOOXazyPmjfCou5M21nxeR/ygnQwMjuMAdZ95GSJP7EYBH43fsdGNTrs29P4Ev6Ncmc8krzCqKJghh+dUUwmO34hwaHGDqG49e78aD/FlVg+mM6YYWXhIzIKiB/QYbj5FasPhXHfiSxLFNGAopWFh77yDsAGeq5i6sFHJGZWR6os4Zb86qOqD6uayl7F8Dck/IVAin2d16/JBwNYURWfarYD973o+IKEobqyYKOTo+CtBiOmTY5OyoHIjnZEjLUPgV5Em+R+KRUatfzJSif/ofCoi4bbK5NtBuSqXOzEo0DaVPGU6qxKQ7v2Ze8xcL+KZ4i0xQD0VWX4lrJIghn8AEpjHoqvkk X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(336012)(47076005)(83380400001)(6916009)(186003)(356005)(4326008)(36756003)(26005)(107886003)(16526019)(2616005)(956004)(86362001)(40460700003)(1076003)(8676002)(70586007)(70206006)(8936002)(5660300002)(82310400005)(36860700001)(498600001)(82960400001)(81166007)(2906002)(44832011)(6666004)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:36.9485 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0603db5c-a984-4198-70f0-08da1ead15ca X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT056.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB4461 X-TUID: saIG36nowVb0 It is no longer required, and removing it enables sharing of rootfs data between image types. Signed-off-by: Adriaan Schmidt --- meta/classes/image.bbclass | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index eb879ffe..8899d1e9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -1,15 +1,13 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -# Replace possible multiple spaces with single underscores -IMAGE_SUFFIX = "${@'_'.join(d.getVar("IMAGE_FSTYPES", True).split())}" # Make workdir and stamps machine-specific without changing common PN target -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}" -STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}" -STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/*-*" +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" # Sstate also needs to be machine-specific -SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}-${IMAGE_SUFFIX}" +SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}" IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4-img"}" @@ -29,7 +27,7 @@ INITRD_IMAGE ?= "${IMAGE_FULLNAME}-initrd.img" DTB_FILES ?= "" # Useful variables for imager implementations: -PP = "/home/builder/${PN}-${MACHINE}-${IMAGE_SUFFIX}" +PP = "/home/builder/${PN}-${MACHINE}" PP_DEPLOY = "${PP}/deploy" PP_ROOTFS = "${PP}/rootfs" PP_WORK = "${PP}/work" -- 2.30.2