From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7051880287817433088 X-Received: by 2002:ac2:5217:: with SMTP id a23mr7125006lfl.684.1642168641314; Fri, 14 Jan 2022 05:57:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:6e44:: with SMTP id q4ls4337015lfk.3.gmail; Fri, 14 Jan 2022 05:57:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9DTju9IuoKEJADvFsWLXpVh5lT26WprRrIcThMKsBlVr8nkWtRrA9sHdmAWwvSq3ocDX6 X-Received: by 2002:a19:5e4f:: with SMTP id z15mr6796596lfi.553.1642168640352; Fri, 14 Jan 2022 05:57:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642168640; cv=none; d=google.com; s=arc-20160816; b=Ins8xYMO4YScZWZExyNrW0FxcAB8FHiGdhHF2eWxG2pWalk2/axWE9nAG4BrhLamfb DFACh062ke66xPszfcYbs4+4953qZN6lVzRKFn/MbXMhm9Y+9hi9rwDYB+s2Egg8KFf1 GcKsJ3gLnvcHO7jv82dTYXluRmeFCis+ImTJXBq0dKELSduwi27eOwNA6E0QLSDXL0ba NCc8i7R0/qP7SM5RXKFDmvvOKiU7fCotrQxP8k2WHSdBiYDwEY/KPRbtEbxjOuyckNzc Mi5zoP3xBI5TfxnCQDHqfjojlJm4E77qkyUJEb4WCWOehM6ebHRe6KH8/JBSPZG5Vxsf 10tQ== ARC-Message-Signature: i=1; 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; bh=mxEthA2zHz/8uyUZL1+r6zlcYfLPQ9XZu6DC+dLZ3VQ=; b=OYfwlEjQvKTP9/bvQmx27rxOqFt1Aa7RIef6+cX9LCGRnAJYdTEpQSmqO75VqnG7zw Ha7brJqBiTMpPawsD9OOiswy6QuRN6/IaOYZOdWAsmmtyjb2Ib3TbSKbuKmhz7NL/8zl PAfKPie6U9i0uCdPRUc3QabywO6YsfXEWVY56dAxH+e8gWRBvbP9/SZb2vpGFTFsSz4f HTM4+UeXDhlBX1TF79pHOD/0O7hhJmWeAiDTUI4Wfhdz6lt3nKDk/ixvnGssXj8eWgEH GQmp9YkY0Iin1ummooKc9mn9nrmnJyJNYPAr9/UQi4WlA3y3JvOFyyXnsU/kmyLTBdOM tVvg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bx12si275064ljb.2.2022.01.14.05.57.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jan 2022 05:57:20 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-85-69-214-37.mgts.dynamic.pppoe.byfly.by [37.214.69.85] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 20EDvHEt004619 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jan 2022 14:57:19 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 1/2] dpkg: Introduce any kernel variables Date: Fri, 14 Jan 2022 16:57:09 +0300 Message-Id: <20220114135710.72647-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114135710.72647-1-amikan@ilbers.de> References: <20220114135710.72647-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: VhGdfmSqA+Nb To allow packages to depend on any kernel image or header package add following variables: linux-image-generic - any custom Isar compiled kernel image linux-headers-generic - any custom Isar compiled headers ANY_DISTRO_KERNEL - any upstream kernel + generic one ANY_DISTRO_HEADERS - any upstream headers + generic ones Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 7 +++++++ meta/recipes-kernel/linux/files/debian/control.tmpl | 2 ++ 2 files changed, 9 insertions(+) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index cb5ce4a..4655f70 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -93,6 +93,13 @@ python() { d.setVarFlag('do_apt_fetch', 'noexec', '1') d.setVarFlag('do_apt_unpack', 'noexec', '1') d.setVarFlag('do_cleanall_apt', 'noexec', '1') + + distro_kernels = d.getVar('DISTRO_KERNELS', True) or "" + d.setVar('ANY_DISTRO_KERNEL', 'linux-image-generic') + d.setVar('ANY_DISTRO_HEADERS', 'linux-headers-generic') + for kernel in distro_kernels.split(): + d.appendVar('ANY_DISTRO_KERNEL', ' | linux-image-' + kernel) + d.appendVar('ANY_DISTRO_HEADERS', ' | linux-headers-' + kernel) } do_apt_fetch() { diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl index dd0b624..8647736 100644 --- a/meta/recipes-kernel/linux/files/debian/control.tmpl +++ b/meta/recipes-kernel/linux/files/debian/control.tmpl @@ -8,6 +8,7 @@ Homepage: http://www.kernel.org/ Package: linux-image-${KERNEL_NAME_PROVIDED} Architecture: any Depends: ${KERNEL_DEBIAN_DEPENDS} +Provides: linux-image-generic Description: ${KERNEL_NAME_PROVIDED} Linux kernel, version @KR@ This package contains the Linux kernel, modules and corresponding other files, version: @KR@. @@ -15,6 +16,7 @@ Description: ${KERNEL_NAME_PROVIDED} Linux kernel, version @KR@ Package: linux-headers-${KERNEL_NAME_PROVIDED} Architecture: any Depends: ${KERNEL_HEADERS_DEBIAN_DEPENDS}, ${perl:Depends}, ${shlib:Depends} +Provides: linux-headers-generic Description: ${KERNEL_NAME_PROVIDED} Linux kernel headers for @KR@ This package provides kernel header files for @KR@ on ${DISTRO_ARCH} . -- 2.25.1