Explorar o código

polkit: fix do_install failure for sysvinit & libdir = "/usr/lib64"

While using sysvinit as INIT_MANAGER and libdir = "/usr/lib64" ,
polkit do_install failed at remove systemd directory

...
rm: cannot remove 'tmp/work/corei7-64-wrs-linux/polkit/126/image/usr/lib64/systemd': No such file or directory
...

Force remove ${nonarch_libdir}/systemd and ${libdir}/systemd to assure
all systemd directories clean up

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Hongxu Jia hai 2 semanas
pai
achega
4b2789b90b
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      meta-oe/recipes-extended/polkit/polkit_126.bb

+ 1 - 1
meta-oe/recipes-extended/polkit/polkit_126.bb

@@ -49,7 +49,7 @@ do_install:append() {
 	# Polkit unconditionally installs a systemd service, remove it on SysVinit
 	# systems to avoid "installed but not packaged file" error.
 	if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-		rm -r ${D}${libdir}/systemd
+		rm -rf ${D}${nonarch_libdir}/systemd ${D}${libdir}/systemd
 	fi
 }