From patchwork Wed Jan 12 17:20:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saul Wold X-Patchwork-Id: 2347 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10FB5C43217 for ; Wed, 12 Jan 2022 17:21:03 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.245.1642008062375206296 for ; Wed, 12 Jan 2022 09:21:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=hNQppaM5; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=801136dcde=saul.wold@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CGf8xP027783 for ; Wed, 12 Jan 2022 09:21:00 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=mybti3GnvXs+GiDwYG3gmRgeurEeCTP+xcqcOMZuwQI=; b=hNQppaM5beyrpKu8zZdAMXIHHonfuoAYahlcfk6PwKEiG/DJeztbUHPQ/QXbqU1rQKtn XMA+jlqOqdWV6Dz9dCrocaQWqvsugTO5kB5W6FT1KEemcmSxS3E/Rvwi6eQp7ummkfwM qo1ltX4PxHyCHdZVMiOORLZ4GjnJ+KnaY65xiunSLd8mC5qm7a4PologTs6tJ6dDInXn yPlWjV966MypMPGzEklLkLSGgSdc08VM9qcW+zZ1AQpNwUviakncvw9gdLwH2BRzyy93 3c4jr+5p6Jjn/15kPTakmvQZdhsTj5dHx2sV5/ckmTSekk4gjHrClF/5g4IvAhP6N4Kz tA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy0786nk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Jan 2022 09:21:00 -0800 Received: from m0250809.ppops.net (m0250809.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 20CHL0Ti026388 for ; Wed, 12 Jan 2022 09:21:00 -0800 Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam07lp2049.outbound.protection.outlook.com [104.47.56.49]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy0786nf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 09:21:00 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EyISRH1qh0gANip9OW1OaE3ND9/wzsMaw57Q9jgAc1JGfSALKjBKSHOUcdkqCsX49idor1lB1h8KocvPQ8opzBpfjjkoKN4oDLLZwmZB+NxjLQMta1hqX45FSEf8UBAyDEIG7Vxv2H9wcQAjZzdCzFDtrZff+/hA6JwT32Xom8l7cAEQLySzEPsd/ClgKH6C6MLojjR5d9WbEkAZDpYuji6KHhMOFBLAaKtiWs3Tq5osjyn+pmL4BthPS2Ypr41M9/fSjJE3CHh3gi+kuC+r+Rgj8F3uoPdII6/s5COp7DUAmu/42Qp1DBmoBqtKnptw3Nl0QO6b0D0ds+HhPHbUEQ== 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=mybti3GnvXs+GiDwYG3gmRgeurEeCTP+xcqcOMZuwQI=; b=NcrIaA4IUTSA8XDf/j/XH/tURYTCpoUsKR3W6gI2sSNj5HlcfdPWcHkXcTT7sXAXUO29NgVH+waxRVgpRZSMsCaNpboa7PZORQOlPK5ZP5SLD4gwQaR7JHEwlDAsd4G22ukg3UwpyHQ248X1t0+R4aH+5bLHeNmCMK1XRRpUCzUT+BSzC7dFG1nStGSZmQkxaa+XSbl6r3P6+d5MIHtTCs8/35XLt4dx4vm90sCWJK+AuvHmDYEW+SWWDs+CSEhWUbILveHSn4q28TjFdGkW3jTeySNTV5bYCCZgEm/Ol4DGzI0oDq90LpOa5abkMj6Mv2j2ikmTK6TCSnh0oDnNZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB5076.namprd11.prod.outlook.com (2603:10b6:303:90::7) by BY5PR11MB4226.namprd11.prod.outlook.com (2603:10b6:a03:1bf::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Wed, 12 Jan 2022 17:20:58 +0000 Received: from CO1PR11MB5076.namprd11.prod.outlook.com ([fe80::2027:9b43:472b:13ac]) by CO1PR11MB5076.namprd11.prod.outlook.com ([fe80::2027:9b43:472b:13ac%4]) with mapi id 15.20.4888.011; Wed, 12 Jan 2022 17:20:58 +0000 From: Saul Wold To: openembedded-core@lists.openembedded.org, bruce.ashfield@gmail.com, JPEWhacker@gmail.com Cc: Saul Wold Subject: [PATCH 1/3] create-spdx: Add kernel work-shared source Date: Wed, 12 Jan 2022 09:20:39 -0800 Message-Id: <20220112172041.143485-2-saul.wold@windriver.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112172041.143485-1-saul.wold@windriver.com> References: <20220112172041.143485-1-saul.wold@windriver.com> X-ClientProxiedBy: BYAPR02CA0022.namprd02.prod.outlook.com (2603:10b6:a02:ee::35) To CO1PR11MB5076.namprd11.prod.outlook.com (2603:10b6:303:90::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3de86ce-597b-4376-af4f-08d9d5efe5be X-MS-TrafficTypeDiagnostic: BY5PR11MB4226:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CyWWjWR19/h6lgcXSQ8yqHPDODt9+HFvMtJfuVXeemMDoRx96Vs1tTdpjFx/idsJoQQKVDYUihxDDBd1md/zFdLW0Ku+aX0mmShfKc/SBA/ZElm5N8EO1HRoFVOQZa408dhU6nalGJnQHUoWm7zDqYPeiIbVFZzFQEzVut08SJNjEqjaqqonq+Nf26bVkUX3pgZvdd/yHZyA+TrntoyF+GrhN15QHvaOjWy2g9iUHm9JaVzXPjgEwXyr/OinSa6/3KO1HHa85+HWo+bRplu3bk55LO3nPBO4l1GkXi5eVvarfvnpgthQfIDi2u0ZiPAOzxK/uYfM32gYXl0ASCnoUz2QLnt5FwymNDNu0e7rgTcEwRYVtYOv7NRYdgEtJdhov5y34d380I6AFPydaSQ+juBFFTOCl4ZbzLmYCZ3EP3AnSQtHOh7JIiIWBg4fE9icSdzSGnBtaExVpANSY/DUgmBhHcom2I2h2WHe98wq8tSTUAhcI/Pu4xMS+yi+ZmWReluknlulGxwgE4usNylzc6UHSuKLBPrg3qlTuXcIX8PnVl2swDMlhbvoKLc+yc7fKQPaylJ365KaZSFWMDkzcGBbUhYa5kennxbd9oCJ+EvYpXmWpjg2zO+D+OwEDNTeLV9RJJDe9DlgGZNbC98XuODomUfR2pSbv+1sMQtPjJlSpFgHzxJ1+gBN1xRib1/oYQ26XzfMWotzbZzOICxGXw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB5076.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(8936002)(2906002)(316002)(6666004)(8676002)(66946007)(1076003)(66556008)(66476007)(36756003)(86362001)(186003)(107886003)(6506007)(6512007)(38350700002)(38100700002)(52116002)(2616005)(44832011)(83380400001)(26005)(6486002)(508600001)(5660300002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: owNlY05rQYP00r/Zu/njBA2em8zXp6qNbuxMgWldyq78mq4aJzIGfJZt6ENzQqJR+hj71ohUB7ExRvcSBu64TwTllJ6QKtN+v+piHPR2of26mVLDWfCFoSHVUQjq5fobs/I5IfLpTmGK/fMjK3ZU2Bdtr2AlaRzx/At2iDz+fjiCHbNpaKbQ0bX0WaUHFn1EhTBTybj72NluSL50oo3eb9WO0J3C23FpyG7hCmS/xMa0S1zbEZ9SWqYrIOWayKsySGwp1S3oWE7EyN3yDzMPuxxow3O5MTJC8TGBXRI3w6GaA4ho00gefTgpdvQecw2yKYeavjX+WsmdJEJ99cfUlFPDRFlo8wA/58xbBCYBf59O30Sm8kADhi4nUELFCEYOW+Xpr60VJ2fxHJdN64AsrDtjsj/4+sfiutCNKtonjn9NZUaDvP7WkK8BT6OwepJ3AD9rBLqj+nEDgekygtnWUbHiWKRWm/cWccd28rjAQl9WV9rYlajtsId8MMjYmWnOXx9q6gg8bMgapRgR8/VxvW4X3/okPBbK8f0oqxxCZFT2YTp20hM4o5X1PkNKigstVVT1D3kHm/V1pGq1O1gfyG4N9L9Jmj4DajB4N1gZkUATptjFFuiGh6lUoFBakX6pXsouXfICqmG9mJdgC/8CpKUOXXQYM1LEZ8tvOF4yy3J1lV79PeDH9TU4192FbLXZNVMsLOsvHUBKjHsBmcgCPPsWo1ELIxBM5Ee29vWhW7CKa/cOxrCrH5ealY2OIK96MKXBRwnko3dLxrtFbmY3/NP9uePE+pLVuhH6TZHbjOqVm+92nlR9X+reYOGzXil8zaGJPXdLEORdO/b1UwMeR9A1wXNLRi/SsrQJueDuBeELZWXsaYfDgxRznvOIDoiYRpklKQkWtLElR4pXIJ5CIdT2LxrDgmGDMG/+KGUordz5BLKD2/MqaZU9iWxQlR6aKyg/36JAeSzBof0nRZv553oex5RTECi0NDjzpmTE1COmfPcQwyBvu55kov97a2fIy/cYeORLdJPcuVU7T1UuvcCwmL4kLTk4ld7G7M+92lUIIN4leNGmDFxs7S9GHV1NSYzZc7OVh7bTfVDaIFCoDQk5PCpm2p4QRiRNlX4fjYitJCpVQfZ5gtW2cGtF8V7qlUBD83VXdAd8d/HmbszHzDh20VY1jTTg+zLP6+czhD9DhqIAxera89cA1AYOSEOmKU2mV+kofMPbVo1Z6hkTziOnsV5/qkczJtikT8ET/bydSc0vAkvNoVQgSoAfs+PUkQY7ko/ce3ry9IuXKiVSx7+RIrLe2itq4E03/46sNlHYUol8P+HOKdmVzEB2E3zc5bL+1Fz67prvju1QvaD0BOucjMR8ZRKmfge+qpaH4IqJb2r1n5RIikJrYdtUmpHEYJszpJASqp6uRNPMDkb34FmFJyWyBRWP9sNwYRMgnlbGQukKH9foycDK6cv558zBWCcEQwbH/ZkeH3yLiGGPHHvruZ4RurCXhtpCTb/cslKtP/rigecxOSK/wifWhozUG2MEfP3wjGVKOPQHPkdz2hYtSskjkkmzjKK7QqR6QEpya3e4lCFxX+60hI+e/ywuywyxjGDP4QEDDx+++PhURwCRt7QgQ9yRIdQYEcYMlYc= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3de86ce-597b-4376-af4f-08d9d5efe5be X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5076.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:20:58.0370 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4lSnxt317XrCN4GaMf+PdjzEoFXpHrsPK99ADzMp5VIPe6sca9pKUtIy6pvwQ9nqFBSSxZi7aP2kbNlpCXx8ng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4226 X-Proofpoint-GUID: xflWD4oQ1sLQD1MIg0XWGmiWKH884SE2 X-Proofpoint-ORIG-GUID: O-UdgdJLGDh3y--jNvhTlV5ESAqiuaKS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_04,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=870 bulkscore=0 phishscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120106 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 12 Jan 2022 17:21:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160495 Since the kernel source is stored in work-shared, we need to add it to the search path so the kernel and kernel-modules source code can be found correctly. Signed-off-by: Saul Wold --- meta/classes/create-spdx.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 0a4db80aba5..e1ff2bbb787 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -254,6 +254,7 @@ def add_package_sources_from_debug(d, package_doc, spdx_package, package, packag Path(d.getVar('PKGD')), Path(d.getVar('STAGING_DIR_TARGET')), Path(d.getVar('STAGING_DIR_NATIVE')), + Path(d.getVar('STAGING_KERNEL_DIR')), ] pkg_data = oe.packagedata.read_subpkgdata_extended(package, d) @@ -275,7 +276,10 @@ def add_package_sources_from_debug(d, package_doc, spdx_package, package, packag for debugsrc in file_data["debugsrc"]: ref_id = "NOASSERTION" for search in debug_search_paths: - debugsrc_path = search / debugsrc.lstrip("/") + if debugsrc.startswith("/usr/src/kernel"): + debugsrc_path = search / debugsrc.replace('/usr/src/kernel/', '') + else: + debugsrc_path = search / debugsrc.lstrip("/") if not debugsrc_path.exists(): continue From patchwork Wed Jan 12 17:20:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saul Wold X-Patchwork-Id: 2346 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 086D1C4332F for ; Wed, 12 Jan 2022 17:21:03 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.233.1642008062211197609 for ; Wed, 12 Jan 2022 09:21:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=OsG/rzzz; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=801136dcde=saul.wold@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CErive030377 for ; Wed, 12 Jan 2022 09:21:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=sPLCAMq4hj80UNeda+r6VX0t/9Oi/qe52EipBYqbRy8=; b=OsG/rzzzRuG0CDFzy4JFTpY7w5dXrS7GIYPYI0j47o4Fl8Auj33ibP6fXfnjLqkO3y/7 ioQY2gMiyUOTQGm/qPNvf+unrYGMI+mnBQGkuaEuqx7sIj0TArDqfqpXr8NGRrf/A8Qr D6ARyH+a6Je9nUY/p/x1Md45akiaQ2ZRkVKDUq8r5Gz3Fx7ziEEnI2BxtIt3+7263yNr ltpNpSkBKdGIsLwN1yLdHNn9P7qgJ0LEklONfX18nwpOnj3cQ6irfOF2h85uo+Y6ax7B IsJMZhFU3sqq/WRuwQCFwSCniz9bsZx/pUDbnGX3GI+Uk3HqK1IIOilf9tYLtg7hF4t9 BA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy0786nn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Jan 2022 09:21:00 -0800 Received: from m0250809.ppops.net (m0250809.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 20CHL0Tk026388 for ; Wed, 12 Jan 2022 09:21:00 -0800 Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam07lp2049.outbound.protection.outlook.com [104.47.56.49]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy0786nf-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 09:21:00 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aqWKl1pN8xwN19rCoK2wgBN4Xbg4WL5+kUwXsEi93Ek+1NA0Ngnv4dhRT++dC/BKJReJ6g4yyfmNx0y2JTjzU2ukBg7/IiNifxNmkuxz0AqEs3oKVS6PnF/jTeXGAJVbavGr8SjSiGaGJaTPS2N7ilzfqvHYS+D8Gg7Mb0dfY3TFQ3W4h5+gaVJH2NTXvedhNF9PclP52aiO+l0d9z8FfrZRuuLr0H7jcrMSp8/gWPmmxe+qElS70Um+XTBnCkJjud73qqzmaiaawx1T+0UM0lH8lNbbp9o6zJF+67OCYzuKHjaE913TVWjOaHDKpL9z0UjZNgdCDma8157AQpc1cg== 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=sPLCAMq4hj80UNeda+r6VX0t/9Oi/qe52EipBYqbRy8=; b=c0C6PMd2ATCY35jDP0SiG4hiAaTy9z+sdIsUlsEFEIhC2cE7skK3jHEX2T01lXpKpPmYBl8dCOj+E2Q2qgZIAxvwM1TWO5Opu/tGIxbix6KghYkkBi5CIOhX31xHDsy/YAZbxIJpYUODvXAhHrQrt/paHoaursEkv+p9g3vRdPkGYgnyiuzJ+4oQ6gTecXxtjxha5D5BgnRhaUdZaiJcRwmblj2CGbj3lHsLwwysVtgMK0QlyP23Q/NXyvG+jijC7p1TQa+a8AojYFFt/jPwy6YdK3faT7O32Jh+0DxLUhnTFx/vrbeKZmpuXzSYL/e0hmS6PW5O2J2IeDZPayTp4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB5076.namprd11.prod.outlook.com (2603:10b6:303:90::7) by BY5PR11MB4226.namprd11.prod.outlook.com (2603:10b6:a03:1bf::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Wed, 12 Jan 2022 17:20:58 +0000 Received: from CO1PR11MB5076.namprd11.prod.outlook.com ([fe80::2027:9b43:472b:13ac]) by CO1PR11MB5076.namprd11.prod.outlook.com ([fe80::2027:9b43:472b:13ac%4]) with mapi id 15.20.4888.011; Wed, 12 Jan 2022 17:20:58 +0000 From: Saul Wold To: openembedded-core@lists.openembedded.org, bruce.ashfield@gmail.com, JPEWhacker@gmail.com Cc: Saul Wold Subject: [PATCH 2/3] package: Add support for kernel stripping Date: Wed, 12 Jan 2022 09:20:40 -0800 Message-Id: <20220112172041.143485-3-saul.wold@windriver.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112172041.143485-1-saul.wold@windriver.com> References: <20220112172041.143485-1-saul.wold@windriver.com> X-ClientProxiedBy: BYAPR02CA0022.namprd02.prod.outlook.com (2603:10b6:a02:ee::35) To CO1PR11MB5076.namprd11.prod.outlook.com (2603:10b6:303:90::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c7fe3cd-dd1e-48a7-fc76-08d9d5efe622 X-MS-TrafficTypeDiagnostic: BY5PR11MB4226:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2150; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y672HyUDH1cBpiJZfDinLu8nMelrthSpoYL2QgGNxPXCaAD/FdOv9Yg7N9TZor3z3Wv94mx/o7TL9aP1kj8Jozm2WLtHiQcRr/DV8IEQ2+vH4GHO+BfPE6KBHsUDmx91rA6cPZu8FSSCaKVcOyIq93sjia9W1LH1GsTBVPHtRIydU8WrrQ4iJA9G2njv/vwaGOZP1aFZcVthZT19Db1GkpqzVo8CYkRyJbVjyDkMYbF8NwU0AzI5P0mZHwnbuCBvfChULPiiwj/R+Cha5E4oF2bVQDsQIUy3dvo0wwoHq6JwwyumwKB82Y3q9OU3Hn5oa3SrI+KYYngyi72vjVbwaN88yUBK3tSWRO7U1cSH0aD2CLdFnOYarveQTuTkZFoUUruFL7+9eNxRkRz8ROpQcHaXbcL2ZSdaCVdaPNJpII53WzHmOGzBJXgxCuuhm8epFfjgi4z6c1dbtb2O0jSbqaT39iXHHGKkDMBjDMoRJ0UceFgOB+gUNm/pDUxu60bfHPXj4zZy1I9C7KM8dRugECr7+LMLeZ5EE2hCiLO1huLrGVg0zniGpRMOBRAyfT52kNrTgBDWCyO590LIHnlnruGRZxlbeWr9lDtzS0bOLmoGcY04IswkRgM9GSWaccrd2AnEOSwHIhCxPXkP/GH0DG2w568vQT7UKvCw4LLSQj8TGZ2rZ/TwANAFHYvd1qfTpsi/JFjUurfDj7V8IV3qywMru3hJBDfXliHehQjE4bI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB5076.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(8936002)(2906002)(316002)(6666004)(8676002)(66946007)(1076003)(66556008)(66476007)(36756003)(86362001)(186003)(107886003)(6506007)(6512007)(38350700002)(38100700002)(52116002)(2616005)(44832011)(83380400001)(26005)(6486002)(508600001)(5660300002)(4326008)(168613001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xUUg4bd3UaTXCQE8cxoFSkshtEtg4YMY6XDaWI5JRP5ymiwNpAoGdfDtAS1H/6OqzBZtvlNxLXp0NK3QzX+DZGvCmjOJKwfzyGlMgz1QwU2TxGxg3feJ14sgxDS0jy6oOB96BAqHIQ5K1/LmGqRwUVBaAsUCEZOOBUHxlo4i7Byq4wHlCRKdoQTUrHNmqbA7iNLVZYyIIYPmSlNwMKqgf1YyWpdFkroADPGHh3ya4zi1Z0iHRximgHasZhl0GuPYzy2ovIg77/6c/HAfEj2f0OeQn/IL8zXRdK9Bxy26F/yYELjnroyxIc+6ptCuvoaRWywl4iJYlTq68PWBpPdMoOSLKFLoceYsbgUD2ognOB8uFBC5fMKwNd6PtTdXSV0LXOStUmpBRhbWSUVx5hx513fwUhqWhVT3LidlljODlLJy72gWdiGSt3JZ4fvusZQnB2esBmOubbXQfpVam8Jjz5YB6SB/QwoIFVQpP9xQlAuwj2fOn6BLNOuWrwh1joQ6C1CybAI4LmhjiaEyHvPAmh/lM0/jYmMOUSaEaZ7YiaD0HLzKVMnrKZoiJb/9nNTmtfH3nX1TF3KDX39cm0wUXQVY4alGeAvIg9wLQB6rQzlVAPiNd09FmFJZ7LEJvt/MshRcxGtE5Wo8BVJZPVOE13ge+lcVYWAc6IonWQ2JZE+l4p09TlfrVhZk7/a4eKlwqCRnYj195q/KWnW3p7U2l9CNQ8kC5LHcK7F8dsYWUGSC8tiCM9ZsyjVQwm7m/PJWhQ6zKG+h9lpCXee9AiM/rfD1te41Py48ytRj6fLAINFtAom3cPPUyQv9YJFYYv/eGVcykxGOtDkGtv6VN2q+TaONxFBvWkpwN7o9XKunQGrqgVfiDtrLyv54sXYb74Db1AKl6MOiLrQKClTZNZzMY4KpLg9e1IfOamb96DPZ/PAOCFO2sdkFyLk2MWRuzbUjaJDouQsiVPI91x+6gPRlgsHyPySRlTAkeWcReR6Yre5+Wss0XyzqJojuzPrbOUCqOOOxTbn7VaIsQZE/ZPZ9SktuzY4Djt7YJ2LBUx5tW95XlmrN7hx+mX6dwwoM5Y8j4DVpHO+s03x0AJxYMNiM4A0+8WDjQLtRKERT8cYCRQNbniXJTEonO0ugxkOiRcG2RayO0wrkkq0Gdeu1ZorJ2TPPb+ifKAK0VCz3vhKzJt/sP2v8K0x8XQwUE5RJCYAxiu3LoOAscq2TtZoJOc+9T9OnxP67iQn2gWcCfVzetHEbgf5u37lq0l8OhQurhU6nHz0xzf5Q41XbT7QxFChpjesvSCA1J9hl7FNDnRCpuiPPY4a+HedyzulQmHOmO+8DcK1aG23cCm/3HAD334U6KhhA+M1HEUCMzJVl2q6Cpn9+34z763CBSoapNFgTF3j0zUX+XZKivly8+0Lopcfo5Uk5j2vcywd1eO8jYi9WcSHzRsa4ZGY9CVvp22tHxI250r3S6UFBPXmZ17U+QjZdy5VXzaT6AjAUasjfrOaYc0nZxYLyLRqasJIV5xz0iORVUdcWoHgx+frwuVZ6qPpLxIV3RpAWCdEyJybi6R90CiEKYe6mpfRwTl0pCcOe9SBpd+DeuviOYCUijgR+HxQZywhjvNf9Kq2TcErcH7Fgna8= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c7fe3cd-dd1e-48a7-fc76-08d9d5efe622 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5076.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:20:58.5838 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hdi+1+VF8BJrYkIwn+WGYTwQVqYRQmLo0l216bC4MY7KfwUWtIj+VgrhE85EDef3BX2oJNT4zRlpImEJuX7qfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4226 X-Proofpoint-GUID: pN6Jd_YzeP5hAVBsqD-YTotPlL_Y6wYO X-Proofpoint-ORIG-GUID: Kjspjecdypp_reF20A111EodL8tkCDPn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_04,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 bulkscore=0 phishscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120106 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 12 Jan 2022 17:21:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160494 Extend runstrip() to accept additional argument to enable sharing it with the kernel do_strip() so that KERNEL_IMAGE_STRIP_EXTRA_SECTIONS can be passed. Since is_elf() understands kernel modules there is no need to keep a seperate list for kernmodules or hardcode the values to runstrip. Signed-off-by: Saul Wold --- meta/classes/package.bbclass | 17 +++++------------ meta/lib/oe/package.py | 9 ++++++++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 09cd376f4af..4927fb99ff1 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -390,10 +390,6 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, dvar = d.getVar('PKGD') objcopy = d.getVar("OBJCOPY") - # We ignore kernel modules, we don't generate debug info files. - if file.find("/lib/modules/") != -1 and file.endswith(".ko"): - return (file, sources) - newmode = None if not os.access(file, os.W_OK) or os.access(file, os.R_OK): origmode = os.stat(file)[stat.ST_MODE] @@ -1122,7 +1118,6 @@ python split_and_strip_files () { # elffiles = {} symlinks = {} - kernmods = [] staticlibs = [] inodes = {} libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir")) @@ -1145,9 +1140,6 @@ python split_and_strip_files () { if file in skipfiles: continue - if file.endswith(".ko") and file.find("/lib/modules/") != -1: - kernmods.append(file) - continue if oe.package.is_static_lib(file): staticlibs.append(file) continue @@ -1164,8 +1156,11 @@ python split_and_strip_files () { if not s: continue # Check its an executable - if (s[stat.ST_MODE] & stat.S_IXUSR) or (s[stat.ST_MODE] & stat.S_IXGRP) or (s[stat.ST_MODE] & stat.S_IXOTH) \ - or ((file.startswith(libdir) or file.startswith(baselibdir)) and (".so" in f or ".node" in f)): + if (s[stat.ST_MODE] & stat.S_IXUSR) or (s[stat.ST_MODE] & stat.S_IXGRP) \ + or (s[stat.ST_MODE] & stat.S_IXOTH) \ + or ((file.startswith(libdir) or file.startswith(baselibdir)) \ + and (".so" in f or ".node" in f)) \ + or (f.startswith('vmlinux') or ".ko" in f): if cpath.islink(file): checkelflinks[file] = ltarget @@ -1312,8 +1307,6 @@ python split_and_strip_files () { elf_file = int(elffiles[file]) #bb.note("Strip %s" % file) sfiles.append((file, elf_file, strip)) - for f in kernmods: - sfiles.append((f, 16, strip)) if (d.getVar('PACKAGE_STRIP_STATIC') == '1' or d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): for f in staticlibs: sfiles.append((f, 16, strip)) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index dd700cbb0c9..7d387ee81d5 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -16,7 +16,11 @@ def runstrip(arg): # 8 - shared library # 16 - kernel module - (file, elftype, strip) = arg + if len(arg) == 3: + (file, elftype, strip) = arg + extra_strip_sections = '' + else: + (file, elftype, strip, extra_strip_sections) = arg newmode = None if not os.access(file, os.W_OK) or os.access(file, os.R_OK): @@ -40,6 +44,9 @@ def runstrip(arg): # shared or executable: elif elftype & 8 or elftype & 4: stripcmd.extend(["--remove-section=.comment", "--remove-section=.note"]) + if extra_strip_sections != '': + for section in extra_strip_sections.split(): + stripcmd.extend(["--remove-section=" + section]) stripcmd.append(file) bb.debug(1, "runstrip: %s" % stripcmd) From patchwork Wed Jan 12 17:20:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saul Wold X-Patchwork-Id: 2345 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1218FC43219 for ; Wed, 12 Jan 2022 17:21:03 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.244.1642008062082805843 for ; Wed, 12 Jan 2022 09:21:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=PwizTaKq; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=801136dcde=saul.wold@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CGwJ1M007582 for ; Wed, 12 Jan 2022 09:21:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=jk3oJTGurNzONcYJGFgtSEL6N/6+NRNMgpGJC4yG53I=; b=PwizTaKqDT5QUiqHj+o//Y3LUMMmwAP5k3ZykZcb8+bWRDyYat288EzLH7Tg0cXUEapD TWXLuN6tt/pczTRFBG5Jsd3+6wc58/btKoJgNjtmpr/7ti+0kUz8zBO7IQkCy4vNfUrC dzRxwNAO680Z3PpQMA/5phUgHBQTdRF7HGJLu+F+xbVRDwmsRU39O692zfCw0EZZCm3L KAO4JPRNXmj035iPHsJMxip6BaXcPJnw+c5HBDplhlN9qJvLeCIGHnIsfROTjOyLcuPK 26nOEDrRo3z45m9X7fOS0pFCcFJvL0p0Y39xt60d0W0PKcoEwUNvoeX0exhcjBtjBnjz dA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy0786nq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Jan 2022 09:21:01 -0800 Received: from m0250809.ppops.net (m0250809.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 20CHL0Tm026388 for ; Wed, 12 Jan 2022 09:21:00 -0800 Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam07lp2049.outbound.protection.outlook.com [104.47.56.49]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy0786nf-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 09:21:00 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JPpftAlRazQNKk+t7Ka+hvkQaZKOPM7+kCPVnAgxmeXLmCZEpqBvZLLZkKgIyECLJAh17Ce4soS1kDq4qSm2DlQVj+6hyoQznPP947qYQ5ziBsUA7ogcJUZKgOiAHcyyHEZf1+LLEHztsRqDjS6lie7p4fFfXG+leAXjTQBj49+KmTJPydxkHpHhZGjGWBhp83bAxjx6Cw/YxRT8sQD1CMTbYC/DUahjIkVQGbxxvudwf0rdAktSO33BaiHR6W8EtnCvNBK5nAWXhHsZ/ySLE6bcIVOfv3kezBQqsx49NyDd3WCwJ8x5hqfFkg0PyTwGCJol0uXa5UH1XpEOI7cEhA== 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=jk3oJTGurNzONcYJGFgtSEL6N/6+NRNMgpGJC4yG53I=; b=PFdanEkkFixBZ/6wwGAnxNmC3nkL//mq4YaPOOs0snfPyL8vL/MmfMuLN/HKjzxaAzg6NeWYKmPIl18xiMXa9GXojqzGJF0TkorqfjhF5vtvhABd+ZEb1IeJmgReEB08wmHB7XUA04WR2MFADKqyZr2OCj1W7nvx0QidGMY1YJGkmKHoj4N5OFoDTxLmhZQJOoLBSdvf1Ql4ueO47Y6E28/ir43roucFN2npCgwJzIrOEOCzJmnvrnciuYKUu0v0/AuE70qalwS00oe+pRbNQxn6CPQpoggw7rPoVRFyeTkmbZaSOdH27BhyNcwgpnLdTH3ygahkCr7uUAoRNL4cbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB5076.namprd11.prod.outlook.com (2603:10b6:303:90::7) by BY5PR11MB4226.namprd11.prod.outlook.com (2603:10b6:a03:1bf::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Wed, 12 Jan 2022 17:20:59 +0000 Received: from CO1PR11MB5076.namprd11.prod.outlook.com ([fe80::2027:9b43:472b:13ac]) by CO1PR11MB5076.namprd11.prod.outlook.com ([fe80::2027:9b43:472b:13ac%4]) with mapi id 15.20.4888.011; Wed, 12 Jan 2022 17:20:59 +0000 From: Saul Wold To: openembedded-core@lists.openembedded.org, bruce.ashfield@gmail.com, JPEWhacker@gmail.com Cc: Saul Wold Subject: [PATCH 3/3] kernel.bbclass: use common strip() Date: Wed, 12 Jan 2022 09:20:41 -0800 Message-Id: <20220112172041.143485-4-saul.wold@windriver.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112172041.143485-1-saul.wold@windriver.com> References: <20220112172041.143485-1-saul.wold@windriver.com> X-ClientProxiedBy: BYAPR02CA0022.namprd02.prod.outlook.com (2603:10b6:a02:ee::35) To CO1PR11MB5076.namprd11.prod.outlook.com (2603:10b6:303:90::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80e696e5-3b4c-4723-da45-08d9d5efe671 X-MS-TrafficTypeDiagnostic: BY5PR11MB4226:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1443; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lEsdaNDA8uVBW8tnrh5hmLvvVZxJN8lTi8qyj6CN9cqFCqR7GmXnIcUu4ONyN5Ucd+b2+NP51eQIDBMGnk0eUyiQPCGP9gPpX0M5YQFOtuEzJGJ4BA480s58BZetUyZmdCVODhpk2Z9g811F9Ja8+xJAb7lpK0LPGfC0NBzHWQGQJzJ7u+AINCOIeTum7ufWXaQ79+lgjgFpIp6FFa90r3W0Vb+O9rCmUMFVrqXuqXz9R5qqePH2iLSQcTb2+po7+NKOG/m2V7P6EYsor2+at6tlsWXXKw7+Izs8IydNvNck9qTVd9UOuIRztLOVZYkhnt/GVW1NoPqjaziZW4SYOkCHwOtE+CD/QgQWPtyq/4WZeWQs2VkZa6Iw2yTViX5vLjytQggaEa/nd6eO0Iv90lUUKk5TQy8jsM+D2SAPGGEx5IXEwny3M39DVwgII5xu2qXuff/M0UNUKxjW6K8zUsgIjnF1IEY6FAQxOd+nykWOfhtfF480hjSR8L17XflOVdAIgoPHVJ6WAt8GMhkg517uta4VmHeYgMmylxyDVCiEi3w6/gKztc6sCqExpaSN5P8Kl7lMPqOLN4t49d1LPaWY5lPOADPDdu82hmPXaJtyg5j89eNTeOCdcwpMB1X/UXoew/R8DkvSJyDRHW7Td4LKxG1MCksyxvAO9fz5HWQoxVLBbU6yR5q8aiCiNdDwZohqFE0HUBn94VqRu06Yhg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB5076.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(8936002)(2906002)(316002)(6666004)(8676002)(66946007)(1076003)(66556008)(66476007)(36756003)(86362001)(186003)(107886003)(6506007)(6512007)(38350700002)(38100700002)(52116002)(2616005)(44832011)(83380400001)(26005)(6486002)(508600001)(5660300002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pBd4g+NZWyIDf+wHk3jUdzVpz8w0LfxCmubxfD4s/TLhxwUEsSQi6ztL7mqFWYkNR52ZJ5186hPD8cBlZ96pM41K+BMcOCVLmFOl03H7UtUc1m9VtEMq+lcYuG6Gus9oKZLJap4J611IPyXIjYP7R7LgeRHpLTxyRUgu0Py167V2q8bZq4lAZLcs/LRvZvipkgc6fH5Xlkcxv++KlDE5tRfTHW130HdzXp6OFeQzDC3YvR+kNtIcYoAUOB8ThSYVKetCOWaKlFwOUpok2XPhG9NbWN2tddZk9uJgqB5Xe79aqGWHVNXnUmfbVhnuMEzDzKyv9y+XuCRRoE8r+pXBSXF48WSFIDwd8ujVFRGAZVpmx5Tm97jGUJB+1WQgBcPzgv2Wq4lvYfooQ4PYdjknnB2p8dfOJLhg0IILtsk0Aj+YX12sG67DSFGYH94a4FaywKc/YfvZ303Stszr1l6gHJtEzTTd8bC+SRk4CNZpgCBqP9PGu2MwF9RNYIUY5WI1Ev1lOZuoWoTGtIWTW2z5OVFaniNT7Q8ZZ6r1AvvileQzpozq56FR0gTVPmZoOw335HO70Rch7VezC5qVaebS5WbzohHyo+YX5GbRW0PR6ctEnfWsxCMTolIa7Llcou7LTyuPVJOK5ZIEbKom/bi+f4ShcxtBjIF+FF8kSGe8mwP318XVTJehWYm2Vj/PIVjyOtqJPm9kn8AbY3vDiNBEWs5Tk5xkYvNHe+zCbwNmau2TTYcU5M6SpkXEhkM0j1R/1LKsPIE3cd2MIm60TIrkR0L+/rMfvqLcStr3bNFxOdw88/atDn42OxVItos3S0zugK/ymkisIc7VDruein+8DweTo10XJRt6ZpQKoq9YWcRfg9K0Ra3JPIGAgUaAoC2X8ITE0VxYcQSF4vp5jDA+o8q/OiVAjZje6XRjBUBvEq8p32bQRAtsgyD7IWmmRfcPPWIYr6fWLh35tuEkO+AjDYbA0GNjJRxQ04bWrLQQFkUlOfd8Bkcg9b01cRXxX36L5jMqE2dZfV4DNVgBHOE5Lld/V1dB68shrjLCufA8blviMgi5E8lFh24FEiLSEFwl1nSbb/TnW7timJtdAZPs5u0KG4TOE6U2QEXVzN/VKK/ERnhqht3Wm2kjXc1dmyiBKQnZu026T77xx7VRRVCsTsux4m3c8WTP30kct7HYLsIHzUQ79l8O5+79bOzui1Wn/WaMOv5YATqdlpkMFWJKYGvzYWPxAXxK1P7nL8/0Q6xxu6muX/f7uEWphAENc3jV8c+H4MNtuuqhvtozgpLpx0ql6lZLOc6puEc38oPQg2ECfDiiVZXgEIw0hpj7tpoqxNyossxJtcLp/8+AAJIEnQNZmqUTbaWA8EhFnrU1cJDbfGGwRRCnSS+C1W6FbcVq2YInMmLdz4umiHWxzQtZDrxupMD2wbOygtLwN5PjN0AuEfU2JDL5JSntNHNqhORNuoWmG9Ef1xi7ZGZ1Xqvcow/lBlij66MBykFm8B1M8ytgMeCvDiaOgESDdtKobGmwzGSTfCSrIbA19V4rsAnkuP/Q3xZHIBR7ZZxCQO1chS3ocVF0FdLIXzul7PITfncNJVZtThBTKUHEObM0k1gA/k+MAI552Yl/LNwgRpOG9Ck= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80e696e5-3b4c-4723-da45-08d9d5efe671 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5076.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:20:59.1006 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: p4Be0jkjjuWqPgW7y8gmpY5YJrzRhBeYLQjs/ShLUVhx9GVNUsvpEY2bpl6l1oNsRTKp9IhzhvuJla/uY4jxNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4226 X-Proofpoint-GUID: YxdqjNL72Ucp70ax4d-q_HHj_ZS1ZYj- X-Proofpoint-ORIG-GUID: 8YNJSTzuGlAZF09Rvz_uU8Iq_7I_jQvw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_04,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 bulkscore=0 phishscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120106 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 12 Jan 2022 17:21:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160493 Re-use the runstrip() code from oe.packaging, for the kernel stripping process. Since runstrip() is python the kernel do_strip() need to be converted to Python also. The stripped kernel image will be used for deployment in do_deploy(). This will allow the package.bbclass to split an unstripped kernel binary for the debug information and extended packagedata. The extended package data is used by create-spdx. Signed-off-by: Saul Wold --- meta/classes/kernel.bbclass | 44 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 7685c6921fa..473e28be477 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -700,30 +700,19 @@ do_kernel_link_images() { } addtask kernel_link_images after do_compile before do_strip -do_strip() { - if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then - if ! (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux"); then - bbwarn "image type(s) will not be stripped (not supported): ${KERNEL_IMAGETYPES}" - return - fi - - cd ${B} - headers=`"$CROSS_COMPILE"readelf -S ${KERNEL_OUTPUT_DIR}/vmlinux | \ - grep "^ \{1,\}\[[0-9 ]\{1,\}\] [^ ]" | \ - sed "s/^ \{1,\}\[[0-9 ]\{1,\}\] //" | \ - gawk '{print $1}'` - - for str in ${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}; do { - if ! (echo "$headers" | grep -q "^$str$"); then - bbwarn "Section not found: $str"; - fi - - "$CROSS_COMPILE"strip -s -R $str ${KERNEL_OUTPUT_DIR}/vmlinux - }; done - - bbnote "KERNEL_IMAGE_STRIP_EXTRA_SECTIONS is set, stripping sections:" \ - "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" - fi; +python do_strip() { + import shutil + + strip = d.getVar('STRIP') + extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS') + kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux" + + if (extra_sections and kernel_image.find('boot/vmlinux') != -1): + kernel_image_stripped = kernel_image + ".stripped" + shutil.copy2(kernel_image, kernel_image_stripped) + oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections)) + bb.debug(1, "KERNEL_IMAGE_STRIP_EXTRA_SECTIONS is set, stripping sections: " + \ + extra_sections) } do_strip[dirs] = "${B}" @@ -768,7 +757,12 @@ kernel_do_deploy() { for imageType in ${KERNEL_IMAGETYPES} ; do baseName=$imageType-${KERNEL_IMAGE_NAME} - install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT} + + if [ -s ${KERNEL_OUTPUT_DIR}/$imageType.stripped ] ; then + install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.stripped $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT} + else + install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT} + fi if [ -n "${KERNEL_IMAGE_LINK_NAME}" ] ; then ln -sf $baseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}${KERNEL_IMAGE_BIN_EXT} fi