From patchwork Tue Jan 11 23:58:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saul Wold X-Patchwork-Id: 2330 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 083D8C433F5 for ; Tue, 11 Jan 2022 23:59:04 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.16321.1641945542932355776 for ; Tue, 11 Jan 2022 15:59:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=YT4weYUE; 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.178.238, mailfrom: prvs=8010f76d9b=saul.wold@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20BNgaBH030032 for ; Tue, 11 Jan 2022 23:59:02 GMT 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=YT4weYUET4FqxIWJ95bWIjliKxxa6W/KQwzZI/ypfqEV5hr+f3MK/laV30nnwv3TaabD llAxlvqKktw26o7+dokGub1DVbE8w9KFCyZmlkNoUN/AU+gzKeRqwGsFSg5M3EJh0VEl fMzq5qpfIw6KdaZhDkm6eFCbeQ2J3iU0YhpLxupd8eMC4PDwvm0/IfcqiZ6E+mF8GSWn ZkMtdHuPFeTh6BeX6PNN/+TMeJzKwtIi3VNAH6ZPWlUdhmH5Tm10RBzbrSNuS+3lo3rD kB/K8DgyobKjle1E2JVSPT0cjlIdeoPFdUhl44L+i1mEnVdNOyg15ENChBz8HksN/n6O /w== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dgdxj1gcg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Jan 2022 23:59:01 +0000 Received: from m0250812.ppops.net (m0250812.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 20BNx1v4029112 for ; Tue, 11 Jan 2022 23:59:01 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2109.outbound.protection.outlook.com [104.47.70.109]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dgdxj1gcc-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Jan 2022 23:59:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=duunz/+80hrsCYS6U2JpvBd+I2UL+g+m0VUdOOnXweU1axJu5WnyTNJMDtjLduqSybJtFO4EYBiT1v8eQ+ZF9l7i0NuweMw/yavE5UoC+K3YrKfPxPEnf+aaYi9e7dzXkMgZ5VC+DlUgG7RURul8EIOOWM0czR6lbNQmisp9uTlkn2KelPTpDqEhzBXwo4BrKgvmQ0Q66iEDXbsmU1g3yXJvcYB8dUondLVAgh8rVndTcL2oE42HJwptKznBen8Dz4EuPUOjkULOXhuz9biQ2KKdgg4J1JOME4cK/ISTq4Pvtgzk2eLVLTF95Hd6ELGFMj8AXF8Byhij36Jv/6f5rw== 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=h10icjIVcxn1/YVeVPYPkHVF1EODQTTNALe3M0gjTzeRhso/pQFjguONC2qoMER0PnfVkdcWUlPlqvag7UD7p8NJ31yt5/zC9CsHb/1rS8wRkBqsqgd8uTdNAqzYrhAnsFHKiWTmabWIOWNVc1+naC6Wnehh4ea4FqOCxoy6J1zkly2XeJ0HOKzGRJIo0aS7Yotu2KKjSqNVABfhiOkTuHgp1gNl6HUC7Ujcd3CgY3QJNFqr2xHclM6Xe5CoVbhqTszFHTfPSHt8qEnXResRqNKu//p0PW2scnYUMWePu9DnC0B4QLbUq0qPZk/dDSqPN6swtvI9b0SoaUkg6SXtRQ== 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 MWHPR11MB1280.namprd11.prod.outlook.com (2603:10b6:300:2b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 23:58: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.009; Tue, 11 Jan 2022 23:58:59 +0000 From: Saul Wold To: openembedded-core@lists.openembedded.org, bruce.ashfield@gmail.com, JPEWhacker@gmail.com Cc: Saul Wold Subject: [RFC PATCH v2 1/3] create-spdx: Add kernel work-shared source Date: Tue, 11 Jan 2022 15:58:38 -0800 Message-Id: <20220111235840.81471-2-saul.wold@windriver.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220111235840.81471-1-saul.wold@windriver.com> References: <20220111235840.81471-1-saul.wold@windriver.com> X-ClientProxiedBy: DM6PR11CA0018.namprd11.prod.outlook.com (2603:10b6:5:190::31) 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: 25138c9a-b704-4685-408e-08d9d55e55f1 X-MS-TrafficTypeDiagnostic: MWHPR11MB1280: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: bkS/5XIt6z8ow1C1BicZOypmwuqT6eT1f+TrVbR1idAPHjhHW59humfHaZ08r0hJo0Rew9jRRYAtyCbr2nCVM5PkbnJZ5Pp9PhVALy+3GrqX8NYWIGZm3dyCj8y4ujwhdZAB4DG0tXn0L9OyQ6TVSNPRZlmC4zxZXcdPohohDZXh6W4rQRZCbFYZU0bQjpqMuza/ZPOWq4n4jPgi/WkpkeAtHl3J815Mr09SNxex8G6Igudf/X+MYeGvkfzPImCMEc0bNFZmdSyQ5AboFN854gNnfhXdX/bFCVAOkS9MwByzJWaCODL4TsiEbKwSwCJvl7rDXXp4tUFnPvzpje/zOWvr88AFzv+sgVHEVOr0MKNv9gSWvj50Ibr9hXZlJoEN1hGxv1rm/o0X0mSkAWqry/8BurPNWDXtfQsPPqes4oDeluCS6Ye3p/Fqs1gzcIqGMpjOhSxAxi1Tl4jyQU5TuxGlUJrDsY9v/E931so3gOcp1+7inrbS/u/SaEfpt4NZsdriciVgVE1KenqL1KPj3rM7J66eP80A9vYaoIZS5E4kggTtgR7UWuybh+zqk+T67IxDX6RLQ5vn/vlg4ij0Z2HEfXU2lEMyKCb/pJTMxQhDfzF3wfCmVVzoTfnMYotYNA8Rn+XD5qB+92tLVfvSHWKbnQc5Q4zrEiqYT0w5w2jki0fBOOMbfUCZ05RXgJy6qxVMmu7DS7GSp4HZvMZwDQ== 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)(1076003)(508600001)(36756003)(107886003)(52116002)(2616005)(2906002)(44832011)(38350700002)(6512007)(5660300002)(86362001)(26005)(4326008)(6506007)(66476007)(66946007)(66556008)(38100700002)(186003)(6666004)(6486002)(8676002)(83380400001)(8936002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nXjKQLWSm0HNapnZ8nYbm0r+THIDWwxYQCUs5YjhgUeKvq4YmjjLVjBNwrNTqxtBwqNA8q88u5WUjxkEBO0GucS6Q22lKalVe4apXDgdf6D70xRKoiIAynBnBGNDl9WOa4hqM0Y0DRzplx8+9haK2Zd3R/OvFQuFriwJlhtPt1dH8jzbQayiUvT6KwtuXOUNIlDIQ0C3I3EZWVGPYoR5CkxFelkrL++ctVOZQ7scGnSeXqtZt1jJNPjxT48Y59aEvjvXAdqQ58iuytGeJD3aAn6NELJUVG19i7B9JNd9GaVo7tnKLnCnMEOcmicRWZGSG6n2GXQBfJL6oM67Tv6ZTGIxq5qEcHPJY5DvjffVTfSSUeywP9pQHDz+UFYtfhAef8FB1ml6VuG4D9KEx7HC0yPdIbC3fErY6fzmbnN7BFYNynUW5EaXPA1PdsSeuC0zmTyzqxU5c6jbaVqRCFEuUf+PwcjGafwvkzeQKMLRfakoftN8yh7sHLL/N9LFmdkmr2Yk+QJrCFWt7Mul0pYlXTtMVFWDiQuF6+pv/T1+gIVu+Pn+TYGTiCNVBCpAWxi5aSGtCho60U/9LfSMVAwj4hwUV5K2H9wEVZZKhCoMz/8S04HbH+XC9o2eYdF6RmwAJQqpwJYYF0hhbXAPR813ah4O2sGEVWA24vEk7jq3BKRgKvhsZK+ESn5iXCxFRwCGr5BocRetZp++rUoIIkcQ5DIcTTiqUzKOlW9oq63vR0jPt0Hf1lyDL6Fazu+qwo9KcGXHbA3+tVFOcoC8jtyf/oMQARujfTybBjeuD1Ka/+HeBgkDuHHwX19DYKi3eduhSUc2ND1n86VeRYAQ1pJ8TGsfgnf/AM3/TyBmCbDnLJcfr7yiIlSmbYKxMGmck8PknXeZJFkyh/zv3p6ZMixQ/HDlGuc1R4+6wx4sAaaqmcRoPEtxgzHnBBKcSooq+ZpwUlnJC7H8Lut9JsiHP8tdSK5L597elzMdaI7WatGMUdmVtPUN9ltKdhpI9oyMgZcsoEjPrqyr8tgYQejVoCCPGiG7BbxHZUYIJ99QNpi1h0PbNGWyQeSxDMRgVRUZzHeoAu1RPBAYzSovZn4q1/OXw83xpkKh4aydpBFiq7S9OclKEKcQ4y9v9ijWovhzUuFtjMiFwfMTftZUn/dSFMGXdv/43h2EofCWJ0QpZnw2KpNWUXBUmWrob95N0coVwwFrB1bGwxct60ZVF4CGSJsNBf1PCSr7TE1dEwRvmK65pfbv8AtWwAgqVSpmoyY8hRtopRL3uYPNa4HfWOs/e3Y/nglGfcv0xyDa53akyIW7qEjSfvBx2Q4TD3/XB4FGLM7/9OiyMYVbcidfll/fMFkJ4HDCKshXWgdgZxNw6jams4/mrtltNs+2VqRVCeMV2WBwrm1mMY0wBEB2HyZ4o1+cDPVfxGCsLZzK8PBhvO0lCDI3XW/bAr7oUZk7fupk+EWWBvCGQpDWYHv0RL3yL7oLhqRyhKVvbJvmcJGR9XVvOx9Vboxvb0k6estyD4SAL58Kbj/ZQsrU82APN6hCUyx7XHMuopdDSgkgj0KhaS4hTQxt1l4xPIqwaOX2Et//WyY6c7qz/ssoOr/sCjVkgKrR6Q9ZT2boG8yNDiJ4KE0HTfI= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25138c9a-b704-4685-408e-08d9d55e55f1 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5076.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 23:58:59.7339 (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: O1UUw4i5U60t1hF51jJfk4l84Sfs/C83+NDgZfWJNOzJ+4Em6GxZ/9//5lQ2oTmKDj9ahdSTrPJBXCkzsNq02g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1280 X-Proofpoint-ORIG-GUID: r9ihfhPsXMh2JGveBkle3kPVEOOA72Bv X-Proofpoint-GUID: pIT-JpHqFBhxIgUPW3vzRAdkhtg5B_wP 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-11_04,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=858 lowpriorityscore=0 spamscore=0 impostorscore=0 suspectscore=0 clxscore=1015 mlxscore=0 adultscore=0 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201110124 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 ; Tue, 11 Jan 2022 23:59:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160473 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 Tue Jan 11 23:58: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: 2329 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 0FFA5C4332F for ; Tue, 11 Jan 2022 23:59:04 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web12.16556.1641945543187980032 for ; Tue, 11 Jan 2022 15:59:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=i+IYFh+F; 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.178.238, mailfrom: prvs=8010f76d9b=saul.wold@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20BNsIeN020017 for ; Tue, 11 Jan 2022 23:59:02 GMT 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=4veZL1KTLakNolFm90Da2MLLobjULX9TzR3KUBSdKFc=; b=i+IYFh+FBUoCN+gwvTfxuMp1IHrIo0n047xHahj0Hud+i63ZuwiYkKCfx2uw8Pwiqvap xD3Az3kXfN7Q4McGnCjKK4yQZNbMpQ8y/3ig1exxnlO2Df8UZzdvB8kg7dWWAjr9jnwz u+TJZXgOvcz4q5CvoB6wrP7DcjU0pBT1ZHFxIAWZJ7n+bjR1OqNsF1iz53/Z6koGZpxU 34lsKYAKjrcOsZXXjh7ybqa4DoUTuQBMzS3UJs1zb2Bo05WK8+P6YQkzR1Jeiazfm0g2 RHCOqcfREv37V9OvtT7mFRRY4YwOqXkCTTr6VThaG6cRchIEqPOGtVCethvcUfF5f2Jw kA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dgdxj1gcj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Jan 2022 23:59:02 +0000 Received: from m0250812.ppops.net (m0250812.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 20BNx1v6029112 for ; Tue, 11 Jan 2022 23:59:01 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2109.outbound.protection.outlook.com [104.47.70.109]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dgdxj1gcc-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Jan 2022 23:59:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LNc7NrEm6xBYKO6uW9Y5S3cC4+OvgyGquzq5jTU4dS5MsutXyHgIKsCPh7KmAcV+lXK8gOH2K1Ssw/dglZjKKaTRBwYW5fxt7wn3BMfsxwz9wzWEGNU9CX/3Q6eAit2yq2kKIGB0p1XpeL07jIy1LEuAaP0+9Q+NUvZPztCYxRso8XgsR05/J0bdXnQhe2iOBXwoH5S65seXTSAFq3xJF50qX6ey6RJBBL3OTHVmHK5Uty5N4WpUKxznZoexdTCsZ0p3xGZ5zZCS1whv75SdsV+laXTzBX/LotcTLKD3QLZUy2wrg45liK+XSnZfwDbx1nw0LVoGEwL5Ed8vYp0f8w== 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=4veZL1KTLakNolFm90Da2MLLobjULX9TzR3KUBSdKFc=; b=Inh2NwvcgHPKjWHcRUzOV3aMQFDKSxzp7b4CJwXhzMTgp2XMCJX+D4TYSTRb9Ggz32xiccfqsH4FBeyFXyoMKAxgaIv0GAWGd6vNVag51ljkDvzXVHXJwAJ95xEDMNo9VwyyGfsQDgU5zsDdUUvWkTnPTKyH3nOx0r0P2RVW9SW84TGcoNn0uRkCuTO/e/p/51BvX1HonG7R11kbZLt0zwg+tPloe0A1JpID8eu2mbTbBIGXzwO9/sPip10iwvoaW/Feujfzs4RmJxTCaTXL4qXHgJ32QoEeEbTKS051aRMNX3BLRNlWWf6zgN1y44fnhUuaiM2PaNxF2gzNqfxFmQ== 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 MWHPR11MB1280.namprd11.prod.outlook.com (2603:10b6:300:2b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 23:59:00 +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.009; Tue, 11 Jan 2022 23:59:00 +0000 From: Saul Wold To: openembedded-core@lists.openembedded.org, bruce.ashfield@gmail.com, JPEWhacker@gmail.com Cc: Saul Wold Subject: [RFC PATCH v2 2/3] package: Add support for kernel stripping Date: Tue, 11 Jan 2022 15:58:39 -0800 Message-Id: <20220111235840.81471-3-saul.wold@windriver.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220111235840.81471-1-saul.wold@windriver.com> References: <20220111235840.81471-1-saul.wold@windriver.com> X-ClientProxiedBy: DM6PR11CA0018.namprd11.prod.outlook.com (2603:10b6:5:190::31) 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: 3d032c27-6ade-464e-d2b6-08d9d55e5671 X-MS-TrafficTypeDiagnostic: MWHPR11MB1280: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: HhpOyaLoqABFoHdLoLRprSr7Jt7uKBvfftj+KNUx7MtLs2jy9wRxiYUKNReVrCmh8LI2n5WEtvTmiQHf8HxFFXlLaMJmS9wGwv466oOLD2Y9B0R96nrrKe9fZKfU0uPQ5b1uiCcHR2HcbZY7OOzZfDQHPnMAl1LTl/qXTNF+94IdcDuZrWCHsf9j3QH2tHYxyyshfi24JALc2KpIa8KfNMyPzzsh9P1KaSqytvxxAIeTGqu5Xa1w7W+JdZx8ZIdEgUFd9pcqX7pgsyXHtasV9sNSHF4V4anrd5BTHVvuR1+V5xlV0MKPvfGzOw8JZvYpS/0u6ERwrzThtP3FEoBbxe4yjhETzGePRg+qsctIEEj8l7cjyJFLZTqOZt18H+qNNVeIL4h1sB9sRk/Q5peDyAVJeXwLoMl9TNa4JD1eycL6HzVtSPy1Jw8LPaqqA6hpy3VmI9Gc+Ek6T01NgdUmC6tOnFxIht4b6hMvgkEZzx04wfoO4hUdeY38cjdmYOr/nwtYdVxAMk0zfJhUSNrngw6IWzZjKFlnhjl8yPjxRXNiH70XDEHiTLCCHRZ4IMLlqseZXUzetR6qL2TuFIdV2ma7+al9ddVZ+iUc/znmExla4p+COwIvTFGHiVTA3Io8ScndvHrOzhMNG97/mMH4NcwjxpZheBaO6XHA+Rp2gyDj/qzAPFUgJ27hcvf3smnIwKIy8IoMClwyMvxIXYMW+5Wkt3l2RdAJA7svTfCVn4s= 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)(1076003)(508600001)(36756003)(107886003)(52116002)(2616005)(2906002)(44832011)(38350700002)(6512007)(5660300002)(86362001)(26005)(4326008)(6506007)(66476007)(66946007)(66556008)(38100700002)(186003)(6666004)(6486002)(8676002)(83380400001)(8936002)(316002)(168613001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LpvIBPGWzKr+jteMquYhQafEQcJE9wiKOL7Mgsqs8k7SwQ/sDC3pDulqsoiQZfgdDCIQ1pe5rpt/87dHb6bMYG56SsAPsnTZnXiGvhVJ9K/HbS3HWXs/GL3LYF7rlJ+PpfiDZA+bxAtzLHv+pOKQRmSszhKx65rLR2NY22qWCSAELXX7Pr61eiYUAMy1N88fF8NgDUEjLQWn7PoHBDAq54uui2tEaqTmIknaJJjjkW9Be3JorUsRfWuw7t6D9wLkgyArd//qnQoYK2IHLdz3U94dbd8duowdOYvF0D0GNhenN/YefXh91UH99Wa2Vz+2lJ6n5eqzbTUDlbekiBgA0Oi4m1qkIvMuWdcxniDTVsiKdVzDvIZt05z5/woT3XGB1dugZRNvidrPr+iZh17HLdalBxuXmDe8YJ2H816itsZBhns93QeNlSu2+BR8ItyHMDU56Mni0BGDo8qyZ4Sqs+ucDwDz6GWCysXlycV+Cut1EBvd9qM6r/4r+7rdod4hMMGO/7adunzyP3OtOWRNPUqLVU/uHYtjvhJbvky1IL+dXBDMqa/B51ZyINF9TPFWWoO+EbLpr7R4RYkBavOzSiyf16mef1WFUN3cjlR1M552BSqRtxEgq6vW1VEQruxICRyBmdbXEkBaZd74USQAcN2eJ9U69jxthQ1vnXUDhDW2P3Lxk6J10p5Dcr0cLOSFZglRhdMbR8XUzhMKDbiHrgaf/PXwyvxgeRON/8UWX7gf2hLI9cZ3UWz1qRHpcNP/boqy7QxNAAMTUO3Ake08hBZMk6pkfLx1CT6Rih+q6hM8k5w15Vbw74IMjei7VUwxgpkdEwlnSCTficeJGKAe1BqNGVZOZGBQZ3igIEhLtNEYHBPZW47gWDZeqchwrU2T2N/Z5d6GGD2W+K+20v7tOKnURwS0vyJW6ly6SGrtbU4PokM9q8NGSWeudektJUhHAYzC2/Eper/ZYLcrBv2v/U50yJ1lWLlyN2Z6IYSEmhtsAI2OD+0bhPbV87bXVVZ/eG5JjjDtk4WheIORiGmdlbBvHk06NOTi0vR+X/GOjtZdf50tDtTPqm7GIitEQYGqK6ZmIChdmmgt2YTRsgzyp302OgREOCaUuMshrSYCgGLot/0yM1OmlWRTegfwZcCV7fS7KwbRKgpUkEutghr23ZMR1U94bEGHUGF96Tbi/le2JzTc2U7oZe3h+M13dJa+YQPQ/xytOGEH456td97SofQJcSL20iCCLonzU7RMBq4Kmx8+OPP3g8n295gD/v2v50ae98ocY+XuBkAmGnILIU0oDSDxvOiFxviAph+20WRfIzMZUJZzn/BB96A/eqMmVuPTNKNJZn3P/P/BRRQI1QUmWYOVuxP0MMQvKjtVBDqFlf8wLaQGbu0oYDS/njNSkH0yxm5V2T7TGLrjeGcsZLB7F8U++C4o+FX6NrzmO2ara8mKDu7RYta9xR7iyH3eQLc7myVxqaJsbV0KLXdZRKiUF2fAzcyW3rNwr3PQkJ4PeFpO/fUyhAQt+r5jY1O5/5DVV+ojc2Z6A5n5PMTRosKPg0MMagQ5Bn5HvWvXCYAkRUbf5szfdvq7rctyqWaC4L+B9WEk6IFhIzTsfO90/oWpp9CJIDf8xque7YRRgnM= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d032c27-6ade-464e-d2b6-08d9d55e5671 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5076.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 23:59:00.6233 (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: 9I5aok5WUGLq1EilCgEcFwqPJCstLlaygLQFOvir5Vmg5bfqyY9uPM3x8xhxcasorKfxwLfGLwZEY8HGJQ4y2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1280 X-Proofpoint-ORIG-GUID: eCQgT9YrjuGPj6MzdXy8ZigjFESdU7S2 X-Proofpoint-GUID: Ib463KAiMij9yOoHogizNT_2k-5hfMlV 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-11_04,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 spamscore=0 impostorscore=0 suspectscore=0 clxscore=1015 mlxscore=0 adultscore=0 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201110124 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 ; Tue, 11 Jan 2022 23:59:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160474 Extend runstrip() to accept additional argument to enable sharing it with the kernel do_strip() to 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 | 21 +++++++-------------- meta/lib/oe/package.py | 7 +++++-- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 09cd376f4af..794996e6d6d 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 @@ -1311,12 +1306,10 @@ python split_and_strip_files () { for file in elffiles: 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)) + sfiles.append((file, elf_file, 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)) + sfiles.append((f, 16, strip, '')) oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index dd700cbb0c9..7842a614e9f 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -16,7 +16,7 @@ def runstrip(arg): # 8 - shared library # 16 - kernel module - (file, elftype, strip) = arg + (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 +40,9 @@ def runstrip(arg): # shared or executable: elif elftype & 8 or elftype & 4: stripcmd.extend(["--remove-section=.comment", "--remove-section=.note"]) + if file.find("boot/vmlinux") != -1 and extra_strip_sections != '': + for section in extra_strip_sections.split(): + stripcmd.extend(["--remove-section=" + section]) stripcmd.append(file) bb.debug(1, "runstrip: %s" % stripcmd) @@ -172,7 +175,7 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, qa_already_stripp sfiles = [] for file in elffiles: elf_file = int(elffiles[file]) - sfiles.append((file, elf_file, strip_cmd)) + sfiles.append((file, elf_file, strip_cmd, '')) oe.utils.multiprocess_launch(runstrip, sfiles, d) From patchwork Tue Jan 11 23:58: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: 2331 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 CABE2C43217 for ; Tue, 11 Jan 2022 23:59:05 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web08.16301.1641945545220746733 for ; Tue, 11 Jan 2022 15:59:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=sksYAk6i; 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=8010f76d9b=saul.wold@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20BNvHWd021464 for ; Tue, 11 Jan 2022 15:59:04 -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=s7SP3oKq6DSGwlqKS2vFvS6w+grurkB2q6KX8k4lPtw=; b=sksYAk6iN20XPSY5qLKCkUKFkMjOasMLGqdJLPBMVPJlZOAiQlJLuAEIIT0Nv0hEyXSC IFObsV/aSh15ZxPDpT+lKdBI0Q1a423Se0VDaOs2oScHvEkiWIevbWV42ocij6lRrTvT J08RcVHXDpimKUJB5fBqYYKT/pLlLB5FWblSfH4ORbD+7EqrZI6lWHq9nrlnyERPzohP en4PaYxOPuS+y2ZFhcFmgKpFCtPg/B90iWXlj5pefwzc2KWhkAN3nFyaB/sCRT9kawEl OdnwmX79OgFQ4yzbd35FYbi1XnC3Q8BNSi97NfU8sP5lsGrJTthKTbsKGir7joUrnVNE ww== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dggv39dbm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Jan 2022 15:59:04 -0800 Received: from m0250810.ppops.net (m0250810.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 20BNx4Hg024136 for ; Tue, 11 Jan 2022 15:59:04 -0800 Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dggv39dbj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Jan 2022 15:59:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BDuQ93SEamcrKttBR61bXWMKJgAgjZdjAXZLhhkGbtFrvas1Kc+zw0d+8sArZeGk6AudHHeuBEs3yclRKVLm20ZlmOCzmr3Pl2KDnAOIapaKQkeAEO87YVv7AU8+7f1w8zz9rIYTdVp0zSF5DzHTeZo+WxfeIH/GZEUz7A12CEHNzfHcbUaxh4hIjqFBs4N4x2h9993PO28xxXpXYpXWLEA0eXcRAG4PhsIwaUkHuX/lauD2r836aPhpYVLoBdVX7vF3JWAGxgxfh3ECtixAARfUZdjQemkGCron0QG+BdNZDxJNMVtVAsHfuydNqiAhGZIDUWMs2GwYKjJn8ul1UQ== 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=s7SP3oKq6DSGwlqKS2vFvS6w+grurkB2q6KX8k4lPtw=; b=hXLZSYQ32B3VP2shd8YsGZmxEc/gpZkCdHClH15qTiEIzMPAHtqcsvm+cUDrm5ZOh7cjru/qWgbHT/q83OfvA+yIM89tXY3XfXNZZduG+LS6etqqBRYWhQd+jLAio5pYY1a00D4DtvjSFMzuf0SRL1z/KOg1PfUgdoO4XB6epcWHbp4YA3Rx6cEeMLp9M9mppA2ptFd9dRl8GwBCNK+XBdjpu97mnFDfwdYfart8V6CHAvQ2LahkStfsGoZhzIng8eM1PkpdcntGrKkoN87QT85qOkzMIu7uT+VulY1gV98XxUdAUmMbmlQdCxQXFyy1nwCnWDpt+rC+e974Yl1bMQ== 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 CO1PR11MB4995.namprd11.prod.outlook.com (2603:10b6:303:9f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 23:59:01 +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.009; Tue, 11 Jan 2022 23:59:01 +0000 From: Saul Wold To: openembedded-core@lists.openembedded.org, bruce.ashfield@gmail.com, JPEWhacker@gmail.com Cc: Saul Wold Subject: [RFC PATCH v2 3/3] kernel.bbclass: use common strip() Date: Tue, 11 Jan 2022 15:58:40 -0800 Message-Id: <20220111235840.81471-4-saul.wold@windriver.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220111235840.81471-1-saul.wold@windriver.com> References: <20220111235840.81471-1-saul.wold@windriver.com> X-ClientProxiedBy: DM6PR11CA0018.namprd11.prod.outlook.com (2603:10b6:5:190::31) 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: a62836bf-38dd-4c07-d904-08d9d55e5700 X-MS-TrafficTypeDiagnostic: CO1PR11MB4995: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: hOS9DYHhQIqKVBS095/QKOuNKo2XwvF7DKRsYVPg5YffMP5IHrdLryCEdvV0+1h/V3oJSg8visPJQpwtv1+72/lgF4PQYHZwQ3PmTouNuQknvUuWseMn8hIgMS7U8oqiwoLlMVgFOarCCK5Cuy/56XvHCknMqQ2/ARnxSHuAf2ZWVklYhDzo9Gec+bEC/8n0vaH+YKm8YGyr0E6RW69j+cpf9inFIdLwqMA3YMfXpk8RWD/qFLJsRxkQiLUL4YrUfqRBDHLQbXM79nqkVAtSmn04PFruNAupg5uqdivqBFtqcwcLdo8UZ3o0jBv4nKwxxR3gdVe8qp/PLUKmgSlYrr7hD9VnNQq8pWVgb5X22uj39PSG2zDEqnTq/kFAXPSNEJjrKc8IB9NSvynk/Oql1e0zVSSuheIfTQh8EcIUBiTxQsOhQuEyV4busWsjWboguHv+vb8zMnvwvjW/mshS4TU4d6S7+4VgMscBwTol5pWLdt4v+zIlf1jnNL56P77OahzTrmmI277ZtpH6X6qoBI/nD+asEaG6bzh11I714ICK5Bi0CRPbA0G0MyQtgknuy/sMSOf0FjXfIFoB2mOhVJBwh3UKdANuRySttAXq2XpFc0VL8GQIxbpSc2/o2NRz6wHutDxUqIAJAtvVrOOTX2Rj4RC32WhoeYSV/OrsZDr8dokx4oKDK95o1Y6yviWQ4NficKTTGMeXSvrTwooRvQ== 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)(186003)(5660300002)(26005)(52116002)(6486002)(66556008)(8936002)(508600001)(66946007)(66476007)(8676002)(4326008)(6506007)(316002)(83380400001)(2906002)(44832011)(107886003)(2616005)(6666004)(86362001)(36756003)(38350700002)(38100700002)(1076003)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pxbsoT/9+v+k8a7QI0tiA+aySYItiP1IXUAf8XjYaVK9ccAnqehxxjStWBVt7O5xv+GdKza6h49KJP2JbVpqdd70RlspJF8zuFScqWdzcavmhybfG7/dPquJMbVsSOGujtGuKOWz5sbIRpSzr51OTw0tK9ew8n7ykdtiKay2LIDb8hhoU2azz+6XX8tSbTeOk+0QgUx7bZLFcSaqWiETjKcLJjf/MD7b+icgUNM4jq/2lIsvw+NSoM4NzSOs7Qd2LbjKFAnCSIg3A4AjzpZzpjLxWRMhP28i3k8XU60cib8xicgc8PxcMNFRx9INhakMBmu9wQSwSk+FVuvrFoVKOtx5nXyP3gVbWpa5FzYXxaRjQcDfUS7hFDLjL16/XUGapEC3xTzweLNBVFwPa0wvOkVxW3GG4FsOmrAQnk8L1S+1y2bF/paA0qM6RlVVsuSlG2THfUL2xlAJt7IEB7ewdR4kZ8MOhhOCWtHdIC9/pJKFg6WnhGeCxFl3l/iDKjakeNu5+dqEUjs+qRkvyRB7pz9WS+hFLAr8aL/8oEsS6CkHHmI5cagVoy48Gev2z26kXmFLDIxpNNPktp8kyn/qbHcOdQuu5fk6LoLpGabLIwTj25eUz80glI1Vx4wi6Dr1ik3GPGyc6EIpa0isHEvr3pk7Wv8uUBsK1E/S7L/IgYKKOpazrssdl8nuwqClGw1OiISJ8bGn+9iIhmPU8OPSs2VE+2PMLSEE3UKWDcNjAHlUadhDqeferS5SgbKEMv4IFGLfDTw6zCUBtVXgMG3aP4SkmOCUk74WgL0zQ+Ffc9W4nColbA0hJN1n3l5okcnmChQG2qedULBVDSWJeQmXux+zYinzR/WVq3mG78UPRW3SGQOs/FSLvbsY0MSAuwnvIOOWOVEfAzVpa0jmoeGy/6wjHsfrGaVgxA9I1z4RPFvudKWqNp0gAbuEZSgt5/hOwNXTixTZqzg0vIcFx/LEX6x8iswf1x6HJUvMF577nBQc0EFS4roQRglW7tC7rI3GV3tAf15DMvUQuCJqBUhghn/6+2DJqJSg5kJMAC4Ahqx0rLvuEM7X9VcUpfbxUN8Y7pnjaqKWwJROK+qAtIuwyxSwNLlo/xyLrnlcbT7dGEa9xkStbf8K01xIqItcSisOKZhx3SIETUSfV6cSVLipUQdDdavh6oelff2S3jTrLg0tRfNFEJ3Jorp5RNUOtY2Q+5l0qw89KhU5ijm618pftrD3DuWahoqPr7dS7QmvNVNITTgtJuV5CGR7AkSRldVhj/xLiPOpiOx0ApOZQeM2MXgv0SEwics/PTO+rd2CBOyRg7WjIonuiYTyDY4XnIVgx8Kd9WPxRA/dHJAN8uSDxu7SBTm3VzrwPvikOrx6gpWXjaVsKjO5NctRoOjBEgwZ3NuFiAlYsmHigFDCe004R/J/C+aYfXdISTDoIF1OkoFfOtyXMgUzOkE2S2+uXQZyIT2SHKYjv1j0NMjHbZIqmI3KXFzylSwZjkF4EOkxm9kUdKF3rIQb7jiVqB3fp+otpH6f5ki6p57v2x58VOGmPY1FzfPlXGbPKm/XXM1pCrvYD+lcOW7yLO51ClnU+DM18FnhcgwI9qdAiWgIExUDbPMbsg4vIPEd2MlSme7AKec= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a62836bf-38dd-4c07-d904-08d9d55e5700 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5076.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 23:59:01.4995 (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: uOVUokoRd+JzpZSWp6rlau3Yhm8pn9473t/qIkrL642SACixLrw5ZdU2JkWA5ozggGDN3t1ntLFzxhGRhJ5BbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4995 X-Proofpoint-ORIG-GUID: AdM7OTPENhg1lF0RPGo5AMxlTq60CbKq X-Proofpoint-GUID: b4oixX0UQNX4O__vqKyVjxmTvXk8Z8Tb 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-11_04,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 phishscore=0 mlxlogscore=999 priorityscore=1501 spamscore=0 clxscore=1015 mlxscore=0 malwarescore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201110124 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 ; Tue, 11 Jan 2022 23:59:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160475 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..b2f9e3c8071 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 is not None 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.note ("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