Skip to contentSkip to conversation

update-rc.d: QA regression.

PATCH New Armin Kuster 1 participant 2 messages Feb 17, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 update-rc.d: QA regression.

I noticed many new QA warning with arm64 mulitlib suspicious values 'initd-functions-dev' in RRECOMMENDS [multilib]

I believe this is a regression via commit
http://cgit.openembedded.org/openembedded-core/commit/meta/classes/update-rc.d.bbclass?id=cdcebd81c872cb7386c658998e27cf24e1d0447c

---
 meta/classes/update-rc.d.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes/update-rc.d.bbclass +2 -1
index e1e0e04..06e3b21 100644
@@ -91,7 +91,8 @@ python populate_packages_updatercd () {
             return
         statement = "grep -q -w '/etc/init.d/functions' %s" % path
         if subprocess.call(statement, shell=True) == 0:
-            d.appendVar('RDEPENDS_' + pkg, ' initd-functions')
+            mlprefix = d.getVar('MLPREFIX') or ""
+            d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
 
     def update_rcd_package(pkg):
         bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 siteinfo: add aarch64_illp32 decode

---
 meta/classes/kernel-arch.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/kernel-arch.bbclass +2 -0
index e0fe22b..09793fc 100644
@@ -25,6 +25,8 @@ def map_kernel_arch(a, d):
     elif re.match('armeb$', a):                 return 'arm'
     elif re.match('aarch64$', a):               return 'arm64'
     elif re.match('aarch64_be$', a):            return 'arm64'
+    elif re.match('aarch64_ilp32$', a):         return 'arm64'
+    elif re.match('aarch64_be_ilp32$', a):      return 'arm64'
     elif re.match('mips(isa|)(32|64|)(r6|)(el|)$', a):      return 'mips'
     elif re.match('riscv(32|64|)(eb|)$', a):    return 'riscv'
     elif re.match('p(pc|owerpc)(|64)', a):      return 'powerpc'
Signature · 1 line
2.7.4