From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a05:6512:3ac:: with SMTP id v12mr19511352lfp.40.1643734392523; Tue, 01 Feb 2022 08:53:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bf1a:: with SMTP id c26ls3342561ljr.10.gmail; Tue, 01 Feb 2022 08:53:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJztKSKCT25jpKCqtFC3/LfdnnawCMcaYkenKhQUSYx/3o89UTXYGDJPdZBuf0DT18ZgYZz5 X-Received: by 2002:a2e:9b42:: with SMTP id o2mr17153846ljj.85.1643734391372; Tue, 01 Feb 2022 08:53:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734391; cv=none; d=google.com; s=arc-20160816; b=ywRY1X7ADZfQnQaJVTNhJNsktnD72z9h7HsOemTdfot86X700ukMDrrj7i9mXM/Ffa HJ222H2PfdRa1SbLijHYoGmektUY1ouhlVTREWQMS93KufbyEVYI3xTqpRQPTaBv/sf+ bNKP22jYI7TMY1hKsVonOnxkF/ZLVKS1OuKuHqeuVvnfQnXQz1/9WI+YH+XWVIZvz2pf 9flTO1KVSXSppfppsUhfQc8f7TAKWvq8B1IXJ2/wUM7TzcZe6IWvk54lJID/JAD57PKR hoY8B/QnsaJQaG3+3yH25nhmhEZpwzIV2KDhxWIASZ2woSsmicv8ZFcBOBvv4UqRjuj3 yAOQ== 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:to:from; bh=OW6Pmc1Q2vRf3QNTwuINPkToBF70rNDMuqTIKq81o1A=; b=uSO3zKO1sldCwQ54LCZAJlQF9cWX4ailB1i0qSE9MlgCdsyi92SB/grzznRnBP+UoI RNiO6dARTWXvWbhj2UBEz2U4bRYWgw3YnnoCvUJQDd7vRyzgwYwqWoD+hr1IHhV+W2Vp Se795c6E6bw99IkWr3NfbRK7ffuxLUHtqvIzjpEmHP1F/tpJL/pU7NsmsKoO9+WivIj/ +BCtZO7cGK4O7QBdDDUuYZ1mig4n8Y6ZGrxNMDxAFasNhVMcA/3Z85JwhIaVRfjsqs7D m+6sa9lRqEikUoe3Wsk8fSPDlPI0E6Ped5bEWzGaEA+jxILeYa3ZTWFJdFlisGyzutTE m5pg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bu7si514368lfb.5.2022.02.01.08.53.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 08:53:11 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 211Gr4qh019494 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 17:53:06 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 2/8] linux-module: Do not use shell environment Date: Tue, 1 Feb 2022 17:52:58 +0100 Message-Id: <20220201165304.21976-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201165304.21976-1-ubely@ilbers.de> References: <20220201165304.21976-1-ubely@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: Lc4qC42xin/E From: Anton Mikanovich To make package build process independent of the shell environment we should remove KDIR and PN passing through export call. KDIR can be prepared during package build. This also will allow not to rely on previous builddeps install task. To pass PN variable we can just migrate to template-based debian/rules file. Signed-off-by: Anton Mikanovich Signed-off-by: Uladzimir Bely --- .../linux-module/files/debian/rules | 37 ---------- .../linux-module/files/debian/rules.tmpl | 67 +++++++++++++++++++ meta/recipes-kernel/linux-module/module.inc | 34 +--------- 3 files changed, 70 insertions(+), 68 deletions(-) delete mode 100755 meta/recipes-kernel/linux-module/files/debian/rules create mode 100755 meta/recipes-kernel/linux-module/files/debian/rules.tmpl diff --git a/meta/recipes-kernel/linux-module/files/debian/rules b/meta/recipes-kernel/linux-module/files/debian/rules deleted file mode 100755 index 59720b37..00000000 --- a/meta/recipes-kernel/linux-module/files/debian/rules +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/make -f - -# Debian rules for custom kernel module build -# -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 -# -# SPDX-License-Identifier: MIT - -export DEB_BUILD_OPTIONS=parallel=$(shell nproc) - -export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- - -ifeq ($(DEB_HOST_GNU_CPU), arm) -export ARCH=arm -endif -ifeq ($(DEB_HOST_GNU_CPU), aarch64) -export ARCH=arm64 -endif -ifeq ($(DEB_HOST_GNU_CPU), riscv64) -export ARCH=riscv -endif -ifneq (,$(findstring 86,$(DEB_HOST_GNU_CPU))) -export ARCH=x86 -endif - -override_dh_auto_clean: - $(MAKE) -C $(KDIR) M=$(PWD) clean - -override_dh_auto_build: - $(MAKE) -C $(KDIR) M=$(PWD) modules - -override_dh_auto_install: - $(MAKE) -C $(KDIR) M=$(PWD) INSTALL_MOD_PATH=$(PWD)/debian/$(PN) modules_install - -%: - CFLAGS= LDFLAGS= dh $@ --parallel diff --git a/meta/recipes-kernel/linux-module/files/debian/rules.tmpl b/meta/recipes-kernel/linux-module/files/debian/rules.tmpl new file mode 100755 index 00000000..054a7b83 --- /dev/null +++ b/meta/recipes-kernel/linux-module/files/debian/rules.tmpl @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +# Debian rules for custom kernel module build +# +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2018 +# +# SPDX-License-Identifier: MIT + +export DEB_BUILD_OPTIONS=parallel=$(shell nproc) + +export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- + +ifeq ($(DEB_HOST_GNU_CPU), arm) +export ARCH=arm +endif +ifeq ($(DEB_HOST_GNU_CPU), aarch64) +export ARCH=arm64 +endif +ifeq ($(DEB_HOST_GNU_CPU), riscv64) +export ARCH=riscv +endif +ifneq (,$(findstring 86,$(DEB_HOST_GNU_CPU))) +export ARCH=x86 +endif + +ifeq (${KERNEL_TYPE}, raspios) +# In RaspiOS one package provides several headers +KERNEL_SUFFIX := "+" +ifeq (${KERNEL_NAME}, kernel8) +KERNEL_SUFFIX := "-v8+" +else ifeq (${KERNEL_NAME}, kernel7l) +KERNEL_SUFFIX := "-v7l+" +else ifeq (${KERNEL_NAME}, kernel7) +KERNEL_SUFFIX := "-v7+" +endif +KDIR := $(shell dpkg -L ${KERNEL_HEADERS_PKG} | grep "/lib/modules/.*${KERNEL_SUFFIX}/build" | head -n1) +endif + +ifeq ($(KDIR),) +# Custom kernels contain the build folder directly. +KDIR := $(shell dpkg -L ${KERNEL_HEADERS_PKG} | grep "/lib/modules/.*/build") +endif +ifeq ($(KDIR),) +# Debian kernels install that folder indirectly via a dependency. +KERNEL_DEP := $(shell dpkg-query -W -f '$${Depends}' ${KERNEL_HEADERS_PKG} | sed 's/.*\(linux-headers-[[:graph:]]*\).*/\1/') +KDIR := $(shell dpkg -L $(KERNEL_DEP) | grep "/lib/modules/.*/build") +endif + +# With some build systems like sbuild `dh clean` can be called twice: +# first, by build system itself before chroot's apt database updated, +# second, by dpkg-buildpackage during build. So, KDIR may be empty +# in first case (while no dependencies are yet installed), and a broken +# 'make ... clean' command is produced. Just skip override in this case. +ifneq ($(KDIR),) +override_dh_auto_clean: + $(MAKE) -C $(KDIR) M=$(PWD) clean +endif + +override_dh_auto_build: + $(MAKE) -C $(KDIR) M=$(PWD) modules + +override_dh_auto_install: + $(MAKE) -C $(KDIR) M=$(PWD) INSTALL_MOD_PATH=$(PWD)/debian/${PN} modules_install + +%: + CFLAGS= LDFLAGS= dh $@ --parallel diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index 968ac4c7..75dc4374 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -24,8 +24,9 @@ AUTOLOAD ?= "" inherit dpkg TEMPLATE_FILES = "debian/control.tmpl \ - debian/changelog.tmpl" -TEMPLATE_VARS += "KERNEL_IMAGE_PKG KERNEL_HEADERS_PKG" + debian/changelog.tmpl \ + debian/rules.tmpl" +TEMPLATE_VARS += "KERNEL_NAME KERNEL_TYPE KERNEL_IMAGE_PKG KERNEL_HEADERS_PKG PN" do_prepare_build() { cp -r ${WORKDIR}/debian ${S}/ @@ -34,32 +35,3 @@ do_prepare_build() { echo "echo $module >> /etc/modules" >> ${S}/debian/postinst done } - -dpkg_runbuild_prepend() { - if [ "${KERNEL_TYPE}" = "raspios" ]; then - # In RaspiOS one package provides several headers - KERNEL_SUFFIX="+" - if [ "${KERNEL_NAME}" = "kernel8" ]; then - KERNEL_SUFFIX="-v8+" - elif [ "${KERNEL_NAME}" = "kernel7l" ]; then - KERNEL_SUFFIX="-v7l+" - elif [ "${KERNEL_NAME}" = "kernel7" ]; then - KERNEL_SUFFIX="-v7+" - fi - export KDIR=$(dpkg -L --root=${BUILDCHROOT_DIR} ${KERNEL_HEADERS_PKG} | \ - grep "/lib/modules/.*${KERNEL_SUFFIX}/build" | head -n1) - fi - if [ -z "$KDIR" ]; then - # Custom kernels contain the build folder directly. - export KDIR=$(dpkg -L --root=${BUILDCHROOT_DIR} ${KERNEL_HEADERS_PKG} | \ - grep "/lib/modules/.*/build") - fi - if [ -z "$KDIR" ]; then - # Debian kernels install that folder indirectly via a dependency. - KERNEL_DEP=$(dpkg-query -W -f '${Depends}' --admindir=${BUILDCHROOT_DIR}/var/lib/dpkg \ - ${KERNEL_HEADERS_PKG} | sed 's/.*\(linux-headers-[[:graph:]]*\).*/\1/') - export KDIR=$(dpkg -L --root=${BUILDCHROOT_DIR} ${KERNEL_DEP} | \ - grep "/lib/modules/.*/build") - fi - export PN=${PN} -} -- 2.20.1