From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7272973205882535936 X-Received: by 2002:a05:6512:3d0f:b0:500:b56d:e11a with SMTP id d15-20020a0565123d0f00b00500b56de11amr661705lfv.43.1693371032518; Tue, 29 Aug 2023 21:50:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:5e5c:0:b0:4fe:13bd:d93f with SMTP id z28-20020a195e5c000000b004fe13bdd93fls549375lfi.0.-pod-prod-04-eu; Tue, 29 Aug 2023 21:50:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMRCnL9lfplHS8BMlE1y75QReQcYM04JunWbb0/sugW5NGthEAjiMziKW9xph8cdowUj4t X-Received: by 2002:a05:6512:34c8:b0:4fe:629:9265 with SMTP id w8-20020a05651234c800b004fe06299265mr554951lfr.20.1693371030018; Tue, 29 Aug 2023 21:50:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693371030; cv=none; d=google.com; s=arc-20160816; b=DHN9TFLzMlrvwFlMJ/6St6IOa71ApFXdiD1IokxZv9pnwo60kLMRVJjJH/a1qL+2qX pfBgabQSBpEJRVOPIPO5tL8/5rRRwPtcKVVPzHNpLcjxP7Yf6o8bIB7eDE77+x8EngWy zPu2lrgFUmEReNC3BtQe64heqeH/BO976TB6Rw+NUMlM5yPWFYni8Mv8EQGQ7QXQXj2Q 0WEMcsrLUQj9Em64pMrADpSr/J3YKUUSXQfCnfoSUkU1jeZm6NBcZHqrVNyZid21Jvvp Fnzm2SljbCZ1cnjs437BXpFD+TaZ0jkClEgtn1kHFmHy8Y8FYX1Md4S9i3QkMsfEOgRB kFow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=BTB5CzWEDFN5OgIhhYv2nzoatcBzx4ePi8+iyMOooqc=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=UAw4XrnIsODg7TIigTlhovoRVOzJs51heGYBovEE+5VNlKk/xGfP+HBly5CFxV6/3O 4C9ZD58167nTtUwbvq2IRci8wsQoC2gUPEUcGX4sDk3P2854WAw6BY2+v9ksfS2RaI2F 55s7REkDgCbdqni1TmrCTP8+7XAuR5muvVE8gvlepD2WLbnEARaNv1R7iCma7WJywule yIEqow8ttP37ZZDa2ezPET/hkzIdKaCevegA4XNVRfGQVVHzeSJcyq0owcjsE0MeMc56 DMlBuOSLAmgiOgDoTaoslRrP/R7P/cz3APMNxqB3ft0YuHG5dkPY1bJavTrXgkvS1DUG yyAQ== 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 u5-20020a05651220c500b004ffa23b6e2asi826334lfr.5.2023.08.29.21.50.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Aug 2023 21:50:29 -0700 (PDT) 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+deb9u1) with ESMTPSA id 37U4oSki014510 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 30 Aug 2023 06:50:28 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] linux-custom: Generate cross linux-libc-dev package Date: Wed, 30 Aug 2023 06:50:28 +0200 Message-Id: <20230830045028.15983-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: iZkMA+D65Ocj In addition to `linux-libc-dev`, install cross-variant of this package when "cross" debian profile is enabled. This should allow to cross-compile packages depending on custom kernel headers with different version than in debian packages. Typical case - building bookworm system (with linuix-libc-dev-6.1.*) against custom kernel with a lower version (e.g., 5.4). With this patch, when such a package is built, debian-provided package `linux-libc-dev--cross` will have an alternative package provided by custom linux recipe so that sbuild could replace (downgrade) it. Signed-off-by: Uladzimir Bely --- meta/recipes-kernel/linux/files/debian/control.tmpl | 11 +++++++++++ .../linux/files/debian/isar/common.tmpl | 2 ++ .../linux/files/debian/isar/install.tmpl | 3 +++ 3 files changed, 16 insertions(+) diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl index dd0b6245..956db3e3 100644 --- a/meta/recipes-kernel/linux/files/debian/control.tmpl +++ b/meta/recipes-kernel/linux/files/debian/control.tmpl @@ -29,6 +29,17 @@ Description: Linux support headers for userspace development This package provides userspaces headers from the Linux kernel. These headers are used by the installed headers for GNU glibc and other system libraries. +Package: linux-libc-dev-${DISTRO_ARCH}-cross +Build-Profiles: +Section: devel +Provides: linux-kernel-headers-${DISTRO_ARCH}-cross +Architecture: all +Description: Linux Kernel Headers for development (for cross-compiling) + This package provides headers from the Linux kernel. These headers + are used by the installed headers for GNU glibc and other system + libraries. They are NOT meant to be used to build third-party modules for + your kernel. Use linux-headers-* packages for that. + Package: linux-image-${KERNEL_NAME_PROVIDED}-dbg Section: debug Architecture: any diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl index 52ebebb0..9babf9a4 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl @@ -9,6 +9,7 @@ ARCH=${KERNEL_ARCH} KERNEL_PKG_IMAGE=linux-image-${KERNEL_NAME_PROVIDED} KERNEL_PKG_KERN_HEADERS=linux-headers-${KERNEL_NAME_PROVIDED} KERNEL_PKG_LIBC_HEADERS=linux-libc-dev +KERNEL_PKG_LIBC_HEADERS_CROSS=linux-libc-dev-${DISTRO_ARCH}-cross # Constants KCONF=.config @@ -19,6 +20,7 @@ deb_img_dir=${deb_top_dir}/${KERNEL_PKG_IMAGE} deb_dbg_dir=${deb_img_dir}-dbg deb_kern_hdr_dir=${deb_top_dir}/${KERNEL_PKG_KERN_HEADERS} deb_libc_hdr_dir=${deb_top_dir}/${KERNEL_PKG_LIBC_HEADERS} +deb_libc_hdr_cross_dir=${deb_top_dir}/${KERNEL_PKG_LIBC_HEADERS_CROSS} # Array of packages to be generated declare -A kern_pkgs diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index 8a604e45..e91d33bb 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl @@ -152,6 +152,9 @@ libc_headers() { host_arch=$(dpkg-architecture -a${DISTRO_ARCH} -qDEB_HOST_MULTIARCH) mkdir ${deb_libc_hdr_dir}/usr/include/${host_arch} mv ${deb_libc_hdr_dir}/usr/include/asm ${deb_libc_hdr_dir}/usr/include/${host_arch}/ + + mkdir -p ${deb_libc_hdr_cross_dir} + ${MAKE} O=${O} headers_install INSTALL_HDR_PATH=${deb_libc_hdr_cross_dir}/usr/${host_arch} } kernel_tools() { -- 2.20.1