From patchwork Mon Jul 20 08:13:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5262 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 20 Jul 2026 10:14:11 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f192.google.com (mail-oi1-f192.google.com [209.85.167.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 66K8E7mW019594 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 Jul 2026 10:14:08 +0200 Received: by mail-oi1-f192.google.com with SMTP id 5614622812f47-495b4a78694sf16093752b6e.0 for ; Mon, 20 Jul 2026 01:14:08 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1784535242; cv=pass; d=google.com; s=arc-20260327; b=HBqhG5rkSf54ta9bhFhf+8SbuO4G5Hdp94f7DBMekULuKBBUgPTM9xten15HNhPWlP V+mi+jXOcrBavzT9Woydp3n9yl9wfnBDSaXednSavc8sCEpQRBb3Xe0pyF8nBZUYLl7d 8Raa9qTnyCo0NW6kbgmvvjV/gDnxALtSaGPcnFQ4m6ssFEM92zdr3PY3vN5I1Fd85Kea UgqMMqyxNAf28oKtexV7qvsDUoQKYGxYZcvXRAfcrtSWhb8bkAXgzIqKHScIAtqveuGC EiU0LJJ505hybyegYT0bvqGZGir6aM1l6AiddgleGHldFojVtp2NsynWaDHWCKAEp+Xv nFNA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=qb7cQeP9UJ+6Tm5EN7EmSMSWs+ef9Bstrd+EQdR5WZw=; fh=QPtxCGhURBuPxdkMRzr5m29o59qGoQLup8w1z4JieoE=; b=EUjzASL2njxHMMkbfmNaEYyi30+u97hVn6esoW4kAPwYg3plb/C7NSEjs7CU6SrK65 bQxpy/+gKAJEJ/xnhoTNIa4JAPUdVMVSh1fcREo/DD8cQL4yf9FHb8kQ4qu0WEKdKqPr iwBAsDG82tirwdoANC7Zz3IQOb/ezxiYDTsAoe0wA3Nw981ZYrD2/t4h7YvtPmJ/KTYH qWLJHe6W4dTvY05XySsmELpJ6l4Jk7ntysoAYsF6ZwgysN4LIHiYR1h1RNGx3HWCyZEA wAl1VzhtuBVp7Zf3USD/F8pzRA6bZMYj6NNJaO34kx5Oy9G/eURnWNNtr8cFMyzot2tq xDRQ==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=zudFfZQK; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) smtp.mailfrom=felix.moessbauer@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=20251104; t=1784535242; x=1785140042; 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:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=qb7cQeP9UJ+6Tm5EN7EmSMSWs+ef9Bstrd+EQdR5WZw=; b=c7MEgpfqHQfm8tUUVknsmq6rWBpnme1gtUyqyHw7hfYc3pbFHNm3i8lYe1zn6sxWCX v+AdQ0DloruvFXhs4KKgJDOi+QcPfLCn/wAcr9xKA1/XNwRIZIp6vaqCg6eQFu4amsAh qjmF8qrkv6Pm+9iCaO9dt4Hvh8Gwmb7ygSSE7IIYG1SfZfcq+RTl4hb7mpA+v/WkWU9Q rpQo7sePS2o6uE3cAY1KbNMbqCQj/l1Hamh/zmUQno3rwC3LZJLQVqbeSQb9pbKhvqTO JaLdebkF3R3YPXdf8sHDn1K9S17oEkJMPZcftCTSb0P1CGmL/ZfQ5qhh19kX5kumUqK7 8IKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784535242; x=1785140042; 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:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=qb7cQeP9UJ+6Tm5EN7EmSMSWs+ef9Bstrd+EQdR5WZw=; b=c+UHjR33vlS2jSfzsxUmXJH+HRBPHVtNRBnJGWP2H3UiIpVX0qu1F3IKuKOcR2+FGx y1dtWQHzIOkekm3mif5R+JSR1rPvs9TDXDyXGyD7eA1QpL9qF2KxiALhl0Omyo8FfN7l h6laOMk8/ReIUsQ2u+VBfLw/0ifXGNyeO0+MgIsj2RHsVpU6zfGLO/9O+nLJeaquJCfA ci4S/hIsOOg9OUQd1xxpTeuZdESj1bDdO9tk01UFALtYleTM6BrZngRg/6ihU2WphnjX pdxlDP5nfRA5aOKALWTu5NobrYPMJOX+xhfntT0edrOYZnzJStsaDj3tVc7xJ/MstF4V 2MJQ== X-Forwarded-Encrypted: i=3; AHgh+RoR4+rdcQn06TXldnhhC7yjANFeHneBa1Ogq4trtCYB/8bDdiba3lKInZqdvTDYtVW9L1CmrVY=@isar-build.org X-Gm-Message-State: AOJu0YxnEHlNPcEunNDz4hyhfVeq8Cfmg6RthBCPRf5Zfl+CoTI34Xkb 9MT6YCPBi5LMeDnisAVywANwwKUHqL/DQnK0A8dwOpzAjkc2ncPnv3dQ X-Received: by 2002:a05:6820:2909:b0:6a3:9f54:64bb with SMTP id 006d021491bc7-6a536a86fe5mr7017928eaf.63.1784535242189; Mon, 20 Jul 2026 01:14:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="Aa7YSPQnan7m1639EFFqX86kHBOA8FBYxw5zesXjs8oSycRrfA==" Received: by 2002:a05:6820:80cc:b0:6a1:9091:d6c3 with SMTP id 006d021491bc7-6a3eefe5f04ls2967753eaf.1.-pod-prod-05-us; Mon, 20 Jul 2026 01:14:01 -0700 (PDT) X-Received: by 2002:a05:6820:1613:b0:6a1:1c1:dc85 with SMTP id 006d021491bc7-6a535b0f5c3mr6580465eaf.0.1784535241295; Mon, 20 Jul 2026 01:14:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1784535241; cv=pass; d=google.com; s=arc-20260327; b=A9CNf5qEvYWV1nt+jOIKWy01ena4CrbKKcQA4muxp2+qgFNa6nj5lY10LWKTTbntu+ AwPuPPoSzeHvRPCi6cjTxUrj5EHEvMqRpj6cFEai+/O9zAWIVHbsrXrxLicJLIsEEptW 889l4ASaJPiM+N3T4VDSpdtZlwr0nv8DKt/2Y8Qqmc890+lTGG7BY1gTAzAfB08brql7 2rkuAbPawgLZABGh4mb0XOqf6JHMDUAagu6sw8NsGgVLev58H8aPzJceWfZoGepyQS+0 XQ+BvFC9C+f6sn1JoRr2nD70qgoEkqN7erF3VMI81n5qmw+/jhFy5Ep8CoYqbkzImlR1 +qvA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=X9TsAcHaea7uSIqAIZiYt47e1tWkI4NjDuXhwi9Dj2I=; fh=MAR4IrvAhd3sEKpd2rMZmD1A3RZ1HgCziLJco30Znng=; b=S4jZaqZeNkNy0YOYkienV6ZcNCmphN4a8GEuEWXeO++9JBG9r6DGjk5c6WnEao9tSH Vx7hsiPhZB4bE5Y20KXvotYSc0/g4RbCl7zomMWXYsBfRTdKCYRC3EQhhSAykv3E+i3X GikZfZ2qPhQjrtWt3hvjjqiOipVW171Y1AghOige5FkJAzkPeWDArYfukzJxyVVnvA7V GK3KJM6LmTD/x4V3fHjhyHI7ulP2W4tMN376UTmenJqdM+W4rpg6MOFTl3hyRT7I70OD OKU8zmjC3B/8B5qFnwy7X8hAcVqyDn2n35Iu1PfL+WHq/jxcYpb134jQvhD45FHjunPm vpCg==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=zudFfZQK; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c202::7]) by gmr-mx.google.com with ESMTPS id 006d021491bc7-6a51a2215f4si335063eaf.2.2026.07.20.01.14.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 01:14:01 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) client-ip=2a01:111:f403:c202::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N0nYyojLq/cWs9QiGqXdWMGPA59YXs6cUSC1YWx3LElyYKaLE6/zF66Y1C5kOBEMIWqFMKShZbGPy+o1VL24SIp/KB9f0XMqKZSP0I4xMGPdRoTNKJ4QIoM9tQKz6bK6EZO655kcKHfGFlui/CbvurFMoOHkjqREXi+VH5oqowku7nhTDzDg41Q+wyEuFj0EIXFJ5A0gvgQ2UqVxqFssAu9+//kiVYlu2NkA8BAZXKlZx9U+WkARnu4hm+4gSfxf/HB6ZkX+JSQbcuS8fw1BqnqgQz2w/CTanQNQx62T1mJakRi3sX3phrjgK2n1oxUuI2r3+1j9eznHwxovacu2Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=X9TsAcHaea7uSIqAIZiYt47e1tWkI4NjDuXhwi9Dj2I=; b=G8c5mjRIlzJ/lFKN+Zf2iyar1fsoowQ95vgC463i0KuJWQaSStgDs2iIB4XhDKJBG2ryey/ezKoTsSDaUqlgd5riXqOy7eNT1UmlkyFAIepiUU7ozH0OwdfUl+R+jzme70+dRidyhszhhFNNa+EaPsl8YCB9iclFLdMqVrP51FVcA9OBSHAtJwDECFcHOWgd9YZ1uBqrMt2aQG0yZXSo+otKnHT9MhddOppmZHcPH2VRdLbwLkxKDho9s84r7PPciVkhb7tHP/hbOnaUNPjks9nExzttrbJ++JbXECp0h/UBiCQzrhGuF2IhqbLjRvfqJSR8aGiNbhWSsJkiPzF6yw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) by DU4PR10MB9144.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:55c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.15; Mon, 20 Jul 2026 08:13:58 +0000 Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c]) by AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c%5]) with mapi id 15.21.0202.018; Mon, 20 Jul 2026 08:13:57 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: christoph.steiger@siemens.com, Felix Moessbauer Subject: [PATCH 1/6] rootfs: capture apt-state before rootfs cleanup Date: Mon, 20 Jul 2026 10:13:42 +0200 Message-ID: <20260720081347.3835974-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260720081347.3835974-1-felix.moessbauer@siemens.com> References: <20260720081347.3835974-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR4P281CA0342.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ea::20) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|DU4PR10MB9144:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c1974ab-b7b9-4062-24ee-08dee636d8ee X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|366016|1800799024|56012099006|10067099003|11063799006|18002099003|55112099003|22082099003; X-Microsoft-Antispam-Message-Info: 4M2YR/8E95DwXkEdl+Y2tp+yYmda2DCjcj6EVCojpX7rTPKpXWl4zlXOv0eRId6j7dxsLPTMtS8aLwMjt63urskeB0REUdTDVIWpwcBdJk61KkcJipgnEyEkregQRJdI3JWGNAFXch/oWlxf9pcAoieXZUZjds+e5dqsedB9dOVFB69sT8GNb8MeEpnp3gGR7yyBJ+H+sTjSZJ98xp5Fk26lIhaiVLNia4gi/4WoRsl/a+TsYsnn1TokhNMAOeQp0DKWdJuSHCeX0KmZuSLApZitU3QTRuTEq15eBR8PmofJ7LVVWL7xMm2VQSBhIG1A4U7ZQf9FrRoZKMthC5lhlAsWgkVrKmK3EUsg94F7KP2vH8Wnv4SE5oHvWq8n0tNa7SZYlNGhINv8g3qvU+FzLJidcJ+2G9e9ls44O6E8WnqjgdzwpwsCyGUwhBmfIc5lkt15gWbsjh+wtBwH7hHysfuv5WlmbefpI9yrhHe58JFTU/ekD2tNzEsT4qNTNxcpCIOV31P9uQZB+CwtS+4E+GvALmbJZsjCPNCr+0QyZuFwAT6cmeRDI+BeBvoQ3zvOOc6lE18NqsK7ZA9mYntSFpYQq/hDXhp097smjO5D2D3g9eSDXeaH03hFPQhtWs+HdzlVdawmNRv5Fg2vXUZxO4ryjP3wAvFGXrBmCIQIHRk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(376014)(366016)(1800799024)(56012099006)(10067099003)(11063799006)(18002099003)(55112099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NPLgzCJqoUsRxnWsgdhQ49W+I/2Ty+mGxKfukpr0I6WC+5QbCltNqB+w1xqRKM5I9AxztoL639QdTjzuGIOCWKGIpBExL1F5CPG8Pk2DlIdgASIjRLbqgdwVk3iSfDRgzSNoaVhv4zQpkUaWYo59/pvKgVVpnecsrO3qrmKtZi3ggZdmv1FQ5/7ZcB0Z0cv5cfS8bsiSIkYIyQw5j6JZ5QGcqU1NINgR5cnSl0zlU6m+rVH4TLj7IAl90eBuAdKMORgGk7VCNvCAHJ/FFOtq8xvaV0H9n2T91wKIbgdNrkZA4dwUrtoQ0oY0KUnFeojGNw12o9/SpqkjtyyF1bR0wfIMxKqHCAH0IuwuTI8uLXaiIlO82kkswOxlXD4eObWKgzG+23Yi43aXx9PkZb2EEuTvQI+PMK5An0bQpofvi5Ue0J6bxWaeHu02To0RBcK0UViV6BbP5Z0j9MCTOu+hl7usmhf1hrErjtgjcPmLGFEyrfxK/WcnoZuS1Fy4QQSLYi2w/oe70JEQnQ0YrzU/9t353V4cCm/ep0tF6pthOyUevPVww6r/fVMJLzzs0dHZY/ZQCRC/OANnwEVTE8qrZ/v+87ZPMZ1SpYP64riVS/z5C0jFLU+rQpdt2bUinlde4KhcFAq7/0MLyq03kVF6IjVs0XG8ePUWLbg1bLyp2UDpaNoo6zkWnoGiZSXJzIQF6lawR/GP9MYvo3s1B6TQKLMUbczgJoUaCQjgQ9zL5NPpg4MIhIcfKevkcOCyDC6Vax0rbCWjmxizgXI2qY2aELGpUNbsP03xE5lus08SMpxg/+ake+JIJEYIUbmOvSsnU11LJVeDyvoSzPUe4qelxrHYZ/0KksdDr5r1KGtHKhZ16FjzVb+UGPbH3fLmTKH9JCDEJ39ylFP0hDIRHsta/7PRp1j/Rct8DeJtFsThS0ji/hDYtOxfL+HL8mWNU0G1Jy4xHQvO8vGIKDz5s7VBFBdi9ZhPuZfbM1kX8bUqhfpo1zlZjbIgCRBi40c9sMMTugSjSkLunGeVDcA6HNYuKG19hzfz12B0zymcb1mg9FvujyErM0jjNxaXGY6IxfnmpWLmZTCAbMV+p9Cl+Nqemt0n65ySnQM1IM8BSo+sPDA5la8eKnu/ixwjiGvVJcAzuak+y2F5K1H6RzxvDIo0BX2oHt66jT1LXX85eYMUMhZHzXgKq52zkWbdX0bl/Hqw22BWInugTWBgKCai77mQI+7zW4tkLsZzqz9LO9QKNdVT7ifIq+QwPmtv1NEK/XunK6o9635lKErayoElheELYFems4C2yz4qkHKiZsn0wrDk5YUnTDIh7JkcVwa2mP0hq14CJGfEUI2g/vVASeVNgEBp/Z462bJ3zAtbHZOZ38xEnBfU0z1HgwWsAfxhPmT9dEASws7iJdfeGs8KQtbUGqa99tLxETi2+eLwAfs8raK5/5SSDbGExyBLXfz52+0rTu6pX5YGSg1vP9YyRbKCK42VbcbkDhOIaXKjc8ZHT0AHedmBo/iP1TFaM6f6J25XCjd54u3S40etYVasVIXeEZJCIbFmKe4yUnhNCVMeQlL4n3vI5UJdEDLhVuK05hfN/oEhYUgK7DpqZu9m0js+ZYE87z53SEPRQntadCF23ncw+7HigsaHc4l+++WrUkLvBC1iK1p7Uvu8D1RWdpQ8r2MjPS3rW6yWxyOMSlceCA0QMrFC+/PWwT730aa9pInaDoiIRGYjiM+WraIW1E6aguhThJOZw52rsQKTHFa+Hjg= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c1974ab-b7b9-4062-24ee-08dee636d8ee X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2026 08:13:57.7228 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U8Tz3rXvRfM0abb6aQKj7TDqj1oNyCf+EHwKyPfkksDvNccXrNTvPKKR+U4O860TZ6wiTvfIWYmJstnd4I+bdcUusC5ZZOfbHkoMjxdSdMI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR10MB9144 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=zudFfZQK; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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?= The do_rootfs_postprocess command removes parts of the apt cache which we need for SBOM generation. On normal builds this is not a problem, as the SBOM generator runs prior to the rootfs cleanup. However, on partial rebuilds this can result in incomplete SBOMs which cannot be easily detected. This further allows to add more parallelism to the build, as the SBOM generator can run anytime after do_rootfs_install (not part of this patch). Signed-off-by: Felix Moessbauer --- meta/classes-recipe/rootfs.bbclass | 21 +++++++++++++++++++++ meta/classes/sbom.bbclass | 10 ++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass index e17f711f..16b1aa50 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -42,6 +42,8 @@ ROOTFS_FEATURES:remove:bullseye = "generate-sbom" ROOTFS_FEATURES:remove:jammy = "generate-sbom" ROOTFS_FEATURES:remove:focal = "generate-sbom" +# Capture all information needed for sbom generation +ROOTFS_APT_STATE = "apt-state.tar.zst" ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes" ROOTFS_CLEAN_FILES="/etc/hostname /etc/resolv.conf" @@ -414,6 +416,19 @@ rootfs_clear_initrd_symlinks() { run_privileged rm -f ${ROOTFSDIR}/initrd.img.old } +ROOTFS_INSTALL_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'generate-sbom', 'rootfs_capture_apt_state', '', d)}" +rootfs_capture_apt_state() { + ( cd ${ROOTFSDIR} && find usr/share/doc -name copyright -print0 ) | \ + tar -cf ${WORKDIR}/${ROOTFS_APT_STATE} --zstd -C ${ROOTFSDIR} \ + --exclude=var/lib/apt/lists/partial \ + --exclude=var/lib/apt/lists/lock \ + --exclude=var/lib/apt/lists/auxfiles \ + --null -T - \ + var/lib/apt/lists \ + var/lib/apt/extended_states \ + var/lib/dpkg/status +} + do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}" do_rootfs_install[cleandirs] += "${DEPLOYDIR}" do_rootfs_install[sstate-inputdirs] = "${DEPLOYDIR}" @@ -674,6 +689,9 @@ rootfs_install_sstate_prepare() { tar -C ${WORKDIR}/mnt/rootfs -cpSf rootfs.tar $lopts ${SSTATE_TAR_ATTR_FLAGS} . umount -q ${WORKDIR}/mnt/rootfs EOF + if [ -f ${WORKDIR}/${ROOTFS_APT_STATE} ]; then + cp ${WORKDIR}/${ROOTFS_APT_STATE} . + fi ${@ 'sudo chown $(id -u):$(id -g) rootfs.tar' if d.getVar('ISAR_CHROOT_MODE') == 'schroot' else '' } } rootfs_install_sstate_prepare[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" @@ -691,6 +709,9 @@ rootfs_install_sstate_finalize() { EOF rm rootfs.tar fi + if [ -f ${ROOTFS_APT_STATE} ]; then + mv ${ROOTFS_APT_STATE} ${WORKDIR}/${ROOTFS_APT_STATE} + fi } python do_rootfs_install_setscene() { diff --git a/meta/classes/sbom.bbclass b/meta/classes/sbom.bbclass index 2e6d579f..34efb590 100644 --- a/meta/classes/sbom.bbclass +++ b/meta/classes/sbom.bbclass @@ -50,16 +50,18 @@ EOF } generate_sbom() { - run_privileged mkdir -p \ - ${SBOM_CHROOT_LOCAL}/mnt/rootfs \ - ${SBOM_CHROOT_LOCAL}/mnt/deploy-dir + run_privileged_heredoc <<'EOF' + mkdir -p ${SBOM_CHROOT_LOCAL}/mnt/rootfs \ + ${SBOM_CHROOT_LOCAL}/mnt/deploy-dir + tar -xf ${WORKDIR}/${ROOTFS_APT_STATE} --zstd \ + -C ${SBOM_CHROOT_LOCAL}/mnt/rootfs +EOF TIMESTAMP=$(date --iso-8601=s -d @${SOURCE_DATE_EPOCH}) bwrap \ --unshare-user \ --unshare-pid \ --bind ${SBOM_CHROOT_LOCAL} / \ - --bind ${ROOTFSDIR} /mnt/rootfs \ --bind ${DEPLOY_DIR_SBOM} /mnt/deploy-dir \ -- debsbom -v generate ${SBOM_DEBSBOM_TYPE_ARGS} -r /mnt/rootfs -o /mnt/deploy-dir/'${ROOTFS_PACKAGE_SUFFIX}' \ --distro-name '${SBOM_DISTRO_NAME}' --distro-supplier '${SBOM_DISTRO_SUPPLIER}' \