From 333580b68037ef756fa637bbfc49f34f1ad5e0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 24 Feb 2023 11:53:15 +0100 Subject: [PATCH] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arm and aarch64 packages don't contain examples anymore so drop the config option to install them to prevent build failure when selected: >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") Signed-off-by: Sébastien Szymanski Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2e..af1d8cc1dc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/package/freescale-imx/imx-gpu-g2d/Config.in b/package/freescale-imx/imx-gpu-g2d/Config.in index aeca087f86..c143b17c47 100644 --- a/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/package/freescale-imx/imx-gpu-g2d/Config.in @@ -18,12 +18,3 @@ config BR2_PACKAGE_IMX_GPU_G2D This library is provided by NXP as-is and doesn't have an upstream. - -if BR2_PACKAGE_IMX_GPU_G2D - -config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES - bool "install examples" - help - Copy the Vivante G2D examples to the target. - -endif diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index d94da24d8f..42a1fe70cf 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -26,15 +26,7 @@ define IMX_GPU_G2D_INSTALL_STAGING_CMDS cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr endef -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y) -define IMX_GPU_G2D_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - define IMX_GPU_G2D_INSTALL_TARGET_CMDS - $(IMX_GPU_G2D_INSTALL_EXAMPLES) cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr endef