From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7163980406052618240 X-Received: by 2002:a2e:3005:0:b0:299:ac68:4801 with SMTP id w5-20020a2e3005000000b00299ac684801mr1222913ljw.0.1679041119757; Fri, 17 Mar 2023 01:18:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a4af:0:b0:294:721f:ec38 with SMTP id g15-20020a2ea4af000000b00294721fec38ls853898ljm.7.-pod-prod-gmail; Fri, 17 Mar 2023 01:18:38 -0700 (PDT) X-Google-Smtp-Source: AK7set/CSJdeWkLuXDxCwHW85xkE9rU+OYx9RVdFYULtd3w4qEFd/U0rLnTkQaRxuF1dgUaUbtT/ X-Received: by 2002:a05:651c:1048:b0:299:ac65:781d with SMTP id x8-20020a05651c104800b00299ac65781dmr1183222ljm.10.1679041118012; Fri, 17 Mar 2023 01:18:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679041118; cv=pass; d=google.com; s=arc-20160816; b=m7r6uMwVvapef4H03vIoYEsYpUOc/V/9id1HhI+VtWEiXyD4h9XPNN9litG2kn9ric 0VyuieUiPu46QbCbvWp9uqoIZO+2w7fdcLgX16Xx/5y3O+3OrWuhLjSqJS87w9Clzyc9 HlHVSb+ui0ZtbiXgBV2MZxfLa6ypPwcPyS80HiTm+Yg2BRvyamjUjZuLDGIhxSJnYg6r 1hpHyHmj5qiaZJFhrW7Bg+WVfTxBz5HK4oAOSF2guHzUaIvm/8749B3qaVTqHSpKQQwx JYGMVDHHHGo4mgrmpU9GWWYHRzuRxE5sl0RYIzXDP01v9096HJZRDbq9SsNskfcRcs98 8yxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:from:references :cc:to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=22pPk1SjrQ/0hf/2Q5KqcsLXKBDY/aL3SgwrXk62lI4=; b=hti2urRKisrht0iyBddADg/pLZkh9/2jYCuGBWnFmnLjNgJOwhV+1qtz9zyqv8ZCbC 6YS/dccRhFv3EYKJOz8V0910qLXYT1R1Iry8QTbwVxGGSI9F5rzf+0wz7J9kmhopWtFx JeMFYO9Y37BN61qSqgBmQYlx52uC7RaKdpk8MqrpK4nlHOpmxkZUF9r8WPDxmQQSP76w jPckA0IOqBTIa/2P4x2bnNjmMvGzACpGKXqmDj9zYJCQ4SFaooj2t2cxsyFPb6W1nsV+ MuW563JBx3hCmI/BuEo4GOHOYC79/8ecXnBrdi1lRewF0NV72li3X6vjaZZA+cwYHaBY cxTQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ruhze7My; 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 jan.kiszka@siemens.com designates 2a01:111:f400:7d00::60a as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060a.outbound.protection.outlook.com. [2a01:111:f400:7d00::60a]) by gmr-mx.google.com with ESMTPS id f17-20020a05651c03d100b00295a08c1798si19524ljp.1.2023.03.17.01.18.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 01:18:37 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7d00::60a as permitted sender) client-ip=2a01:111:f400:7d00::60a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ruhze7My; 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 jan.kiszka@siemens.com designates 2a01:111:f400:7d00::60a as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TLohvHkbeEBj0hY87kfW/hZQkdyIMftCBCHd2ZBH0B0HhcCOB1npGFbf9j4FKdD+OD/Ag68XvEDzkuCh2I2vtvUNgSvzLQe1J26awwxV5pZbD3rRllldxNriX7jzyxs1PssJyPdkQ0at1TMemN6+yDm9Asvm4v7NTq/pYjfR4PWZX3fSkIWng/G9zLvTd6gxuXr0vkC8O5UNx8AA1MHVj72PC1TBQnQ3lAc3DjfaEETaAGd055LMx85rWBC0tXouN9YEd+JJe8FsdG+xheA4zzfLf2fhDORxSuMA1eWu1ApV5Gp19yiiP4KgSIDNtXGUcjZkuiayON8FlmjET6DAvg== 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=22pPk1SjrQ/0hf/2Q5KqcsLXKBDY/aL3SgwrXk62lI4=; b=UZwDNblrD6tQz7Xplxg2Y8vBeyhx3I/AyJZjooMf08cSgViX6AFhW94rt/GcnMmpsUcvvCoOFtWPXqqFPYi5Sk+N4mDwMot6Ilm7rvP7UXUj9wpXrySDn3psGIWNLigrBMtwZKNLQrUK2gXBvdt3VHybk2DX3/43Ldim1zfNsn/xH0jjAlyePkUKiilUOrnFY/vuEr0zNQmeEiB3XHh5bJZmJnP/0ilsw8AZH7Gxkc6ibzyHg7rFYqzge1l295UnhZzIZTLHN2u9PYO/e6eQwCLPgmAHdr7FUFYdomYTbXdYMwQV0vQQWb4bE7WqR9h5SYqmkHn7kGVyjfpCqjQkwg== 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=22pPk1SjrQ/0hf/2Q5KqcsLXKBDY/aL3SgwrXk62lI4=; b=ruhze7MyVAn1x1ZKLMUY/gM4wkvmBq9TkXwmp/mBSWW7ofzh27DeVOHZ2xWYM9rsrfvKe94vZsDLgs7H80tr0GgJQFAQI2igqQLLy720EPtSFyefTnXjhIybSevd8mYLfAnBuQH9ajGpZI5Bl5v5LvQyxHwh2vKvgn/qeYnpPYt2I51xnOsO4zmZHkKVUQNoXkVMDxbFpS9upuC83sZta1C2KVsCM+cQ+C6ldKeWyHAAXcg+j/Zx+rvl3RVJ8zmJVF6K47EtHNeDmXpS0khjXXpWLXUhkZaNWZ+Rbp0kgEHI+27yi2DRTuvHCu3ixcv2HmZVWSD037F6m1d8pLd85A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by DB8PR10MB3658.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:132::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.10; Fri, 17 Mar 2023 08:18:35 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::d4b2:77cc:31cd:a3a2]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::d4b2:77cc:31cd:a3a2%9]) with mapi id 15.20.6178.026; Fri, 17 Mar 2023 08:18:35 +0000 Message-ID: <40b7b578-9a5e-5f8e-912a-63b09a4b9b5e@siemens.com> Date: Fri, 17 Mar 2023 09:18:32 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v2 1/5] linux-custom: Split up binaries from kernel headers to kbuild package Content-Language: en-US To: "Koch, Stefan (DI PA DCP R&D 3)" , "isar-users@googlegroups.com" , "Hombourger, Cedric (DI SW MG EPT)" Cc: "ubely@ilbers.de" , "Storm, Christian (T CED SES-DE)" , "Adler, Michael (T CED SES-DE)" , "Sudler, Simon (DI PA DCP TI)" References: <20221220170921.1718503-1-stefan-koch@siemens.com> <20221220170921.1718503-2-stefan-koch@siemens.com> From: Jan Kiszka In-Reply-To: <20221220170921.1718503-2-stefan-koch@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0040.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::11) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|DB8PR10MB3658:EE_ X-MS-Office365-Filtering-Correlation-Id: fc40d916-1214-452d-6a8e-08db26c03419 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: txmAZ5+ZrHg1I2zpkmDPEyy6rNcl3EkMOOlRXpTlc6ncOt5wOWv4vTNUiyqBfuEA0Udul7PnbeAkFGFGJIQ5aIqFzrMIdgz5k1xYgvkEZeHDP9Be9088Mxur3cQaLqZ4f3KccV2ErveJs90B3YPjl4U71qK3Owt2iZh8eCoJPhdmFioSLRNJ/GvsrD+XwdoYxMzFU33JwAVR7IKQVO94HLegI6u1CN8rZT1fSmuOyX8p+91/YlLr35ulD5z+uDXlXDNHSAsBn/3rWX+jdrCFiHTKiii3joloU9xUXSlkdaMuXhghgzj/QWnPr0NSWAUNCodGu5F7TN3XfGFpkieWRfx8ZtXDH3YxhcYW6/wJCAzCPl/yeCBfi/n33HEOpHG6oU71EoA7CYSHG1tZqF2dtok1mePboS0QVlYILA1GPcW8rwN3jqxNkeBPysBShnEG+vANK6L2YbRJZ75wmLmHBzZj6bc+Qcg8Lfm+hhOb8iNUZYqinix0cKRBxtk7da9LMPnfF7MSOsA67Lz73fM7yjyiLU8aPqOLwgNH1E/wpDnEo+pz8QFtAobSjlzlwkrv4yl1IDVsZTWAF+CH64wobzjEWzORqYDdoGa5LM+18FQK1U1WCDpElyc/KOpVIkSswBbttgEf/TJ0T2zBQA68ypIPgNRytYTNjbVdXlvLeCAzOYFHLkVPSrdcjQ2D8IHk+/BHC4lvZGJM8PrQ4bmECXes9btTeg36FILuAIh37HE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230025)(4636009)(366004)(396003)(346002)(39860400002)(376002)(136003)(451199018)(31686004)(66556008)(2616005)(41300700001)(4326008)(66476007)(66946007)(8676002)(36756003)(5660300002)(8936002)(44832011)(83380400001)(53546011)(54906003)(107886003)(186003)(6666004)(26005)(6506007)(6512007)(316002)(6636002)(110136005)(6486002)(478600001)(31696002)(82960400001)(2906002)(38100700002)(86362001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MHZNWHpCWFFnK1haNDJhZHFuUmgyTzBzZXFuRUNETWQ3SCtNQ2dYdSt6YUpw?= =?utf-8?B?NUNWaWcyYWRsT2czbnZxUzZDcVF0dEViazZjUjRvVzJFT21GMTVVVzVDd1Ja?= =?utf-8?B?bXhmd0thWWNKV1ZhMFArMkdwTGZ0UjVQL1VwUEg1aE5HYnpYNU0zNVlOVFFR?= =?utf-8?B?ZnNRVk1vNVVIaWhLTmkvdGxqM0t6S1pSR2FMcVovMzQxOWR1c0YvaXowbE9l?= =?utf-8?B?Y2E1dHZyVEx3b3o0RzNWYjBpS1l4clBjWXF1NWF2NXNuc0o5NjA5VlhPMXFX?= =?utf-8?B?TDNzRm84cUV2UU1paGl6OEh5N3hsTWJmMzhLeXRFQ3pEamc1Q0dkRGkydnRk?= =?utf-8?B?QUttNlhxc0t1UmFrNEFDMDc0djI1Vk5URmQ1bktySDkrWjN2MUhTYzFMRmtN?= =?utf-8?B?cjVxM3pzZ0ZQQWxNZnY1aFRwejBZZllkK0xEWWpFbEU0ampReWxKditOMjQz?= =?utf-8?B?R09rQ1RVajV6NGUwR0VETUFJQWtLQWpoNlN4QWl1Wjg0NDFkUmRtbU40N1dO?= =?utf-8?B?bDV5NlRsTDlLa0V5MU5yak1BV1E5MWkvYUhmWGF4NEFqLzU0cC9ObE5uRFBw?= =?utf-8?B?Z01uSDM0SVB1dE43cnU1OFE3ZzVxWUVRQUFXMWVsaVM0RnVsTWQ4ZmExZlpx?= =?utf-8?B?aTh6K25ReDF3Y1pMMGpyQ1dVcG5DVlVKeXMvQ1h3N0xvL3NRdFR3WENiRHhn?= =?utf-8?B?TGdBQ1U1NjAzRzY5My93aG9MZU0velZrdUVxaGtQR0dMMUZ4SXlEdm5obkpX?= =?utf-8?B?dmd6TUE1RmxrcVVyZmh0V3BDV2l4ZE5UTTZ4TEVHVStJK1hqYXdBYk9OVGFV?= =?utf-8?B?bEwvazVtTTBNa0ZmS1NoaW84WGxPdHdEQjdablkrQnNmRi83YmgvdnlFM3Yy?= =?utf-8?B?ck4xVnF0SU9aUGlVSnNaVXhSaGdLSjl6TVgxOUIrcTZSNUJnVmpwd2g0eTZx?= =?utf-8?B?djZvUVJYaktVZCt3WXYwL2tkN0tJU0NyZDZWQzcvc3dVWDRVbEQ3RVBWZEt1?= =?utf-8?B?UWtlSzZWRFdUOG41ZHdrY3pkVlN5enNWUkp0U2dpRlJmOG8vVjdxQzVzQ1p6?= =?utf-8?B?S3BBUjVkSHpvdzNQWSswZCtpTWZjeGU4ZmJ2YWJJVk5lKzk3Q1lJcS85ZmhN?= =?utf-8?B?RVI4OHZhcWVKa0dUdW5JTFdHZmFvNXA5Y2c5TTl6Mk5xVHBtSHJlM3RuQzlS?= =?utf-8?B?U1I5OFlRNkl4Wlh1MGdQOTcyeS82NityWGFYOTFPcm5KNzB0RnpJcXVjckU5?= =?utf-8?B?NGJDWkpIeVlwaGIxNysvNjBqNXpxSmpJTGl6VzdQOEgwOWR2UDhWZHRScWRj?= =?utf-8?B?T1JqQSt1Vm12TnRWTUFuSU1kK1BTclQxblJlRGtseG1QQkxNSGIzaEFoU3B6?= =?utf-8?B?VXBTVS9qM24xMlR5THdhYmtocHlSbEtqckxDU2c5K3hjYk5KK3k0c2dnMVUy?= =?utf-8?B?KzNiaWdwTlM5Z3Bia2JQZ2dvbVh6eGcrbTZQckdxWmh6ejRqaVM0cXJ2K1U3?= =?utf-8?B?R2xURk9Oa1IxblhSUHljZ09BQTVpbjBNSGxSZ1ZJZ3RIcm5UODlqeWtxT2xt?= =?utf-8?B?TUYvSTFYT2hBTTFvaU1hbVZnNi9qdEdMUVo0Ti9RY0dYR3pnekFYZ0w5Ujht?= =?utf-8?B?LzBrU0RVRWdiQkNIRWlYSk9tWVZPbFhTNG9rR0JMaFNvQ2E1ZFRsUTRxRWs0?= =?utf-8?B?OFRYWlRHVVA2Ukc2b2xKTFJtWGgzYjFHMTdpRGR1VWJzd25Rb3RkaEQyV0Na?= =?utf-8?B?dXJGNVJtWVZJSm50ZDFmUDg1WHE4THozc09MMERqRmQ4dDVMU2pBMUNocGt6?= =?utf-8?B?TFZPL2EyRkE0WG00R3EyMmVhWVoxQitMeWtQc00rMmZBeWpCWXdrQVRVaEl1?= =?utf-8?B?QWZjd245ejVQWUo5NmVLeVh2YTZQeWZnOW1sNFkxZkFPTGo4c0lYai92dWRm?= =?utf-8?B?OVdnbjBnMW5hcDBVQmxFdk9od05hTXloeEhOTWlhaE9yZ1dPbUJFMiszbEJD?= =?utf-8?B?NFJTV1pBTnpTTDJPWEFaWWpIdzlsN2dDMXdZQ2JEWWN3YitMNzY1WVJYL0kv?= =?utf-8?B?Z0d4NVAyc2l6eGdEQ2VhT21LL1NCb2FBMlh1a2IrQzFhbWlzNHVMdnRnY2pi?= =?utf-8?B?RExMR2xKNkRvZnZnWGNnTWZMdXRUTHg4VnQ3MlBWdXA2QmZ5UFhra0dNYXhm?= =?utf-8?B?VVE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc40d916-1214-452d-6a8e-08db26c03419 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2023 08:18:35.3807 (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: IHNzKxBZPg+8g+/GXKHEzXTlEflx9SFPFOKSjr74CpSGTIiAogzHwUBo3kVZiRl6rHpw/7C5CNHK31wmngkAGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3658 X-TUID: 5ttbCqDl6nL4 On 20.12.22 18:09, Koch, Stefan (DI PA DCP R&D 3) wrote: > 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 dd0b624..b19ca2c 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-image-${KERNEL_NAME_PROVIDED}-dbg > @@ -35,3 +35,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 52ebebb..f4c0519 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_KERN_KBUILD=linux-kbuild-${KERNEL_NAME_PROVIDED} > > # 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_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 8a604e4..236b67c 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 > } > @@ -168,21 +173,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 - > @@ -191,8 +190,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 Is Debian using relative links for this as well? Or rather absolute ones. We use a absolute one below. > + fi > > # create symlinks > ln -sf /${kernel_headers_dir} ${deb_kern_hdr_dir}/lib/modules/${krel}/build > @@ -206,4 +208,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 96f0afc..dbda755 100644 > --- a/meta/recipes-kernel/linux/linux-custom.inc > +++ b/meta/recipes-kernel/linux/linux-custom.inc > @@ -96,6 +96,10 @@ python() { > kernel_name = d.getVar("KERNEL_NAME_PROVIDED", True) > d.setVar('PROVIDES', 'linux-image-' + kernel_name + ' ' + \ > 'linux-headers-' + kernel_name) > + headers_depends = "linux-kbuild-" + kernel_name > + > + # Set dependency for kernel headers > + d.appendVar("KERNEL_HEADERS_DEBIAN_DEPENDS", headers_depends) > } > > def get_kernel_arch(d): Except for the one question above, this commit looks good to me. But maybe Cedric has some comments as well, given that he once wrote significant parts of this. Jan -- Siemens AG, Technology Competence Center Embedded Linux