mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-26 19:47:17 +00:00
Code Issues Projects Releases Wiki Activity

drbd-utils: fix usrmerge install path

Browse Source 
Install the files under folder /usr/lib/drbd
to instead of /lib/drbd and also /usr/lib/udev
to instead of /lib/udev/ when usrmerge enabled
to fix below issue:

| WARNING: drbd-utils-9.5.0-r0 do_package: QA Issue: drbd-utils: Files/directories were installed but not shipped in any package:
  /lib/drbd/drbdsetup-84
  /lib/drbd/drbdadm-83
  /lib/drbd/drbdsetup-83
  /lib/drbd/drbdadm-84
  /lib/drbd/drbd
| Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_insta.
| drbd-utils: 5 installed and not shipped files. [installed-vs-shipped]

| ERROR: QA Issue: drbd-utils-dbg package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge]

Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mingli Yu
2018-08-28 10:27:48 +08:00
committed by Khem Raj
parent 196a373fb4
commit 0b18276ac9
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb
+12 -1
View File
@@ -33,9 +33,20 @@ EXTRA_OECONF = " \
--with-distro debian \ --with-distro debian \
--with-initscripttype=both \ --with-initscripttype=both \
--with-systemdunitdir=${systemd_unitdir}/system \ --with-systemdunitdir=${systemd_unitdir}/system \
--without-manual\ --without-manual \
" "
do_configure_prepend() {
# move the the file under folder /lib/drbd/ to /usr/lib/drbd when usrmerge enabled
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
for m_file in `find ${S} -name 'Makefile.in'`; do
sed -i -e "s;\$(DESTDIR)\/lib\/drbd;\$(DESTDIR)\${nonarch_libdir}\/drbd;g" $m_file
done
# move the the file under folder /lib/udev/ to /usr/lib/udev when usrmerge enabled
sed -i -e "s;default_udevdir=/lib/udev;default_udevdir=\${prefix}/lib/udev;g" ${S}/configure.ac
fi
}
do_install_append() { do_install_append() {
# don't install empty /var/lock to avoid conflict with base-files # don't install empty /var/lock to avoid conflict with base-files
rm -rf ${D}${localstatedir}/lock rm -rf ${D}${localstatedir}/lock