From patchwork Thu Apr 25 07:13:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3507 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 25 Apr 2024 09:14:30 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 43P7ETqw002457 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Apr 2024 09:14:29 +0200 Received: by mail-lf1-f63.google.com with SMTP id 2adb3069b0e04-516d440f4d5sf475653e87.2 for ; Thu, 25 Apr 2024 00:14:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714029264; cv=pass; d=google.com; s=arc-20160816; b=f7hxN9DVLEEAi/dZlPYoEDh8cCl+p6BNxUM4SMbiOGoekZOJF2uZF42isuMj8+Jwn+ Gw3a9OhaFkiHXrWwvDHGqQkbM+W9Rt+e7XYqx+FjQL2tE3Ij1TpIyrRb7fMeRVDiPqNG ojPWGCJVN6ZXd33yFSQlnLKjItVfhjNTSQ/hcOMVXDrIA3JAxjQbOfS/k2DkcR3R0gmW SNNgZRXqthiPpZa07OrfxRDPZCIpUd+s0RWzOQnJupGa2ElTOdq1wVSYxpO2fqBNYBko Q1F2FT/zVFzGkTfvAb3liuyhmhBmhYbrc1bW/jM9agf+MrnRR70HqIm8YuMvISAjtF4Q NTYg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:to:from:dkim-signature; bh=KDNhea2S1paeo21jeSF8sDwqFKc+2dUXCK5lQpB4v1o=; fh=8595yEqYz3Mz4dHQyN+lJLOUG5+0lCQBY2+GPweaQoY=; b=WU0b0h2RV5rNFVDXH/sc5liJB7febJkoL44Je9DgofGjbd5otP4roDwhqJOETrEIVU ZU39iI6tST1TuaNhY7wSqJTVZ6eE7TaSULp8yXRL5K9JAs52DTCpKXwjUWwJPRSrG2nm SyttaeXTz5pJp0JSKgcK/GlEeLY6nvuK5HhOr2E7w+bPjsKMfZt9s6kJiXfztPFGazjA uZf6OxI/aj+tuYIOm3mQzsos8gwVK7XRSkRA3fvEjX3sx7myzrymLgD9qccNw4mjc4g6 Kb8STwAQQK6y2yP4p/spZDxeS5KmV/FhHderHcmUhYo6OKWUWfEzZ8J8OoV0I+Q3hR+p T+Mg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Rnizv1lJ; spf=pass (google.com: domain of fm-51332-202404250714203042f6ab5593337a0a-b60o9c@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-202404250714203042f6ab5593337a0a-b60o9C@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1714029264; x=1714634064; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=KDNhea2S1paeo21jeSF8sDwqFKc+2dUXCK5lQpB4v1o=; b=FDHnhRmjoWPudFQwRRhJ2NeB0h1h+WedSy7CGb6p4IYvh/XEYdQ2xJ2AzGEUqX9E9v SAEnE6A7QTsVR9AYmYslXJUAJ2OuWfR0qH9fk+lyLbw2MZaBO1C9WfaN/WV6Z8kSEgYt mGt7PF1N6J1X9fb/ZUphFQGu6umSbMNnC3v2hpp0bFSS6HUciPy1TQB4QCNDOeaLSSfY 5Zz/5WFPK9xSO+4rY8fFBYOqvgwvMSbEOUGrywdtnnlD6DtLS9x//qqGjL06huvcbs1d nl2j11EOIjq0kZr40qhUrTPtsUWdWI1bTEqscF/P6Qta+i0xyGMZi2tL2vmSj4pGtSSX Yqng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714029264; x=1714634064; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KDNhea2S1paeo21jeSF8sDwqFKc+2dUXCK5lQpB4v1o=; b=ZEKX81ZjQlUC2yhoUZ407ujvOPLazXwlVHHJmZwrj0CZqIoSfyOqPvw4wrtQ8ojrGm FKOhtI/YFAnPGMrlvqZOeiEXQidLHpS+/WkXzp87C01wrZwoY7SwmHQg5KIgbA54Hloq 73jyaYq271g0MvwgmSpfpEfRs1EYkF2/XVY5V2b+jhTbJh+IgSfLYwVO1RDQ+Dkx8Xfr w2zYgCYKdZwI1qOu6HQz0nEyymdrvTMdP7Kg8kXl13pOfLK5c04gCW70KuBGRY6bi5ub h65ZWZk+PKgRdDWvnPvGyTY70D6+Uyf0ibYvtHXcHkO/0Yxpy2yTUlaMpBJNcPL3xD1s 9g7w== X-Forwarded-Encrypted: i=2; AJvYcCXFDYztPhh2iGYkqGqwJgGbmK6/dGpy1oKMM1UDn9WvOudhV1wcOYKFIgavKKVsePwuuRmDEdlXKj1nS//idfPzl1qz1vI= X-Gm-Message-State: AOJu0Yzq/OYVGPdohtLs5ZWBegXCsSLBc8fcZzJJGWse/N04T/X94MMH wlgQHjPWvJ9CpVY8MmObmNPnaQhU7WyyjB1rDL0OGZ/126ECCsJ0 X-Google-Smtp-Source: AGHT+IFJL3QfLlOol439OJT5aFNiuqeYbI1aE+gRlEpD/PI8yww74lL91GcVcvcpV+Vh4NiLibparQ== X-Received: by 2002:a19:700b:0:b0:51b:149b:299d with SMTP id h11-20020a19700b000000b0051b149b299dmr3139915lfc.49.1714029263125; Thu, 25 Apr 2024 00:14:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4010:b0:572:3465:bcec with SMTP id 4fb4d7f45d1cf-5723baaf549ls367483a12.2.-pod-prod-07-eu; Thu, 25 Apr 2024 00:14:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUqHHd4JnQVMi6HH8dNKv7swJ8/4KWfFq64u972cITyZZphIKnbgXRINLRs2korOS1jy6xsyM3vIvs9pm6fqGyEJ9sFOr2x0bkLnGE= X-Received: by 2002:a50:f61e:0:b0:56b:dd0f:52e0 with SMTP id c30-20020a50f61e000000b0056bdd0f52e0mr3137701edn.18.1714029261276; Thu, 25 Apr 2024 00:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714029261; cv=none; d=google.com; s=arc-20160816; b=wE9t1KmCTEYp9Qo5eQPBjjM7kqR/XyRJxYQMD/pEDehblCOFUljgQC+FOjV/XFUJjp 4iDZudPQz4pPjPTyO+Ly0qx9rTkxsEaiH/4bptvYTFSmVX3oKQH1gNj0yQXgHaGR97a+ w5lsTHMbBepSGJtqQwpUQWpjlMaayrjSeVMCzlyd9NOvPkcU4Y4q0H14MFDzFFVbH2Wd iLEUzIVX8QHVAHkRnbMxSlfpvQ/cLSf6KdIgFVUnkHHavX91deCgSAhBXHVAgToISut3 gZ8oUd4yg+XIyT4rJ1CpU1goaCxP13qOGVY3s+vN99d+F+5EZqM6EHjoo8Fj4Mankabi ir4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:to:from:dkim-signature; bh=oktJiCJwfEWSQo59GkT+SV2UoXDrpc7bi9V6O9T3T5w=; fh=Jq2zqfuvFtwAjgHfuadW1i31L6IMRIKMCRCFNbvS4Mo=; b=zzYegTYbXyG/vCaDkYVl5pUL7G1UB41bK++kKJRd78Q62+W10cV4RvsItBxonUaBtk eJ/yRbXoqfdBYkWbkmUDKqlICryOufPY0MoGTFYuYB3FgxlXl3QnFhzBXVnfmAwvvrTt qFH2T988f6wbBfZtNxO6bCgdK95Z2Cbx9AweCrPj2Vls0BxebQ9vPJMa2eHQOe5g5cKZ ETTf7TnqZlsSffCQbF8HZwr9KFOM+KZQgKfR89AuuXp92PWxFPSAg4s+DMHe52jKaOoC 55h//kFwDj+2PGD6+12TfjUEBSDwvRzeDaUr9Xo03OaGztl+AfWm9vZP3mHBJ+G2fNhH D1tQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Rnizv1lJ; spf=pass (google.com: domain of fm-51332-202404250714203042f6ab5593337a0a-b60o9c@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-202404250714203042f6ab5593337a0a-b60o9C@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id h15-20020a50cdcf000000b0057051ef3286si732458edj.5.2024.04.25.00.14.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2024 00:14:21 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-202404250714203042f6ab5593337a0a-b60o9c@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202404250714203042f6ab5593337a0a for ; Thu, 25 Apr 2024 09:14:20 +0200 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" From: Quirin Gylstorff To: felix.moessbauer@siemens.com, isar-users@googlegroups.com, jan.kiszka@siemens.com Subject: [PATCH v2] classes/rootfs: remove content of /dev, /run and vmlinux old Date: Thu, 25 Apr 2024 09:13:03 +0200 Message-ID: <20240425071419.292013-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Rnizv1lJ; spf=pass (google.com: domain of fm-51332-202404250714203042f6ab5593337a0a-b60o9c@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-202404250714203042f6ab5593337a0a-b60o9C@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Quirin Gylstorff `/dev` and `/run` contain artifacts from the ISAR build clean them up for reproducability. Signed-off-by: Quirin Gylstorff --- Changes v2: - move deletion to do_rootfs_finalize this avoids some race conditions during build - remove content of /run - remove symblic link /vmlinuz.old meta/classes/image.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 98741da0..4af0d448 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -427,12 +427,17 @@ do_rootfs_finalize() { rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt mountpoint -q '${ROOTFSDIR}/dev' && \ - umount -l ${ROOTFSDIR}/dev + umount -l -R ${ROOTFSDIR}/dev && \ + rm -rf ${ROOTFSDIR}/dev/* + mountpoint -q '${ROOTFSDIR}/proc' && \ umount -l ${ROOTFSDIR}/proc mountpoint -q '${ROOTFSDIR}/sys' && \ umount -l ${ROOTFSDIR}/sys + rm -rf ${ROOTFSDIR}/run/* + rm -f ${ROOTFSDIR}/vmlinuz.old + if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then mv "${ROOTFSDIR}/etc/apt/sources-list" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"