From 2ebef960dd0cd6b613f55efc5684d2a2d6c418ba Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Mon, 20 Oct 2025 14:25:18 +0000 Subject: [PATCH] corretto-8-bin: remove libgl, cairo, gtk+, pango dependency Not necessary, checklayer was complaining about this. Fixes: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15997 (cherry picked from commit 63947ba2b223aca6fdfd6f50cdd4bb34d6a1e8be) --- .../amazon-corretto/corretto-8-bin_8.462.08.1.bb | 8 -------- recipes-devtools/amazon-corretto/corretto-bin-common.inc | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/recipes-devtools/amazon-corretto/corretto-8-bin_8.462.08.1.bb b/recipes-devtools/amazon-corretto/corretto-8-bin_8.462.08.1.bb index 0315e4df8c..79b3c8c8e4 100644 --- a/recipes-devtools/amazon-corretto/corretto-8-bin_8.462.08.1.bb +++ b/recipes-devtools/amazon-corretto/corretto-8-bin_8.462.08.1.bb @@ -44,13 +44,5 @@ require corretto-bin-common.inc do_package_qa[noexec] = "1" EXCLUDE_FROM_SHLIBS = "1" -# nooelint: oelint.vars.dependsordered -RDEPENDS:${PN} += "\ - cairo \ - gtk+ \ - libgl \ - pango \ -" - # this is used by meta-aws-tests to find this recipe for ptests, so it should stay in this file instead of moving into corretto-bin-common inherit ptest diff --git a/recipes-devtools/amazon-corretto/corretto-bin-common.inc b/recipes-devtools/amazon-corretto/corretto-bin-common.inc index f45e6c12a7..8979983d11 100644 --- a/recipes-devtools/amazon-corretto/corretto-bin-common.inc +++ b/recipes-devtools/amazon-corretto/corretto-bin-common.inc @@ -58,12 +58,12 @@ RDEPENDS:${PN} += "\ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','x11','false','true',d)}; then - rm ${D}${libdir}/${SHR}/lib/libawt_xawt.so - rm ${D}${libdir}/${SHR}/lib/libjawt.so - rm ${D}${libdir}/${SHR}/lib/libsplashscreen.so + rm -f ${D}${libdir}/${SHR}/lib/libawt_xawt.so + rm -f ${D}${libdir}/${SHR}/lib/libjawt.so + rm -f ${D}${libdir}/${SHR}/lib/libsplashscreen.so fi if ${@bb.utils.contains('DISTRO_FEATURES','alsa','false','true',d)}; then - rm ${D}${libdir}/${SHR}/lib/libjsound.so + rm -f ${D}${libdir}/${SHR}/lib/libjsound.so fi }