From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a2e:9f4a:: with SMTP id v10mr3791812ljk.233.1644474325126; Wed, 09 Feb 2022 22:25:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:22d1:: with SMTP id g17ls2329873lfu.2.gmail; Wed, 09 Feb 2022 22:25:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCfdh5PJe9KSwAzwzANjCq9qVIPKUh97hXJERkW/gNLJ3ksoYyK161SZN30dudIFH/wam5 X-Received: by 2002:a05:6512:ac7:: with SMTP id n7mr4241906lfu.225.1644474324138; Wed, 09 Feb 2022 22:25:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644474324; cv=pass; d=google.com; s=arc-20160816; b=RhSFpRzq+/22oe3J1vJAAqkBgW66AYKlUvg04l1tAeKIw20yhmisEEnCV2V+ImHIYA gzD7hwm8yWm7anSU9+wHJTjiDAJvALgpnV8yYH0tTvxD80BhWAMluI+ELnvZ3kRUoqCF XvVH11NsUOjsKuV/tseSZhRNH7IYd9Rhc9zBoXzaDlMe0X7JF/fo151qQieQeqAr0Lio E1pZWk+epoj95nqU89rrJvrnVfI2FN7CBWWW7MpKQR9gp/67ViHEonPcjT8YeCy3AwTa FItej51icfJo0bProbQlA9Ft4MtkJKX116MPcyyU1Has9++kSQs3qUW5dE+Owwa4H5aG HKHQ== 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=poGZdcRAntOMFpB7WnpCVHX/7jCKmArp9xL9UyFiEHg=; b=JtGjOBGoXli+mTcBSyFZ4p1jOHICVkuTAHzLjz5rfE62+8aabQiWBeAmD+6cBQgnoJ HGVi5B4ie+bXBJMVfhCJ/rVX1wfetKe5dZpYEda2AYx6CDVvAbRHgUxVbR1i2aulCinN CvaA31mY+2z26Qfh9cUOFhjMpEmyIxc7AULrhBcSxg86MjBXhWwx2o369xlKGRUQVyiM Bm+QqEBEn0q+cHGl7WY8Zsy4RvQz31t2V07pFLmX/lVqEKAup+P5G9Q+W4qWDqotYf8v TBn0B7b7UF2iF0+3ZnfodyBHDxa0WJNU2VCeSou0clNS2RfNqTtb8JBzP9DtyDnpLxfJ P/dg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pRQWH+pR; 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:fe06::610 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 EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0610.outbound.protection.outlook.com. [2a01:111:f400:fe06::610]) by gmr-mx.google.com with ESMTPS id a24si991694lfb.12.2022.02.09.22.25.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:25:24 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe06::610 as permitted sender) client-ip=2a01:111:f400:fe06::610; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pRQWH+pR; 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:fe06::610 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=Wo3D56YOtvQLY/rQUbGkrZMN5bUQUyabLhsTB8fpWiohe/vAQ2M+m52M2CVnspMuRAL/gAbXhGzr83r007GnZD0OPbLuzf4/E0kNF4SanjzpMlFnSyEWHCq2FjCTf6s8bvhT6GFLL53v9FZDe12zkiMg3rgK8vvKUE0sQq534Z2GDbdvLYcpzVRo1clIpuFFV3GBFKxX65VhHjYad6fiR1LMv8FDbKtYdekYOXDtfIObvwjgMhCQwrMKliozuDCsrW72jWU7J86MvHNOKdDKErnZg2CnxFEO9jkpOL+HmnJbZO4NnjzLE2NaggVQEEIwWgLfVPeydqMYWQ4WRQOSvA== 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=poGZdcRAntOMFpB7WnpCVHX/7jCKmArp9xL9UyFiEHg=; b=JePdBGXrKKzkUR+YnguXYo0ETz7NBJT6aT+I6HAfmbiYrrqW5eEAA/dFd5xww1+OYnACgbWRkA8Cm37foAdbi33fFqLqGVgNFNGPJaSASmotaq2k5rdrsiRQ2wDzHZvvI6/uPdE+9wrxbW+JR8zDyosGFrLmZ92a7zov2B9NbwRE7XQrH6te6AN8HtqUsKb+7LZCPobaLYDK6pzrlEZaIr4wZxHIV5GnE2M3Srt7hibJOS1Y3T8GtXw3ChE7dDW4DHijkP+UtBesqkzOdCOAqmGcGvMbHF9AQsL1atuAKhyWix3kQIbS8j/b4jipeE2ABt3JN9USAUNNEOE/BD2lyw== 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=poGZdcRAntOMFpB7WnpCVHX/7jCKmArp9xL9UyFiEHg=; b=pRQWH+pRpqkzWXEHmt/Hg/6DnS52btOuaj3/CcG2HekgUTy2C8Kh68qrxEx0E2UehNC832ysAk5C4Wxi3fjQ5lfAzyZBnzqujr0RTqI7IBXkIDy2h+lDqtoqWKAax2hXx0RrxdVwagE2Fkop1bTP3I5Z94vFlOHtkVMFOz0Rn5T/5C4f9jdNdi9Jz4dOuzmwtn9eG4SGwHrCqh67w9s23ibWQK3h7NMyQNGi1MGwro1CNrcyFWsMwkN9SISf5+x0BA9sro+jtvtL8witYgvHbl4v0hk+ECeO7J8JPRD2+R9KqhbppAzggpgRA/4A9LzkDzx15Z6xrHCgJRRYswywog== Received: from AS9PR06CA0217.eurprd06.prod.outlook.com (2603:10a6:20b:45e::17) by AM9PR10MB4133.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1f4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Thu, 10 Feb 2022 06:25:22 +0000 Received: from VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45e:cafe::6b) by AS9PR06CA0217.outlook.office365.com (2603:10a6:20b:45e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14 via Frontend Transport; Thu, 10 Feb 2022 06:25:22 +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 VE1EUR01FT031.mail.protection.outlook.com (10.152.2.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4975.11 via Frontend Transport; Thu, 10 Feb 2022 06:25:22 +0000 Received: from DEMCHDC89YA.ad011.siemens.net (139.25.226.104) 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.18; Thu, 10 Feb 2022 07:25:21 +0100 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89YA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Feb 2022 07:25:20 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH 1/6] image: remove IMAGE_SUFFIX Date: Thu, 10 Feb 2022 07:24:41 +0100 Message-ID: <20220210062446.4145565-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220210062446.4145565-1-adriaan.schmidt@siemens.com> References: <20220210062446.4145565-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 DEMCHDC89YA.ad011.siemens.net (139.25.226.104) 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: U8xOoY+QaPkQwVtkLIfLLXr9azWb8PX1hi9FMLqxZlReu6aRt5rYyff6 ZSoNZQrICwWRLqiC/Uoz1brXqR2bWa3aC25avUuaOUMH3UOqTuB4lxq7pFBUUY1GwXh+kBzqmTM khNp6sQUvfU/riSJXkQXkFZhSLf2GCBG3yFdIPKTE1vMT2mVskU9h1xunNeYiq5uw61JZjZCAMu qetGVetnyef22ep6XYymsk/wUE4hpjsiBcbMhSNJrZnYj+vHC7IiAZUM9BuJohYe1qMYNxlzw4f ZjFWN0O 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: 16D53DFAB047DACAF832FC60B5281AC16F02CE17F6696EAEB6D324CFA031742B2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3e5c703-6a81-4c9b-f7c6-08d9ec5e1de9 X-MS-TrafficTypeDiagnostic: AM9PR10MB4133:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bsmaW9hHoLFd+TmsmJSVWth7T+FKYqXfXMpYsraxISBX9GrBuTKfByhTAXsBYgUmmUccyC5JDPpzxbrgbEYsnCDn+4ME3zwKqxQGsf8OVFju50r1ndNTLJZX0/3sFohevV6kkuFIm2XpHPnicDnMxe2L2W1EaYHIHDvFElGZebQdDIVY/Am0z8G1H7Mhi322g/2BMPAbBwr13TCC9TUOo1dXvD+hZJlSqvMKYVnqDAb+WEm86GYpUSCc2kwnyJP7ubAJ2Ry3He11nVKPhGbAyU+PV3AMCp0L3/mTdZp2LN2b17PYvQ0pquadC4VLdIJZ0SyvByqZP9u6SnZhzJ5546FGMdhWrtk1uLL42cFO4Ft74z4Qdu5n9UOe3a362WU0uGxehUBRte33dTRZ1+3cL5Yit3a6iHYVCSfN9vxrsYnnuhvCXECN22JWV0glPZg8wHmpG6xWvcoAAHSmCDO8CHQcVy5NpS7ZYcGVsZTZFO9DX24jImpkbp51v6xXgZ0kFIMJAe7Zw9znUELfu1WnO3pQGtXaTmYKj20phVI8wikcFmmpIfYukgdVzGqpnMZmakyVCnSoR1IDQNbvPVuSpA2g5jygfxWUaanlAw6ZIZpsNnCyXfOBpXBVgn8MwZwfjfJc4aU4uf3ZtCMUQi/y7k4CrAnQByvmpEC6FKj2XcoxakZMbbZUS+GP4z8mFPjPlLSG4FX/LJ7LB2gRH54XSw== 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)(40470700004)(36840700001)(46966006)(336012)(82310400004)(26005)(186003)(4326008)(70206006)(70586007)(16526019)(83380400001)(8676002)(86362001)(5660300002)(44832011)(356005)(7596003)(7636003)(2906002)(82960400001)(107886003)(2616005)(40460700003)(47076005)(316002)(6666004)(36756003)(8936002)(956004)(6916009)(1076003)(508600001)(36860700001)(403724002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:25:22.1964 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3e5c703-6a81-4c9b-f7c6-08d9ec5e1de9 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: VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4133 X-TUID: kjd1fYN40QQU 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 6d77243c..c849e4de 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