mirror of
git://git.openembedded.org/meta-openembedded
synced 2025-12-31 13:38:06 +00:00
zfs: fix installation paths for multilib
* pass --with-systemd* variables to install in more typical directories
* adjust FILES:${PN} to package them and more explicitly list some of
the directories like sudoers.d
* also remove unnecessary trailing /* and fix indentation of closing quote
* fixes:
ERROR: QA Issue: zfs: Files/directories were installed but not shipped in any package:
/lib
/lib/modules
/lib/modules/6.1.20-v8
/lib/modules/6.1.20-v8/extra
/lib/modules/6.1.20-v8/extra/zstd
/lib/modules/6.1.20-v8/extra/zfs
/lib/modules/6.1.20-v8/extra/unicode
/lib/modules/6.1.20-v8/extra/lua
/lib/modules/6.1.20-v8/extra/spl
/lib/modules/6.1.20-v8/extra/zcommon
/lib/modules/6.1.20-v8/extra/avl
/lib/modules/6.1.20-v8/extra/nvpair
/lib/modules/6.1.20-v8/extra/icp
/lib/modules/6.1.20-v8/extra/zstd/zzstd.ko.xz
/lib/modules/6.1.20-v8/extra/zfs/zfs.ko.xz
/lib/modules/6.1.20-v8/extra/unicode/zunicode.ko.xz
/lib/modules/6.1.20-v8/extra/lua/zlua.ko.xz
/lib/modules/6.1.20-v8/extra/spl/spl.ko.xz
/lib/modules/6.1.20-v8/extra/zcommon/zcommon.ko.xz
/lib/modules/6.1.20-v8/extra/avl/zavl.ko.xz
/lib/modules/6.1.20-v8/extra/nvpair/znvpair.ko.xz
/lib/modules/6.1.20-v8/extra/icp/icp.ko.xz
/usr/lib/modules-load.d
/usr/lib/systemd/system
/usr/lib/systemd/system-preset
/usr/lib/systemd/system-generators/zfs-mount-generator
/usr/lib/systemd/system/zfs-scrub@.service
/usr/lib/systemd/system/zfs-scrub-weekly@.timer
/usr/lib/systemd/system/zfs-import.service
/usr/lib/systemd/system/zfs-import-scan.service
/usr/lib/systemd/system/zfs-share.service
/usr/lib/systemd/system/zfs-mount.service
/usr/lib/systemd/system/zfs-volume-wait.service
/usr/lib/systemd/system/zfs.target
/usr/lib/systemd/system/zfs-load-key.service
/usr/lib/systemd/system/zfs-import.target
/usr/lib/systemd/system/zfs-import-cache.service
/usr/lib/systemd/system/zfs-zed.service
/usr/lib/systemd/system/zfs-scrub-monthly@.timer
/usr/lib/systemd/system/zfs-volumes.target
/usr/lib/systemd/system-preset/50-zfs.preset
/usr/lib/modules-load.d/zfs.conf
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
zfs: 42 installed and not shipped files. [installed-vs-shipped]
when libdir is /usr/lib64 with multilib.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
a5f4cfba46
commit
8fa3f9ae2c
@ -27,12 +27,16 @@ EXTRA_OECONF:append = " \
|
||||
--with-linux=${STAGING_KERNEL_DIR} --with-linux-obj=${STAGING_KERNEL_BUILDDIR} \
|
||||
--with-mounthelperdir=${base_sbin} \
|
||||
--with-udevdir=${base_libdir}/udev \
|
||||
--with-systemdunitdir=${systemd_system_unitdir} \
|
||||
--with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \
|
||||
--with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \
|
||||
--with-systemdmodulesloaddir=${sysconfdir}/module-load.d \
|
||||
--without-dracutdir \
|
||||
"
|
||||
"
|
||||
|
||||
EXTRA_OEMAKE:append = " \
|
||||
INSTALL_MOD_PATH=${D}${root_prefix} \
|
||||
"
|
||||
"
|
||||
|
||||
do_install:append() {
|
||||
# /usr/share/zfs contains the zfs-tests folder which we do not need:
|
||||
@ -42,19 +46,25 @@ do_install:append() {
|
||||
}
|
||||
|
||||
FILES:${PN} += "\
|
||||
${base_sbindir}/* \
|
||||
${base_libdir}/* \
|
||||
${sysconfdir}/* \
|
||||
${sbindir}/* \
|
||||
${bindir}/* \
|
||||
${libexecdir}/${BPN}/* \
|
||||
${libdir}/* \
|
||||
"
|
||||
${nonarch_base_libdir}/modules \
|
||||
${systemd_system_unitdir} \
|
||||
${nonarch_base_libdir}/systemd/system-generators \
|
||||
${nonarch_base_libdir}/systemd/system-preset \
|
||||
${sysconfdir}/modules-load.d/${BPN}.conf \
|
||||
${sysconfdir}/default/${BPN} \
|
||||
${sysconfdir}/sudoers.d/${BPN} \
|
||||
${sysconfdir}/${BPN} \
|
||||
${base_libdir}/udev \
|
||||
${sbindir} \
|
||||
${bindir} \
|
||||
${libexecdir}/${BPN} \
|
||||
${libdir} \
|
||||
"
|
||||
|
||||
FILES:${PN}-dev += "\
|
||||
${prefix}/src/zfs-${PV}/* \
|
||||
${prefix}/src/spl-${PV}/* \
|
||||
"
|
||||
${prefix}/src/zfs-${PV} \
|
||||
${prefix}/src/spl-${PV} \
|
||||
"
|
||||
# Not yet ported to rv32
|
||||
COMPATIBLE_HOST:riscv32 = "null"
|
||||
# conflicting definition of ABS macro from asm/asm.h from kernel
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user