From patchwork Tue Feb 13 08:56:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SCHNEIDER Johannes X-Patchwork-Id: 39235 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E956C48BC3 for ; Tue, 13 Feb 2024 08:57:33 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (EUR01-VE1-obe.outbound.protection.outlook.com [40.107.14.54]) by mx.groups.io with SMTP id smtpd.web11.7649.1707814644470151538 for ; Tue, 13 Feb 2024 00:57:25 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@leica-geosystems.com header.s=selector1 header.b=W4gCvmsh; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: leica-geosystems.com, ip: 40.107.14.54, mailfrom: johannes.schneider@leica-geosystems.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FgHWgiAMHTEi8AR+maxoGFW/ioovljU+lR5RvNHnTkOErdI9cK7zp6oTEofrrBOys8oZgZzdjc5JdbP76dT02De2tXmaH7fo13GiF1jVTBL7khq0OR621VpAm13JY7kPrk8BFlqi+GzeJhLlQ9A9i221575RsBs0cNXgb06yDaEgqalWslobrtv0rD72GK0Hhso+TFDM4KCskhHrzhKyDOxtnEWc2sUaxh9sRFJtxPPWyXrtTX/ZeiEr3uYCZEI1zbYx9joenSO4rHJ9r3toabM0r2gOiHpAaVpq7J06KMcy1+7ZiatBA0TOykBOT2LYly2ZUzWgnMdByIKOjTUJ6A== 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=tGTQTQpdi1TPEp8fIwgVP3l+SGVQ3LudWh+SNLQ51v0=; b=BTebsQ3wU0CySAA9faiikxzPx5mEcFDG/vGXVYdaCTPzXV63yQjkZ1xAfKcaSeEZuqc65wp1PcsmrqJOuofrbHc7FTeYa7SMrn2v6tkTDTcQ14XR4k57ZlBXYYuBZg3bEAZl4ee6q2hYmOVs9io4Q82M/3P2mcQlaBfeJdaFaQhORP6yyrD5Q3ldqcSx2tBGbahz97QNgA/edcdpTbWTn5z8iNRp36oE8wl67DwPcxypGp3LILrEsfgAc9QNPwJjvoOjfGuayyyYQzxm9NZAivae2f8S3n5oFEteKHUF+XQ7WC2ao3F5CpAzdSMlfL9FmlkwzIW0MtyqLRVBOL5fPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=leica-geosystems.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=leica-geosystems.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tGTQTQpdi1TPEp8fIwgVP3l+SGVQ3LudWh+SNLQ51v0=; b=W4gCvmshOUkfybS9XBvpWSgJ9NZ3WTn10OvVepYH8Ui2ANdom6B4wJvToubAxE7GGz/chbyMzgGNPtWnBidxPxSKtsATvPdRDjMwsjFY0bQDPw6/+CYr4kWlUlmFMAOt3oQGjvWyiZsp4Wx1Q1Fsa56Q3b0fejoMA8CrJdVALew= Received: from DB8PR04CA0013.eurprd04.prod.outlook.com (2603:10a6:10:110::23) by DB9PR06MB7419.eurprd06.prod.outlook.com (2603:10a6:10:260::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.39; Tue, 13 Feb 2024 08:57:20 +0000 Received: from DB5PEPF00014B95.eurprd02.prod.outlook.com (2603:10a6:10:110:cafe::14) by DB8PR04CA0013.outlook.office365.com (2603:10a6:10:110::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.38 via Frontend Transport; Tue, 13 Feb 2024 08:57:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=hexagon.com; pr=C Received: from hexagon.com (193.8.40.94) by DB5PEPF00014B95.mail.protection.outlook.com (10.167.8.233) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Tue, 13 Feb 2024 08:57:20 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.116]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Tue, 13 Feb 2024 09:57:20 +0100 From: Johannes Schneider To: openembedded-core@lists.openembedded.org CC: Johannes Schneider Subject: [PATCH v1 1/3] image.bbclass/rootfs: archive and deploy opkg package database Date: Tue, 13 Feb 2024 09:56:55 +0100 Message-ID: <20240213085658.170917-2-johannes.schneider@leica-geosystems.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240213085658.170917-1-johannes.schneider@leica-geosystems.com> References: <20240213085658.170917-1-johannes.schneider@leica-geosystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 13 Feb 2024 08:57:20.0093 (UTC) FILETIME=[A6E4C8D0:01DA5E5A] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5PEPF00014B95:EE_|DB9PR06MB7419:EE_ X-MS-Office365-Filtering-Correlation-Id: 1405bebf-8e5b-418a-f383-08dc2c71c9a8 X-SET-LOWER-SCL-SCANNER: YES X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WA4OGYhewVDrEC5s7SyEIcTi+51XkDLP1hYhfDZtA9Wq26h08oYEtAePTYJpdBO7byJVp14CCOsUoj2CDrVZUIEdG3uamF3vttTfBtDmFAgdSy+6wv8vTAxZv6S2eIuTNPK+lvSaGw1lPFcKqZaqi9vuK3gK0a+cAUNEAA75mTbRvfw5FX1s2UbjCuCMRhGhp6Qgvq4Ma0c4p4zQQlD+yde668OEHLbzGhpg4vXkF3FR0WXlsOeMcSLtJKGQ9ADORNJkAHEJ0VDnr4u6aHLT8q3Fh+Q7hOovV1geIX+FOPYAKPN+elSUaxn8XjpulH6VtyYB6e2phfEgD4WiiT3eZ3d6VwtFcNpU2bem7jhN+mqrw7mpb0PcaNYXqoyFTMUyGOVqC7TawCcKsIbyNoKeWdqFjV2EHcNaOUE4MRlP/2zuhgln+qtZulcCQqFQIkkjNOdEXQAk+fdad6tgg5mhlWL+HwkJsAARiRnu5S/ERxPDN9Hxta/In5NIYtWpKMi5V9Dwsmjn6VpLDOaSTNQBgEV0GwacmEQESVWQPLL3acY+IyBA1EQPDHCk4YDK5Lx3CXaS3R0kTn6Ad7RkvREh3w== X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:hexagon.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230031)(4636009)(376002)(396003)(136003)(39860400002)(346002)(230922051799003)(186009)(451199024)(64100799003)(1800799012)(82310400011)(36840700001)(46966006)(40470700004)(356005)(83380400001)(86362001)(81166007)(36756003)(82740400003)(2906002)(44832011)(5660300002)(70206006)(26005)(70586007)(316002)(6666004)(4326008)(6916009)(8676002)(8936002)(336012)(478600001)(41300700001)(1076003)(107886003)(2616005);DIR:OUT;SFP:1101; X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 08:57:20.5362 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1405bebf-8e5b-418a-f383-08dc2c71c9a8 X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[hexagon.com] X-MS-Exchange-CrossTenant-AuthSource: DB5PEPF00014B95.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR06MB7419 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Feb 2024 08:57:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195373 archive the package database after the rootfs has been put together as *rootfs-pkdbfs.tar.gz, and put it into the deploy folder. This creates a snapshot of the package mangers state at the point in time when all dependencies have been resolved and installed; which can be used by "follow up" images to be built upon. Signed-off-by: Johannes Schneider --- meta/classes/image.bbclass | 44 +++++++++++++++++++++-- meta/classes/image_types.bbclass | 1 + meta/conf/bitbake.conf | 1 + meta/lib/oe/package_manager/deb/rootfs.py | 1 + meta/lib/oe/package_manager/ipk/rootfs.py | 1 + meta/lib/oe/package_manager/rpm/rootfs.py | 1 + meta/lib/oe/rootfs.py | 35 ++++++++++++++++++ 7 files changed, 82 insertions(+), 2 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 00413d56d1..c8919a4857 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -36,6 +36,9 @@ IMAGE_FEATURES ?= "" IMAGE_FEATURES[type] = "list" IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging overlayfs-etc" +# Generate snapshot of the package database? +IMAGE_GEN_PKGDBFS ?= "0" + # Generate companion debugfs? IMAGE_GEN_DEBUGFS ?= "0" @@ -125,7 +128,7 @@ def rootfs_variables(d): 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS', 'IMAGE_LINGUAS_COMPLEMENTARY', 'IMAGE_LOCALES_ARCHIVE', 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS', 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', - 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS'] + 'CONVERSIONTYPES', 'IMAGE_GEN_PKGDBFS', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS'] variables.extend(rootfs_command_variables(d)) variables.extend(variable_depends(d)) return " ".join(variables) @@ -330,6 +333,19 @@ python do_image_qa_setscene () { } addtask do_image_qa_setscene +def setup_pkgdbfs_variables(d): + d.appendVar('IMAGE_ROOTFS', '-pkgdb') + if d.getVar('IMAGE_LINK_NAME'): + d.appendVar('IMAGE_LINK_NAME', '-pkgdb') + d.appendVar('IMAGE_NAME','-pkgdb') + pkgdbfs_image_fstypes = d.getVar('IMAGE_FSTYPES_PKGDBFS') + if pkgdbfs_image_fstypes: + d.setVar('IMAGE_FSTYPES', pkgdbfs_image_fstypes) + +python setup_pkgdbfs () { + setup_pkgdbfs_variables(d) +} + def setup_debugfs_variables(d): d.appendVar('IMAGE_ROOTFS', '-dbg') if d.getVar('IMAGE_LINK_NAME'): @@ -374,6 +390,11 @@ python () { alltypes = d.getVar('IMAGE_FSTYPES').split() typedeps = {} + if d.getVar('IMAGE_GEN_PKGDBFS') == "1": + pkgdbfs_fstypes = d.getVar('IMAGE_FSTYPES_PKGDBFS').split() + for t in pkgdbfs_fstypes: + alltypes.append("pkgdbfs_" + t) + if d.getVar('IMAGE_GEN_DEBUGFS') == "1": debugfs_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS').split() for t in debugfs_fstypes: @@ -386,6 +407,10 @@ python () { basetypes[baset]= [] if t not in basetypes[baset]: basetypes[baset].append(t) + pkgdb = "" + if t.startswith("pkgdbfs_"): + t = t[8:] + pkgdb = "pkgdbfs_" debug = "" if t.startswith("debugfs_"): t = t[8:] @@ -394,6 +419,13 @@ python () { vardeps.add('IMAGE_TYPEDEP:' + t) if baset not in typedeps: typedeps[baset] = set() + deps = [pkgdb + dep for dep in deps] + for dep in deps: + if dep not in alltypes: + alltypes.append(dep) + _add_type(dep) + basedep = _image_base_type(dep) + typedeps[baset].add(basedep) deps = [debug + dep for dep in deps] for dep in deps: if dep not in alltypes: @@ -412,6 +444,7 @@ python () { maskedtypes = (d.getVar('IMAGE_TYPES_MASKED') or "").split() maskedtypes = [dbg + t for t in maskedtypes for dbg in ("", "debugfs_")] + maskedtypes = [pkgdb + t for t in maskedtypes for pkgdb in ("", "pkgdbfs_")] for t in basetypes: vardeps = set() @@ -423,6 +456,11 @@ python () { continue localdata = bb.data.createCopy(d) + pkgdb = "" + if t.startswith("pkgdbfs_"): + setup_pkgdbfs_variables(localdata) + pkgdb = "setup_pkgdbfs " + realt = t[8:] debug = "" if t.startswith("debugfs_"): setup_debugfs_variables(localdata) @@ -461,6 +499,8 @@ python () { for ctype in sorted(ctypes): if bt.endswith("." + ctype): type = bt[0:-len(ctype) - 1] + if type.startswith("pkgdbfs_"): + type = type[8:] if type.startswith("debugfs_"): type = type[8:] # Create input image first. @@ -501,7 +541,7 @@ python () { d.setVarFlag(task, 'func', '1') d.setVarFlag(task, 'fakeroot', '1') - d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size') + d.appendVarFlag(task, 'prefuncs', ' ' + debug + pkgdb + ' set_image_size') d.prependVarFlag(task, 'postfuncs', 'create_symlinks ') d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages)) d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 9d5f8c68a4..cae8abd47e 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -19,6 +19,7 @@ def imagetypes_getdepends(d): fstypes = set((d.getVar('IMAGE_FSTYPES') or "").split()) fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS') or "").split()) + fstypes |= set((d.getVar('IMAGE_FSTYPES_PKGDBFS') or "").split()) deprecated = set() deps = set() diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 290dfda6c8..80607567c1 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -830,6 +830,7 @@ require conf/sanity.conf DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" IMAGE_FSTYPES ?= "tar.gz" +IMAGE_FSTYPES_PKGDBFS ?= "tar.gz" IMAGE_FSTYPES_DEBUGFS ?= "tar.gz" INITRAMFS_FSTYPES ?= "cpio.gz" diff --git a/meta/lib/oe/package_manager/deb/rootfs.py b/meta/lib/oe/package_manager/deb/rootfs.py index 8fbaca11d6..08d8aa9813 100644 --- a/meta/lib/oe/package_manager/deb/rootfs.py +++ b/meta/lib/oe/package_manager/deb/rootfs.py @@ -176,6 +176,7 @@ class PkgRootfs(DpkgOpkgRootfs): if self.progress_reporter: self.progress_reporter.next_stage() + self._setup_pkg_db_rootfs(['/var/lib/dpkg']) self._setup_dbg_rootfs(['/var/lib/dpkg']) self.pm.fix_broken_dependencies() diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py b/meta/lib/oe/package_manager/ipk/rootfs.py index 10a831994e..14bf6cac98 100644 --- a/meta/lib/oe/package_manager/ipk/rootfs.py +++ b/meta/lib/oe/package_manager/ipk/rootfs.py @@ -317,6 +317,7 @@ class PkgRootfs(DpkgOpkgRootfs): opkg_lib_dir = self.d.getVar('OPKGLIBDIR') opkg_dir = os.path.join(opkg_lib_dir, 'opkg') + self._setup_pkg_db_rootfs([opkg_dir]) self._setup_dbg_rootfs([opkg_dir]) execute_pre_post_process(self.d, opkg_post_process_cmds) diff --git a/meta/lib/oe/package_manager/rpm/rootfs.py b/meta/lib/oe/package_manager/rpm/rootfs.py index a120092b83..cdf9c228f5 100644 --- a/meta/lib/oe/package_manager/rpm/rootfs.py +++ b/meta/lib/oe/package_manager/rpm/rootfs.py @@ -108,6 +108,7 @@ class PkgRootfs(Rootfs): if self.progress_reporter: self.progress_reporter.next_stage() + self._setup_pkg_db_rootfs(['/etc/rpm', '/etc/rpmrc', '/etc/dnf', '/var/lib/rpm', '/var/cache/dnf', '/var/lib/dnf']) self._setup_dbg_rootfs(['/etc/rpm', '/etc/rpmrc', '/etc/dnf', '/var/lib/rpm', '/var/cache/dnf', '/var/lib/dnf']) execute_pre_post_process(self.d, rpm_post_process_cmds) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 2824d4f037..f24c2697b4 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -104,6 +104,41 @@ class Rootfs(object, metaclass=ABCMeta): def _cleanup(self): pass + def _setup_pkg_db_rootfs(self, package_paths): + gen_pkg_db_fs = self.d.getVar('IMAGE_GEN_PKGDBFS') or '0' + if gen_pkg_db_fs != '1': + return + + bb.note(" Renaming the original rootfs...") + try: + shutil.rmtree(self.image_rootfs + '-orig') + except: + pass + bb.utils.rename(self.image_rootfs, self.image_rootfs + '-orig') + + bb.note(" Creating pkg-db rootfs...") + bb.utils.mkdirhier(self.image_rootfs) + + bb.note(" Copying back package database...") + for path in package_paths: + bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(path)) + if os.path.isdir(self.image_rootfs + '-orig' + path): + shutil.copytree(self.image_rootfs + '-orig' + path, self.image_rootfs + path, symlinks=True) + elif os.path.isfile(self.image_rootfs + '-orig' + path): + shutil.copyfile(self.image_rootfs + '-orig' + path, self.image_rootfs + path) + + #### + + bb.note(" Rename pkg-db rootfs...") + try: + shutil.rmtree(self.image_rootfs + '-pkgdb') + except: + pass + bb.utils.rename(self.image_rootfs, self.image_rootfs + '-pkgdb') + + bb.note(" Restoring original rootfs...") + bb.utils.rename(self.image_rootfs + '-orig', self.image_rootfs) + def _setup_dbg_rootfs(self, package_paths): gen_debugfs = self.d.getVar('IMAGE_GEN_DEBUGFS') or '0' if gen_debugfs != '1': From patchwork Tue Feb 13 08:56:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SCHNEIDER Johannes X-Patchwork-Id: 39238 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F462C48260 for ; Tue, 13 Feb 2024 08:58:23 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.46]) by mx.groups.io with SMTP id smtpd.web11.7659.1707814693077923189 for ; Tue, 13 Feb 2024 00:58:13 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@leica-geosystems.com header.s=selector1 header.b=tRuChDyM; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: leica-geosystems.com, ip: 40.107.20.46, mailfrom: johannes.schneider@leica-geosystems.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fOUe9rw/MhrHVENKnVRxqDhWEIu50iOp0mhfKURDzbhEK1uBbLKY3n654YNnuespDMtAwmVkbaMun6xAjgSfw8U8zQF+BLgn3ZQcpmTViMYb9ReVJdjTXeQZXH079N/4sf4hN6su8IViyPPqUOxPX/YZMBk9+yWmhhRkzbRZ1mUQZeUtvzz101ZEHVBjreO61N5Z2wwrGzEa9RAmi06FRfNzENOgiWVF12FzdeiZi/uLAgdIQtUPhNP+lLc0ibqYQ5mY3BaM3xRRpgc1OcG3+ku+/TeQpq/Qj6+FtGZ01oEQvyvrSGuz7R5nQuz6m872mz7lewviYY1G/s3TmEvxCQ== 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=0SFV/jrQlq566v3g/yrBb7ofJKt3tEuVTpephmxnmJY=; b=FR1aJJEaeEPbCh+tqKqbycVCEHIVUdIN+ptIsvjmuLwZd82VQvfmI75FjOuIlfaTWmRwlXqlOYF26Lr4LnAmzTBEeJNDx0twr1a96Mo5XGHD0D2gHcHF5wKg46ZW3d2bCFdg/8or7pidXCfl1rJiMqYT/0YQagRdDt6gxAUnNSpS7aVXhs9r31U8FXP+Fws6wZROWRhNT8i3mnqZHanXztyYDuMUu7Tz9RCrqVRuZI2b96XgV+soFvvtajsbIsaDGXMN7G8ehXJ+tAlUKCnkLsgnPVA3Phc8gNZFzM7y/rzsBpbXTXzaUFd9eDt4OVCa/h3z/51bW8Wgrx4h1g510A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=leica-geosystems.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=leica-geosystems.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0SFV/jrQlq566v3g/yrBb7ofJKt3tEuVTpephmxnmJY=; b=tRuChDyMvZ1X5CV7/t8vmVa3XfHA6aaERam+dhruiStUTvGNri7ELEsLt8bi/Wq7RbngzabRQcnEmwJl77tzD5lVMZMR9Ax2HB8f++cN1+6vceO0MGAHBNUW4La4OfE1R8oQsfNlUB2gEpt1jm8yRXG1YdcwyLbKr0CFZhQa6oI= Received: from AS4P189CA0003.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:5d7::8) by AS8PR06MB7334.eurprd06.prod.outlook.com (2603:10a6:20b:25a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.38; Tue, 13 Feb 2024 08:58:08 +0000 Received: from AM4PEPF00027A67.eurprd04.prod.outlook.com (2603:10a6:20b:5d7:cafe::7) by AS4P189CA0003.outlook.office365.com (2603:10a6:20b:5d7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.38 via Frontend Transport; Tue, 13 Feb 2024 08:58:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=hexagon.com; pr=C Received: from hexagon.com (193.8.40.94) by AM4PEPF00027A67.mail.protection.outlook.com (10.167.16.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Tue, 13 Feb 2024 08:58:08 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.116]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Tue, 13 Feb 2024 09:58:08 +0100 From: Johannes Schneider To: openembedded-core@lists.openembedded.org CC: Johannes Schneider Subject: [PATCH v1 2/3] image.bbclass/rootfs: set&unpack package-database Date: Tue, 13 Feb 2024 09:56:56 +0100 Message-ID: <20240213085658.170917-3-johannes.schneider@leica-geosystems.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240213085658.170917-1-johannes.schneider@leica-geosystems.com> References: <20240213085658.170917-1-johannes.schneider@leica-geosystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 13 Feb 2024 08:58:08.0296 (UTC) FILETIME=[C39FFA80:01DA5E5A] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM4PEPF00027A67:EE_|AS8PR06MB7334:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e53d2f4-1a95-4e63-a0be-08dc2c71e63d X-SET-LOWER-SCL-SCANNER: YES X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ryt7l5PE3JiYvOiV9lgSM61sNiNy2/Y0tKaEm6vMdiO9LPCgDBu1iYTDw6R2UbmU2yiudZ3fbUQ5fPJYLCBvbAYNDM8m8DNcr5XPdUDmaDpwgj9vIVkvtOU9X543fQ/CY8Q7nIbLPLz5iIpz5xpZ5XB0pXN/gUhzOcBJwPbc+TdA/lEh+iNtQpqjDj7FzgnCNzdLgIAOWUBaInrZpOktvcsRkZ2s+BpE/JYBmFip2+G+5l3XJvbUnkEHVuelHbAnRA9MwTHTQrWv6PHtikfL44hrD2cyEAFUhDjVU+MR/ElU2cXMJJTU9tAhG76JPOlZZv4t3RvRZT13MnKLC9w9P7sIVgUaEX/Nox2HYJr818t0luD71Lrhyxm0NYFj8rqnqrYPitUUjtMuzcglCvelXHcoDfbKech8XIsPx6ClfeLbFSxyXGJtNgDRxBFqOZgOSHTXDNZ7zk5PXykixmk4qx4tUa+9CfKl2jCPW0ElIEd4oROlJjElNoWbpnwg1rnN4p4rkMi2Ilkl+bqGVaKvxu6xLcOObMbeFQ0EzpnOlw9QaXU27ks0EWnbPucRE55XVnbaX2Ln8L1T0Cgox+wLRw== X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:hexagon.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230031)(4636009)(136003)(346002)(376002)(396003)(39860400002)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(46966006)(36840700001)(40470700004)(41300700001)(478600001)(6666004)(2906002)(44832011)(4326008)(70586007)(70206006)(5660300002)(336012)(26005)(1076003)(107886003)(2616005)(36756003)(6916009)(8936002)(86362001)(316002)(8676002)(81166007)(356005)(82740400003)(83380400001);DIR:OUT;SFP:1101; X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 08:58:08.5180 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2e53d2f4-1a95-4e63-a0be-08dc2c71e63d X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[hexagon.com] X-MS-Exchange-CrossTenant-AuthSource: AM4PEPF00027A67.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR06MB7334 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Feb 2024 08:58:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195376 set the package-database of a "lower image" to unpack and build upon when installing packages for the current image. This way a lean image will be created, which only holds the packages that are not already present in the lower image, that then could be used with overlayfs or systemd-sysext to extend the "lower image" on demand; for development purposes on an RO lower image for example. Signed-off-by: Johannes Schneider --- meta/classes/image.bbclass | 10 +++++++- meta/lib/oe/package_manager/deb/rootfs.py | 2 ++ meta/lib/oe/package_manager/ipk/rootfs.py | 6 +++-- meta/lib/oe/package_manager/rpm/rootfs.py | 7 ++++-- meta/lib/oe/rootfs.py | 29 +++++++++++++++++++++++ 5 files changed, 49 insertions(+), 5 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c8919a4857..9cf65438a1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -36,8 +36,16 @@ IMAGE_FEATURES ?= "" IMAGE_FEATURES[type] = "list" IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging overlayfs-etc" +# Image layering: +# a "base image" would create a snapshot of the package-database after the +# installation of all packages into the rootfs is done. The next/other image +# "layered on-top" of the former would then import that database and install +# further packages; without reinstalling package dependencies that are already +# installed in the layer below. # Generate snapshot of the package database? IMAGE_GEN_PKGDBFS ?= "0" +# Package-database of the base image, upon which to build up a new image-layer +IMAGE_BASE_PKGDB ?= "" # Generate companion debugfs? IMAGE_GEN_DEBUGFS ?= "0" @@ -128,7 +136,7 @@ def rootfs_variables(d): 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS', 'IMAGE_LINGUAS_COMPLEMENTARY', 'IMAGE_LOCALES_ARCHIVE', 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS', 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', - 'CONVERSIONTYPES', 'IMAGE_GEN_PKGDBFS', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS'] + 'CONVERSIONTYPES', 'IMAGE_GEN_PKGDBFS', 'IMAGE_BASE_PKGDB', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS'] variables.extend(rootfs_command_variables(d)) variables.extend(variable_depends(d)) return " ".join(variables) diff --git a/meta/lib/oe/package_manager/deb/rootfs.py b/meta/lib/oe/package_manager/deb/rootfs.py index 08d8aa9813..6538fee18a 100644 --- a/meta/lib/oe/package_manager/deb/rootfs.py +++ b/meta/lib/oe/package_manager/deb/rootfs.py @@ -150,6 +150,8 @@ class PkgRootfs(DpkgOpkgRootfs): execute_pre_post_process(self.d, deb_pre_process_cmds) + self._unpack_pkg_db_rootfs(['/var/lib/dpkg']) + if self.progress_reporter: self.progress_reporter.next_stage() # Don't support incremental, so skip that diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py b/meta/lib/oe/package_manager/ipk/rootfs.py index 14bf6cac98..9c1ba81bcb 100644 --- a/meta/lib/oe/package_manager/ipk/rootfs.py +++ b/meta/lib/oe/package_manager/ipk/rootfs.py @@ -274,12 +274,16 @@ class PkgRootfs(DpkgOpkgRootfs): pkgs_to_install = self.manifest.parse_initial_manifest() opkg_pre_process_cmds = self.d.getVar('OPKG_PREPROCESS_COMMANDS') opkg_post_process_cmds = self.d.getVar('OPKG_POSTPROCESS_COMMANDS') + opkg_lib_dir = self.d.getVar('OPKGLIBDIR') + opkg_dir = os.path.join(opkg_lib_dir, 'opkg') # update PM index files self.pm.write_index() execute_pre_post_process(self.d, opkg_pre_process_cmds) + self._unpack_pkg_db_rootfs([opkg_dir]) + if self.progress_reporter: self.progress_reporter.next_stage() # Steps are a bit different in order, skip next @@ -315,8 +319,6 @@ class PkgRootfs(DpkgOpkgRootfs): if self.progress_reporter: self.progress_reporter.next_stage() - opkg_lib_dir = self.d.getVar('OPKGLIBDIR') - opkg_dir = os.path.join(opkg_lib_dir, 'opkg') self._setup_pkg_db_rootfs([opkg_dir]) self._setup_dbg_rootfs([opkg_dir]) diff --git a/meta/lib/oe/package_manager/rpm/rootfs.py b/meta/lib/oe/package_manager/rpm/rootfs.py index cdf9c228f5..0face72320 100644 --- a/meta/lib/oe/package_manager/rpm/rootfs.py +++ b/meta/lib/oe/package_manager/rpm/rootfs.py @@ -65,12 +65,15 @@ class PkgRootfs(Rootfs): pkgs_to_install = self.manifest.parse_initial_manifest() rpm_pre_process_cmds = self.d.getVar('RPM_PREPROCESS_COMMANDS') rpm_post_process_cmds = self.d.getVar('RPM_POSTPROCESS_COMMANDS') + package_paths = ['/etc/rpm', '/etc/rpmrc', '/etc/dnf', '/var/lib/rpm', '/var/cache/dnf', '/var/lib/dnf'] # update PM index files self.pm.write_index() execute_pre_post_process(self.d, rpm_pre_process_cmds) + self._unpack_pkg_db_rootfs(package_paths) + if self.progress_reporter: self.progress_reporter.next_stage() @@ -108,8 +111,8 @@ class PkgRootfs(Rootfs): if self.progress_reporter: self.progress_reporter.next_stage() - self._setup_pkg_db_rootfs(['/etc/rpm', '/etc/rpmrc', '/etc/dnf', '/var/lib/rpm', '/var/cache/dnf', '/var/lib/dnf']) - self._setup_dbg_rootfs(['/etc/rpm', '/etc/rpmrc', '/etc/dnf', '/var/lib/rpm', '/var/cache/dnf', '/var/lib/dnf']) + self._setup_pkg_db_rootfs(package_paths) + self._setup_dbg_rootfs(package_paths) execute_pre_post_process(self.d, rpm_post_process_cmds) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index f24c2697b4..613357df60 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -104,6 +104,35 @@ class Rootfs(object, metaclass=ABCMeta): def _cleanup(self): pass + def _unpack_pkg_db_rootfs(self, package_paths): + import tarfile + gen_pkg_db_fs = self.d.getVar('IMAGE_BASE_PKGDB') or '' + if gen_pkg_db_fs == '': + return + + fname = self.d.getVar('DEPLOY_DIR_IMAGE') + '/' + self.d.getVar('IMAGE_BASE_PKGDB') + '-pkgdb.tar.gz' + if not fname: + bb.warn("PKGDB does not exit:", fname) + return + + bb.note(" unpacking package database...") + bb.utils.mkdirhier(self.image_rootfs + '-pkgdb') + if fname.endswith("tar.gz"): + tar = tarfile.open(fname, "r:gz") + tar.extractall(path=self.image_rootfs + '-pkgdb') + tar.close() + + bb.note(" Copying back package database...") + for path in package_paths: + try: + bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(path)) + except: + pass + if os.path.isdir(self.image_rootfs + '-pkgdb' + path): + shutil.copytree(self.image_rootfs + '-pkgdb' + path, self.image_rootfs + path, symlinks=True, dirs_exist_ok=True) + elif os.path.isfile(self.image_rootfs + '-pkgdb' + path): + shutil.copyfile(self.image_rootfs + '-pkgdb' + path, self.image_rootfs + path) + def _setup_pkg_db_rootfs(self, package_paths): gen_pkg_db_fs = self.d.getVar('IMAGE_GEN_PKGDBFS') or '0' if gen_pkg_db_fs != '1': From patchwork Tue Feb 13 08:56:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SCHNEIDER Johannes X-Patchwork-Id: 39237 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FAF8C4829A for ; Tue, 13 Feb 2024 08:58:13 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.75]) by mx.groups.io with SMTP id smtpd.web11.7658.1707814692600215238 for ; Tue, 13 Feb 2024 00:58:12 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@leica-geosystems.com header.s=selector1 header.b=O9WzHfm0; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: leica-geosystems.com, ip: 40.107.8.75, mailfrom: johannes.schneider@leica-geosystems.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pg+eetaKhes5aiTMyr0kRUbra2+UbFaxnfdVLCDLYkvO+7Rdki7UuCvBpOxJ30wt2ZvJZG6ZYQ1a5xMTdop0AHECthFbBhx+fp3L2ezh6e3z8b8F0PJKm/8FM1HpoTRNxqiKbnZlAnhCcUqvfT4fI/XUfGeSX4XUENdfXv9MWAzvjtnv3k7SMe2s3oeEfxXJ706lddc6DOxTqw1gqRXzpea4TCiqikVsZDqULMYU7F+vIYschuYi2xuxrRjAyvrqevfjwm63CthBjPSs9pxta+tPbHql0XUTnCtaL3iihmlqZZgjSaiE/A4byhvZobmo9IqRvzgah9u91zN6qKN31Q== 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=AJ0WAnsjhH+h4LyJgg8WEe1/Ol3fR4tp5Y9hYEtZrd0=; b=c3SDJAu6C5xOVDQGjY33FHaUnQcswO3vUG2/E1S7IKTZ7yxSXhVSdgBHsuceIzZnAVdGxhwMJVLAxmNm0mdWAhs1lMbRHUTWvqn7rpKBm7TZQdgm3AeA0p5X3W4gq+NtwEPrDl7lcYHPnEVNa18SPtp9duvx7YZqR0kNHsCIzQ2g796jdYFPVKStFk88DrWifPyKfs2x/gMKStAGK4xV9qGsjRpxT89hCCRG4gXHq7H3mv4WYLKl835q15Ik+gI4bHGQI2oGLmlZsEIT92spQb22C0BtdutswJxk88kHqYdjFTe85K4I8gzcTegXKaIL3opYX6Q8esvqYpRYle+/iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=leica-geosystems.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=leica-geosystems.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AJ0WAnsjhH+h4LyJgg8WEe1/Ol3fR4tp5Y9hYEtZrd0=; b=O9WzHfm0us/kcaVRvLUSjV3nZcyIrcEY8V8+SswIlrAHx5Jg/7c35yZVRznyUN1BwSCb2EMghdEFmMpELYOtqv9QxAZaUYx5/A/YMcrrBIt2jlWn81nMQI/7no+c8YgMYPuVPgdC/CucQmU956YeRditZ+H580BYCQNKiRGFCB4= Received: from AS4P189CA0008.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:5d7::9) by VE1PR06MB7168.eurprd06.prod.outlook.com (2603:10a6:800:1aa::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.39; Tue, 13 Feb 2024 08:58:09 +0000 Received: from AM4PEPF00027A67.eurprd04.prod.outlook.com (2603:10a6:20b:5d7:cafe::af) by AS4P189CA0008.outlook.office365.com (2603:10a6:20b:5d7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.39 via Frontend Transport; Tue, 13 Feb 2024 08:58:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=hexagon.com; pr=C Received: from hexagon.com (193.8.40.94) by AM4PEPF00027A67.mail.protection.outlook.com (10.167.16.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Tue, 13 Feb 2024 08:58:09 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.116]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Tue, 13 Feb 2024 09:58:08 +0100 From: Johannes Schneider To: openembedded-core@lists.openembedded.org CC: Johannes Schneider Subject: [PATCH v1 3/3] classes: add a systemd-sysext image class Date: Tue, 13 Feb 2024 09:56:57 +0100 Message-ID: <20240213085658.170917-4-johannes.schneider@leica-geosystems.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240213085658.170917-1-johannes.schneider@leica-geosystems.com> References: <20240213085658.170917-1-johannes.schneider@leica-geosystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 13 Feb 2024 08:58:08.0343 (UTC) FILETIME=[C3A72670:01DA5E5A] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM4PEPF00027A67:EE_|VE1PR06MB7168:EE_ X-MS-Office365-Filtering-Correlation-Id: 202ae336-5622-4b04-b0c4-08dc2c71e68e X-SET-LOWER-SCL-SCANNER: YES X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UL9/avNltZUYUM7pHOu5lp7QQN8HcFiexX/8vHk+6dpCWbWo7l2R84mTaVmunsYn0PRT1vvljgmh5+MdRLB7DfF0jjsywWP0Xpe0jatfuI+K22FByrRVwbg5GKQ7cnJLaQzhJycTL5keAHaBmTLW+tldSc3WX1cQT4amSZ+FGhakAj71u3aGz5+1As9wbLixidIAN5NDl0UFRolpm7ACcmUhmnB/mbJDtZb6Fpw2Uo4FFlZi4JuiNUFoueba3n7gQpMdtlPDK+o+d1eYy0fTsotPUFMEU1GNFhy71SZwWd0LHrL9O/PJYszQpnnUUBI1kdlyxoEFumA+nR5yETEds9eIA2Sbg6qLa7tvVhvevvGUlJpquZ2KHbwl4YMgxqaikCOZ9yxer+uOMsVJW5SbowP+1HE4mwkZg42yTEuG7DJOxyQtcoP7JDt6F69ctklbe5eHGWhiivgKVBeFVpMl+bZ6IkODPr6pWh/lKTboQJfMZglUh+dUIKntHIEKedrIvXGmg9cxzA2gs9JCc5SV81IinXwpzQKlf4p1mzU5hIy4+M6JFf7X7+7YKMkvPq5QNSNFqCnX7B9qJ8NNVbFI2w== X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:hexagon.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(376002)(396003)(346002)(136003)(230922051799003)(451199024)(1800799012)(186009)(82310400011)(64100799003)(36840700001)(40470700004)(46966006)(2906002)(82740400003)(44832011)(5660300002)(356005)(86362001)(81166007)(1076003)(2616005)(6666004)(107886003)(83380400001)(26005)(336012)(36756003)(6916009)(316002)(70586007)(70206006)(4326008)(8936002)(8676002)(478600001)(966005)(41300700001);DIR:OUT;SFP:1101; X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 08:58:09.0492 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 202ae336-5622-4b04-b0c4-08dc2c71e68e X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[hexagon.com] X-MS-Exchange-CrossTenant-AuthSource: AM4PEPF00027A67.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR06MB7168 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Feb 2024 08:58:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195375 systemd-sysext can load a raw-image containing usr/ and opt/ folders to mount them as RO overlay over the rootfs, to "extend" the systems. This class provides the necessary changes/additions to the enclosed file-system so that systemd-sysext accepts the extension for "merge" into the rootfs. With such an created image, placed into the correct folder (see [1]), `systemd-sysext list` should be able to list the "extension" and `systemd-sysext merge` should enable the overlay. On both commands a preceding "SYSTEMD_LOG_LEVEL=debug" can aide in figuring out what is amiss. The strict name checking systemd-sysext does against the name of extension-release.NAME file, is disabled, as there is only one such in the resulting image. This is done to allow a user to freely rename the resulting image file. Note that for e.g. squashfs, the kernel needs CONFIG_SQUASHFS_XATTR=y Link: https://www.freedesktop.org/software/systemd/man/latest/systemd-sysext.html Link: https://0pointer.net/blog/testing-my-system-code-in-usr-without-modifying-usr.html Signed-off-by: Johannes Schneider --- meta/classes/image-sysext.bbclass | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 meta/classes/image-sysext.bbclass diff --git a/meta/classes/image-sysext.bbclass b/meta/classes/image-sysext.bbclass new file mode 100644 index 0000000000..10dcb267a5 --- /dev/null +++ b/meta/classes/image-sysext.bbclass @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: MIT +# +# Copyright Leica Geosystems AG +# + +# systemd-sysext [1] has a simple mechanism for version compatibility: +# the extension to be loaded has to contain a +# /usr/lib/extension-release.d/extension-release.NAME +# with "NAME" *exactly* matching the filename of the extensions +# raw-device filename/ +# +# from the extension-release file the "ID" and "VERSION_ID" fields are +# matched against the etc/os-release and the extension is only "merged" +# if no mismatches between NAME, ID, and VERSION_ID. +# +# Link: https://www.freedesktop.org/software/systemd/man/latest/systemd-sysext.html + +inherit image + +IMAGE_NAME_SUFFIX = ".sysext" +EXTENSION_NAME = "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${IMAGE_FSTYPES}" + +DEPENDS += " os-release" + +sysext_image_mangle_rootfs() { + R=${IMAGE_ROOTFS} + + # pull a copy of the rootfs version information, which systemd-sysext matches against + cp -av ${RECIPE_SYSROOT}/${nonarch_libdir}/os-release ${WORKDIR}/extension-release.base + + echo 'EXTENSION_RELOAD_MANAGER=1' >> ${WORKDIR}/extension-release.base + + install -d $R${nonarch_libdir}/extension-release.d + install -m 0644 ${WORKDIR}/extension-release.base \ + $R${nonarch_libdir}/extension-release.d/extension-release.${EXTENSION_NAME} + + # disable systemd-sysext's strict name checking, so that the image file can be renamed, while still being 'merge'-able + setfattr -n user.extension-release.strict -v false \ + $R${nonarch_libdir}/extension-release.d/extension-release.${EXTENSION_NAME} +} + +ROOTFS_POSTPROCESS_COMMAND += " sysext_image_mangle_rootfs; "