From a3893814e788d56a5f4f9469c49529ff5ce247f0 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 13:28:50 -0500 Subject: linux-imx-headers: Fix do_install - Fix logic copied from linux-libc-headers to work on B folder - Add comments to highlight logic copied from linux-libc-headers - Fix non-inclusive language Signed-off-by: Tom Hochstein (cherry picked from commit 6d0c1149440511c98fea305f0346b23c028dea59) --- recipes-kernel/linux/linux-imx-headers_5.15.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-imx-headers_5.15.bb b/recipes-kernel/linux/linux-imx-headers_5.15.bb index b7fea42c..9fa78171 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.15.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.15.bb @@ -39,17 +39,21 @@ IMX_UAPI_HEADERS = " \ do_install() { # We install all headers inside of B so we can copy only the - # whitelisted ones, and there is no risk of a new header to be + # i.MX-specific ones, and there is no risk of a new header to be # installed by mistake. oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} + ################################################ + # BEGIN Copy of exceptional logic from linux-libc-headers # Kernel should not be exporting this header - rm -f ${D}${exec_prefix}/include/scsi/scsi.h + rm -f ${B}${exec_prefix}/include/scsi/scsi.h # The ..install.cmd conflicts between various configure runs - find ${D}${includedir} -name ..install.cmd | xargs rm -f + find ${B}${includedir} -name ..install.cmd | xargs rm -f + # END Copy from linux-libc-headers + ################################################ - # Install whitelisted headers only + # Install i.MX-specific headers only for h in ${IMX_UAPI_HEADERS}; do install -D -m 0644 ${B}${includedir}/linux/$h \ ${D}${includedir}/imx/linux/$h -- cgit v1.2.3-54-g00ecf