From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7330292884155924480 X-Received: by 2002:a05:600c:3146:b0:410:c48a:4d6e with SMTP id h6-20020a05600c314600b00410c48a4d6emr1736796wmo.34.1707905436571; Wed, 14 Feb 2024 02:10:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1e0b:b0:411:ee70:ed68 with SMTP id ay11-20020a05600c1e0b00b00411ee70ed68ls155472wmb.2.-pod-prod-09-eu; Wed, 14 Feb 2024 02:10:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhKPEs4DE2D1EdwFmVLr5fqlLowbUwg908imIySwcTVG4EvlAC/eL6wwEZ4l9IxECqdNtt X-Received: by 2002:a05:600c:3d89:b0:410:7897:6c68 with SMTP id bi9-20020a05600c3d8900b0041078976c68mr1924567wmb.3.1707905434495; Wed, 14 Feb 2024 02:10:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707905434; cv=pass; d=google.com; s=arc-20160816; b=faOXDU9XTgL5kuU3+7styWTsEw+162U1LX1Mc3oYSFZYGxTIw5fFi2Qyyl7Nh7X6FN wWyjObH25VdmlPBtgXeZEN7hwUNEdD6u7NQEGNgGABFopcdVtsFdVj+xDIrFQOGbTal+ vUKmW8zHAzxY+kVNjtLUB5jiov0pULVOyqHW1uGgNvCAz6Sc3McUh+YgVf9qEgJ0jyjG b5/TukveJfJqKKUmOBcRVT4dnmpXbIBMi1jL+UoefWojJXdu220PP9WO2QQOallA3+SW /zAlBignJbKcY9yXGE1DRhLi83Zg+TQPXjQU/zs04Ve+KNL5f9iB2BWz4QcmeuA08l1b tRRw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NpHzpEU06YRxKq23eruNFpc7/+xFHP5GL7Ps6+RAMa0=; fh=xEShFggSpnuOkNhWsuGGuL9hws+gR5u0Poxh36yfvmk=; b=BpLdXnKoCkKPpJock9e9QWD3yfGZv0Dn7NuKhoYbh3Q8+DQOEc+pmkB5xQg0Slg5rA rQ3wQVPdm6j2IlqfJ2dXTiZkgfSoERpQ3BfbDfLRO5i+ICmJcdoUhe73vopdnqgpcVir EORLZ4LTkme7tBtnbi4c5yLcYSbMmsiAKDi3dz63nyfYykLD4ksBXBbBWKx2nUfabNQH AdFCtGzx5A7CjTau8Bsfcl/OaDlJqLTveXo8n30M8N+h6nOZXq5ySZFsq+LNuDIxqnyQ Gc0BoIU6HHnz4VZZzq0tfolq2+eLCYePCl3Js1yvaI61svOd9XroOQ7Fmi3l0qavgR66 vMpQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=XXmUOKJo; 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 stefan-koch@siemens.com designates 2a01:111:f403:2612::601 as permitted sender) smtp.mailfrom=stefan-koch@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20601.outbound.protection.outlook.com. [2a01:111:f403:2612::601]) by gmr-mx.google.com with ESMTPS id n40-20020a05600c3ba800b00411a80271d8si32546wms.2.2024.02.14.02.10.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2024 02:10:34 -0800 (PST) Received-SPF: pass (google.com: domain of stefan-koch@siemens.com designates 2a01:111:f403:2612::601 as permitted sender) client-ip=2a01:111:f403:2612::601; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=XXmUOKJo; 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 stefan-koch@siemens.com designates 2a01:111:f403:2612::601 as permitted sender) smtp.mailfrom=stefan-koch@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NdFfZ2+QCug0bPXdknf0z4NiIaH/g8yfDZEWWi4HMDW+enN5ZyB2wSCMjejlbpreyIHAPMCB1DLS97/DfL1E3orqx18uQuNvr/Wzr3zfbR+H//aD6/T1B6wZz7qRvBLUNrRarNBOijkbTPss1MoKnRyyrQUWttat6FukC7IrXU6PCFIL3zzUXp1LYs0Rtlva9zEsbeXUZrt+A38cX8V48iKxAbFxBuqR1XaxCtEyN3g9JeY7zUNL7NAnVvMQ9T1GSCcoMyiYCkMR2i9vDhk2iEe299DPnN/wBGZhgy46+gNGBQOq2lLqt248gcoIJKAvPJtAwLB4rsg0zB/r8b5N4Q== 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=NpHzpEU06YRxKq23eruNFpc7/+xFHP5GL7Ps6+RAMa0=; b=RTc/4sH4zt/mfFS6HxxM3tFJvr8syuCz1NbT1FrWl0LcOmQ+BN3DFXPwtz8uVy7CL2go/IWqtZwKAfwS2XK0xVyjryHtaXgVbfs4Frn1Mwpm2PeWFr6lyOdbZlGR1VOFacXtGvat0hEN0eKdqCPto8azFbuxthQPM+l/2o6Y+m78xkfl2h4T5yExDyMsb6P9Z4ln9KFLGJ0icGUyugQrxGO17dkjpyXHxm3M5w+tFQiT5qKBXWxMRNJbxLzcLQYeL6ZrtxOQTJcQ3n7HJpbhA1sT6OxqNH6zd2JYlcBIyzUAdieuQHRFB8f8bjopkhoutbOfdIwqVatSwEkjN3ZMpQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NpHzpEU06YRxKq23eruNFpc7/+xFHP5GL7Ps6+RAMa0=; b=XXmUOKJo8GJEvW5lvU1OgTn1ZyhsCt3v7zNCvGvBMs9zQ/mInTv040k/x6U+2yxpVH7b3ZAF3jixnJunZm8+jxX1LFfDSWnR/5wqbz1KldDb2r+PuaXONjbLlzWV4giqGLtBZEU5Yq+i1o9vbNkAyy/ODLC1/rH72NHrCRTlFRJcCeEXYrOTlbGXjWtmovTnK0YiQ52hBZL1iZraNu2PwZsI7kt8SWd+lRxWr4p0Z7TZiYxt4utWF9tGi9luioOm19kw7cRNI4BocV+PDdblDHdLWG8FR53GkAs4F7YpwLXYh6vDerpCQXZP+JUsdgTAdSrZW8Pzw1Cbp10tYUufgw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:41e::11) by DB8PR10MB3305.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:11c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.26; Wed, 14 Feb 2024 10:10:31 +0000 Received: from AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM ([fe80::33ca:62e:abfc:b1a]) by AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM ([fe80::33ca:62e:abfc:b1a%4]) with mapi id 15.20.7292.026; Wed, 14 Feb 2024 10:10:31 +0000 From: Stefan Koch To: isar-users@googlegroups.com Cc: stefan-koch@siemens.com, jan.kiszka@siemens.com, christian.storm@siemens.com, michael.adler@siemens.com, simon.sudler@siemens.com, cedric.hombourger@siemens.com, adriaan.schmidt@siemens.com, felix.moessbauer@siemens.com, ubely@ilbers.de Subject: [PATCH v6 2/5] linux-custom: Split up binaries from kernel headers to kbuild package Date: Wed, 14 Feb 2024 11:10:22 +0100 Message-Id: <20240214101025.2123540-3-stefan-koch@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240214101025.2123540-1-stefan-koch@siemens.com> References: <20240214101025.2123540-1-stefan-koch@siemens.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR5P281CA0045.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::12) To AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:41e::11) Return-Path: stefan-koch@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR10MB4959:EE_|DB8PR10MB3305:EE_ X-MS-Office365-Filtering-Correlation-Id: 6421fbe9-689c-4f9f-1fa9-08dc2d452d4b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WDDDxDNbPkFdHbFIz7Hh/vpUceOL82N5k2STFvqhwohrXjE/HIDTYZbSqCqogv1021EHSeQeog/ujku2iA4+O1yIhc0AaDpTUkrMtPFUbawoyijI1iYjdXn3f3kp46kQ5XHQ/yfjKretBk1dGB1CEB3IFLcbJYlKP1Mj9fCi6bDFUVJz8bIVcMzsfmOLG9Ky8uKrgfxTeS/KiGovfizIUgdCU0S1cFQrfTl7uMrB/GGNL7h/hhL413yCi5rVBmmsfesSPqEaicStPu+X0XAR7qJORcvj62V53ubYM2/X3hBlifRJLjYzdafRkzS1FLMPxxJbuCtvbn3QG/o6VEGrHD+YdZeLwaUXGvqRDFtdK/Udc0qbs9AMfp0kxCij5P6Qs21cb9G/iWADaMXosi0laY3G7LHBObKz/ReIlp/eKsAI+YTWecBi+zkPBDRQVUj/sctuu4xTJqy5DXO9YLoDiknKQKbx5VQOY8HRMkVtW4qxcUTGETRAFT4PdxrI5O5mxh4fBYeT0g28HLXbyTT1ck8b7CC2r4K+/hwEczhZ6Ey/0Ag/n6238EAkG2cL6UHx X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(376002)(346002)(366004)(39860400002)(396003)(136003)(230273577357003)(230922051799003)(1800799012)(186009)(451199024)(64100799003)(5660300002)(2906002)(478600001)(6512007)(6506007)(6486002)(26005)(2616005)(1076003)(41300700001)(66946007)(66556008)(66476007)(4326008)(6916009)(8936002)(8676002)(316002)(6666004)(83380400001)(86362001)(38100700002)(36756003)(82960400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KuINkjS3nyoUHDMe3cEQvgtDsmqB1vG1sdQ3yg7O4puwqLiiImwvkx9JNay5?= =?us-ascii?Q?7Flq6bP1mYC99yd6LI2T+TuQsM+ohUvQX7UrfiWSiHhJf6DqTe6Q8TIDMVWC?= =?us-ascii?Q?SYCQ1znpSZidhXzPmbpoMh9PiReHWTB3aARLWPS1vGblTcrj9wF2PSFYTOj/?= =?us-ascii?Q?k/mGwosKTUwE0MrFTfA1jbSmu01yYleqFxrqFRpQQPBuj4r9FKaSaMnNQPD2?= =?us-ascii?Q?JbSfGNbDIV4hCpoCpwHsqGFqxmO0o06L8CvstgrMnEvMdZ/t+Ng8mrdQ5wjw?= =?us-ascii?Q?kHe28uFkrR54RvauNLnVYfS5i/L47JgqZWKA9hb/KaDp1RIYPkwmJgExxPtC?= =?us-ascii?Q?4/sNIDgJWqsgpTsEAvLATsah/rnXbDZbXqofDoA6sFc3oIm3jgzmiBDLGkXv?= =?us-ascii?Q?3PWWTAPROFzzFXTWPw+fVtJJR9q/UwZsWHSDbXa1yjpEzj8+ROsBrkybMUYo?= =?us-ascii?Q?pCn2iPMYNbLrwIM/2ISGqpnfnSLQvmKtBPF8DUImYY+n+Vv79EG204VVAaWr?= =?us-ascii?Q?IDbajMCMbIHOGtGjjVIHLGbKbbeud35O5kddsTdHwCSQmaQ7VTrM9Aw1Nooe?= =?us-ascii?Q?jw61ppwUiL+8sySTWViUnqINz2VTF9Sr0AixeZxN7j7YL/U+yQ9gL4y6sL/0?= =?us-ascii?Q?In6KM7Kz61Bc4mHJEml8cA+yVy/+4YObAnAEPgQtLkud0BllRTEt59SyHc/R?= =?us-ascii?Q?R1SsW5fwY03a/tIVthnB8uChP/E+WOpQfckWGHatAL6oLycudMgmbwL7gtWk?= =?us-ascii?Q?ZWJ57emzjDjtoXzWqBYav2tfff/23OXKowb/ZtzE/cHDMEhf0U8ODqCO3wuK?= =?us-ascii?Q?A/zdjn1aFp4mcP8tyfrF7gE4h5UYnyYAA3SJm0LFRiR+0jexCqNp6i1t/rVO?= =?us-ascii?Q?cuxbSkDyHD9/hroY/gdt8RoChCDiC96DjcE2poDXmZC1LYGnOzUn0XCq9OMD?= =?us-ascii?Q?gEDrGwNVoeyFMIw1izcDRHTRY2iVrZp5PnOqvkAHAjJYWYjbxBafcSPVq2/R?= =?us-ascii?Q?4TPH6thSlFQzwTpbntH5WEhgKWJ5uhGypTvqE/4d9aorQU0Kl3+0NE67W+w0?= =?us-ascii?Q?xBemSqtFKx9OnOItjfw8+LFxhYXojGvvOHYEb8RbulUQ9X60vHBNYudO6Pgt?= =?us-ascii?Q?+dhP4LQjmFgI3rNiSUCt390rw12RePkFMLMpot7JJgoPeOahrWt1Qc7Xd+H7?= =?us-ascii?Q?xhJcIR7dqX+wkjwwadY8atFyZk2LUlclBt+flSrbM3/xUJX7htO8xpl4wpJM?= =?us-ascii?Q?nj5c1qvldg1cDvwIKYT8yW4Nbe+amz5w9i5ZAjF8F+nijWf+oYwzlJEQeA2V?= =?us-ascii?Q?IgA6A93L+VZ++uN0Wz13nIRJp5L9jKzuLmdOKqEaMUCGstNtWUsEO2xJBCeL?= =?us-ascii?Q?OqNJZT9W2BJGcNcHMrykdWHgpKmPfKj3RcbFkkS+FmYK6/gpTR223RmyoIXq?= =?us-ascii?Q?1oFl2iqnda4WpPxxpNF8qHrI83/duOqJSvBudgPuV77k0QQ4UIM9P7KwA7SS?= =?us-ascii?Q?MvaQ284RlajS7TGHvSYVfzcTWcR3r+g4WSDYnQ9b0iXgJ2d8MFe0rfo4OC8o?= =?us-ascii?Q?zZ5lo09HnNUCCuuMa4L2FqRlYlIVyjGsK659itvS9ANagpDQzyZxwFfRVjBw?= =?us-ascii?Q?kw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6421fbe9-689c-4f9f-1fa9-08dc2d452d4b X-MS-Exchange-CrossTenant-AuthSource: AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2024 10:10:31.6810 (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: QSXA9yrLAqCcYMD91ljkIHYe5Mp1z5njhGsDJcMkVcA+lvbEAQfFxGBdSthCJm0FyuKD3F7OAtsXMxKd+SPgXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3305 X-TUID: qtJTL9vYng2Z This patch does introduce specific kernel kbuild packages that ship the "scripts" and "tools" binaries. The kernel headers fulfill this using symlinks to point to the "scripts" and "tools" of the kernel kbuild package. This is already known from debian kernel packages structure: - Generate a kernel headers package without binaries - Create kernel kbuild packages that ship the "scripts" and "tools" binaries - Using symlinks to point to the "scripts" and "tools" binaries Signed-off-by: Stefan Koch --- .../linux/files/debian/control.tmpl | 9 +++- .../linux/files/debian/isar/common.tmpl | 2 + .../linux/files/debian/isar/install.tmpl | 51 +++++++++++++++---- meta/recipes-kernel/linux/linux-custom.inc | 4 ++ 4 files changed, 54 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl index 956db3e3..7f271367 100644 --- a/meta/recipes-kernel/linux/files/debian/control.tmpl +++ b/meta/recipes-kernel/linux/files/debian/control.tmpl @@ -26,7 +26,7 @@ Section: devel Provides: linux-kernel-headers Architecture: any Description: Linux support headers for userspace development - This package provides userspaces headers from the Linux kernel. These headers + 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 @@ -46,3 +46,10 @@ Architecture: any Description: Linux kernel debugging symbols for @KR@ This package will come in handy if you need to debug the kernel. It provides all the necessary debug symbols for the kernel and its modules. + +Package: linux-kbuild-${KERNEL_NAME_PROVIDED} +Architecture: any +Depends: ${perl:Depends}, ${shlib:Depends} +Description: ${KERNEL_NAME_PROVIDED} Linux kbuild scripts and tools for @KR@ + This package provides kernel kbuild scripts and tools for @KR@ + This is useful for people who need to build external modules diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl index 9babf9a4..0944e943 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl @@ -10,6 +10,7 @@ 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 +KERNEL_PKG_KERN_KBUILD=linux-kbuild-${KERNEL_NAME_PROVIDED} # Constants KCONF=.config @@ -21,6 +22,7 @@ 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} +deb_kern_kbuild_dir=${deb_top_dir}/${KERNEL_PKG_KERN_KBUILD} # 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 e91d33bb..97780dcc 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl @@ -33,6 +33,7 @@ do_install() { # Trace what we do here set -x + # Run the install steps install_image if [ "${ARCH}" != "um" ]; then install_config @@ -43,6 +44,10 @@ do_install() { install_kmods install_headers + # Cleanup and install kernel scripts and tools + rm -rf ${deb_kern_kbuild_dir} + install_kbuild ${deb_kern_kbuild_dir} + # Stop tracing set +x } @@ -171,21 +176,15 @@ kernel_headers() { mkdir -p ${destdir} mkdir -p ${deb_kern_hdr_dir}/lib/modules/${krel} - (cd ${S}; find . -name 'Makefile*' -o -name 'Kconfig*' -o -name '*.pl') >>${src_hdr_files} - (cd ${S}; find arch/*/include include scripts -type f -o -type l) >>${src_hdr_files} + (cd ${S}; find . -not -path './scripts/*' -a -not -path './tools/*' -a \( -name 'Makefile*' -o -name 'Kconfig*' -o -name '*.pl' \)) >>${src_hdr_files} + (cd ${S}; find arch/*/include include -type f -o -type l) >>${src_hdr_files} (cd ${S}; find arch/${ARCH} -name module.lds -o -name Kbuild.platforms -o -name Platform) >>${src_hdr_files} (cd ${S}; find $(find arch/${ARCH} -name include -o -name scripts -type d) -type f) >>${src_hdr_files} if [ -n "${CONFIG_MODULES}" ]; then echo Module.symvers >> ${obj_hdr_files} fi - (cd ${O}; find arch/${ARCH}/include include scripts -type f) >>${obj_hdr_files} - if [ -n "${CONFIG_STACK_VALIDATION}" -o -n "${CONFIG_HAVE_OBJTOOL}" ]; then - (cd ${O}; find tools/objtool -type f -executable) >>${obj_hdr_files} - fi - if [ -n "${CONFIG_GCC_PLUGINS}" ]; then - (cd ${O}; find scripts/gcc-plugins -name *.so -o -name gcc-common.h) >>${obj_hdr_files} - fi + (cd ${O}; find arch/${ARCH}/include include -type f) >>${obj_hdr_files} # deploy files that were matched above tar -C ${S} -cf - -T - <${src_hdr_files} | tar -C ${destdir} -xf - @@ -194,8 +193,11 @@ kernel_headers() { # add the kernel config cp ${O}/${KCONF} ${destdir}/.config - # handle kernel development tools - kernel_tools + # add symlink to scripts and tools directories + ln -sf ../../lib/linux-kbuild-${krel}/scripts ${destdir}/scripts + if [ -n "${CONFIG_STACK_VALIDATION}" -o -n "${CONFIG_HAVE_OBJTOOL}" ]; then + ln -sf ../../lib/linux-kbuild-${krel}/tools ${destdir}/tools + fi # create symlinks ln -sf /${kernel_headers_dir} ${deb_kern_hdr_dir}/lib/modules/${krel}/build @@ -209,4 +211,31 @@ install_headers() { kernel_headers } +install_kbuild() { + kernel_kbuild_dir=usr/lib/linux-kbuild-${krel} + destdir=${1}/${kernel_kbuild_dir} + src_kbuild_files=$(mktemp) + obj_kbuild_files=$(mktemp) + + mkdir -p ${destdir} + + (cd ${S}; find . -path './scripts/*' -a -path './tools/*' -a \( -name 'Makefile*' -o -name 'Kconfig*' -o -name '*.pl' \)) >>${src_kbuild_files} + (cd ${S}; find scripts -type f -o -type l) >>${src_kbuild_files} + + (cd ${O}; find scripts -type f) >>${obj_kbuild_files} + if [ -n "${CONFIG_STACK_VALIDATION}" -o -n "${CONFIG_HAVE_OBJTOOL}" ]; then + (cd ${O}; find tools/objtool -type f -executable) >>${obj_kbuild_files} + fi + if [ -n "${CONFIG_GCC_PLUGINS}" ]; then + (cd ${O}; find scripts/gcc-plugins -name *.so -o -name gcc-common.h) >>${obj_kbuild_files} + fi + + # deploy files that were matched above + tar -C ${S} -cf - -T - <${src_kbuild_files} | tar -C ${destdir} -xf - + tar -C ${O} -cf - -T - <${obj_kbuild_files} | tar -C ${destdir} -xf - + + # handle kernel development tools + kernel_tools +} + main install ${*} diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 14c7409b..cbd23dc2 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -104,6 +104,10 @@ PROVIDES += " \ linux-image-${KERNEL_NAME_PROVIDED}-dbg \ " +# Append headers depends +HEADERS_DEPENDS = ", linux-kbuild-${KERNEL_NAME_PROVIDED}" +KERNEL_HEADERS_DEBIAN_DEPENDS:append = "${HEADERS_DEPENDS}" + def get_kernel_arch(d): distro_arch = d.getVar("DISTRO_ARCH") if distro_arch in ["amd64", "i386"]: -- 2.39.2