From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7091532167862288384 X-Received: by 2002:a2e:b0ef:0:b0:24f:ddc:cfd1 with SMTP id h15-20020a2eb0ef000000b0024f0ddccfd1mr13624387ljl.519.1651125999153; Wed, 27 Apr 2022 23:06:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:b1c:b0:472:38f0:bc75 with SMTP id w28-20020a0565120b1c00b0047238f0bc75ls870775lfu.0.gmail; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytFxJt8h4Gga4bzk9pxgj5vOYyrod7GdbkIAyU6FF/CTc3VXvy6698PPAhIqBNWu3JtmtP X-Received: by 2002:ac2:5319:0:b0:471:fc6e:674f with SMTP id c25-20020ac25319000000b00471fc6e674fmr16786981lfh.493.1651125998202; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651125998; cv=pass; d=google.com; s=arc-20160816; b=B0QTioaa9bBcrYvc4/U7SEWOWj1+MBVjEF6o4HMzGMzbMQ1f7c6JJKBmnIL7MfqmFq rbOE7kC6X4gPzfgr/c3UpYjcxh1tiAxrB/zcI7borbvhdtMA7kELVLp6kd/Me9nKlj18 +qpOZcvE36OgjkyBNOXb3+pNvydBaVPoTEZL8uQ2wEOM5Nkh7QpzA6tPkeVPiBR6F1gV RZOMDhZqlymE26T6ZtVDZ0s1OQIzSinYdDIPTuDAmqdMInVBgFVV+DSq61aaCzeloZGD RhcLPoo8UrrcakjejqistmK3JqshAhyF3p0kPr8+onOCSGaZ5LbTWDlpI8ZZZ0lm5NuY hXiQ== 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=YdvXthH/kSy0Qt1/Qujq16XJXXQtWqJF/PoYSPykSnHPu3yD1CbBnYnxpmaiuwXpil x8THhzvPLww1p108p6IDJf0vvhc04wU4GVV+aID/fFXzqGoC26pkH2OtafAzaK2CXK/W Ce62x9m4YIUdHj1nIkIF7NZKBH6dTobM2g14ajhkVJ68k3d1+wFnF7xZdzZ1EGWgAp1B klC7/HYMpYRC/NcP988Yc4KT7FMdsVm30Y2FXuiRJASkVYaYK6opdN/+rpN1ut234XIQ Y8ZxpGUE7vjcbxuG1KF38BZIdjGgZ1fiSsSysXRZITGKxmFJ382vhRxi3Vx6Ic4h7NQz YVLg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=BjOAlCYo; 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::602 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-vi1eur05on20602.outbound.protection.outlook.com. [2a01:111:f400:7d00::602]) by gmr-mx.google.com with ESMTPS id d22-20020a0565123d1600b0047223e9d7c6si157097lfv.4.2022.04.27.23.06.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:38 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::602 as permitted sender) client-ip=2a01:111:f400:7d00::602; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=BjOAlCYo; 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::602 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=a0NGzIy3+gBGwIHcRrhXC+StQ8Or9Gkr5ZBPSfGEWmtOr9fCvm3KSmtft6CHxSnTaE/o/Or55svhDk2A7M1Ey1n+5eYVrxN38H8pHKAUVYpWGwM4BCqqJ7cwNbHgcL9ej1YkXkbVquIy+DAb49TzH53gXXEneOqAYiSVYBFioW7V6nHl6thG0xZP5smLO1S4VhV0ByjeIvjJofS0z2Z1GV9ovsiqeJEIGDQrRemxdGv2w1u9ZJO3NEbSdkAgr6yt0iVhsVzTocxkNDgAYJf5gyIV7Wc1Ujf4DmhTYKygGb8QVaoUtet5CqOX8VKRUxED3rHTEZsOR82t5fZGWvEisw== 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=jucYivjkqPkYe/42/Hw2vHuFgZQNhgXCymYe8K9hhkVpm8XG+j08dCe2S7Jv2g84rGlR9P/2C/y3AH289QmgdgqPzwALN927Oaz0iEdYccm6xrmT5smFflsN9/O6mChr7dT8w4uG9oAVGI29Y0FZopGmuQv22l8h9YxG5as2QMDaNt4TKFVtTf58MeGkUjCW5LR0V35vVYRpbtHl0zV0hGT9PT0l30ZtMIcM9DvGwb2S3/pL0HPAtQoraU6SrmYR7kmBtyi7U0wPvLzCIhxSqfm/7uBK/urGJtksko6Gfg+kg4251PoIehXBNkQfgYaR0dbLSCUkIdEWkKQlq1KQ2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=BjOAlCYoYtm+3JVEYN+B76ALGlkS3F2b/uiBgQ9ShLt2FtsFWZ3701ccSY9RStACYn89n76i69ds2GTtu6yG5bTmP7xnQ+J15gSqUQkkWYXRxTieeVV72eiOGB2i1XWM+58n5ssufpSuKZUx4HMjtZRTNHr+gjTg+hi6DMVBmVPrke+ybxWio8jv/C/ilc9cm86/h83MSAoekHTHLTW7fqAXRd325ke+OUmLsHXEdd7Cta8SNDW+hX/P85pocemzsWED1JGLWlmpuolCKad+XYyk61sTaHU8FZ21SHvCtv5eEtv71lDjG69p81Cd7R1vZXrXTsPKVllR46A8s4GvWw== Received: from SV0P279CA0061.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::12) by AS4PR10MB6135.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:586::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Thu, 28 Apr 2022 06:06:36 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::27) by SV0P279CA0061.outlook.office365.com (2603:10a6:f10:14::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Thu, 28 Apr 2022 06:06:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT069.mail.protection.outlook.com (10.152.1.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:35 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +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; Thu, 28 Apr 2022 08:06:33 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 1/8] image: remove IMAGE_SUFFIX Date: Thu, 28 Apr 2022 08:06:08 +0200 Message-ID: <20220428060615.986332-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-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: FA087F5164E3C6D1333D7242658FCDD58E0D48AD28E3BA631272770650FD80B12000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b09368e-5c02-4622-e659-08da28dd407f X-MS-TrafficTypeDiagnostic: AS4PR10MB6135: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: 18gcsY6sEf6UJLQCl9zkFZxg4um7l8ugDH7zQ6LuNNY0ekut5akU/fsSadBonAWCPUFXQwoM8hTjFxoWW2/jMP6F4nhDWx3AyyLUOYlPd9v91ni7WoJC/uBilPj4qlR3/tcYZsIANRfCs2n+2xtzlzOIyUmloxK+04J9YbD8aNDBmUTf9DXm6RGo9PltaZp7ZIKxIsG+SWYV3DUUCarX95BUo/A1e5ouZLPwzf4sz45i7NrIlqWcL0H34UMcO2HGLv12QX8NTxyg62Ltwv6/ZQw8ta7cbHTzAt9FC1O2gHkO+JJ7St53/qgbYWEJmdBFfUcsRSmmrWxg+SkBdCrCT172uilW447P4UKq08kh7p+VTVbZW0ZXinoNk7kKfp39z7+IBj+U6plDjEr8y/TUAZLVqb7yBjDnTRoMTdyS4Iok2ExbIiZLRar5l4b4mkH18Accmey1Sj2MX/7VQuJVszyNX/z+F0YtxGhTC7+4bxgM1UeSOxTKkqz1cbPP9HyRo0SVg406bPhD2LXkdI2j0t+3ajoD4w6/9njdQqgC+jnmNF1GE8KmTbXfvcwPWVse7bDuXJUQH7xXXGdtLMjS9Po3hJIcZS3qOHaH9SvJnec/8ucNsH/M0NOdJ5tMXot1vR+iNFXjn8OOX5sU2A3HExLW//aMS9vbr7tb6omKnQRqSMWKvmnzTG/YJrrW2IJXK5o/G47VoxgX5Q9ic6YGSg== X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(956004)(2616005)(82960400001)(356005)(83380400001)(4326008)(70586007)(8676002)(107886003)(70206006)(6916009)(316002)(86362001)(47076005)(186003)(16526019)(1076003)(336012)(7636003)(7596003)(508600001)(6666004)(40460700003)(26005)(36860700001)(8936002)(44832011)(5660300002)(36756003)(2906002)(82310400005)(403724002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:35.8229 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b09368e-5c02-4622-e659-08da28dd407f 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB6135 X-TUID: B100LR2gqwU9 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