diff mbox series

package_qa_check_rdepends: Allow /usr/bin/sh if usrmerge

Message ID af76d8aca13740020e829d985af5c634a7115358.1697788121.git.joerg.sommer@navimatix.de
State Accepted, archived
Commit 330dc61053afae8a1812bda6f9e01e2f09d1f08f
Headers show
Series package_qa_check_rdepends: Allow /usr/bin/sh if usrmerge | expand

Commit Message

Jörg Sommer Oct. 20, 2023, 7:48 a.m. UTC 
If the distro feature usrmerge is set, all files from /bin are moved to
/usr/bin, i.e. /usr/bin/sh is the same as /bin/sh and should be allowed be
ignored, because it's always present.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 meta/classes-global/insane.bbclass | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass
index 6f3cd3026d..ecc868a4e0 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -923,8 +923,12 @@  def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
 
         if "file-rdeps" not in skip:
             ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)'])
+            if bb.utils.contains('DISTRO_FEATURES', 'usrmerge', True, False, d):
+                ignored_file_rdeps |= set(['/usr/bin/sh'])
             if bb.data.inherits_class('nativesdk', d):
                 ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl', 'perl'])
+                if bb.utils.contains('DISTRO_FEATURES', 'usrmerge', True, False, d):
+                    ignored_file_rdeps |= set(['/usr/bin/bash'])
             # For Saving the FILERDEPENDS
             filerdepends = {}
             rdep_data = oe.packagedata.read_subpkgdata(pkg, d)