nfs-utils: Fix do_configure when switching configurations

On the autobuilder we saw:
ERROR: nfs-utils-2.8.3-r0 do_package_qa: QA Issue: nfs-utils package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge]

This can be reproduced by running do_configure with sysvinit, switching to
systemd and re-running do_configure. udev_rulesdir will then have the wrong
value.

Fix the sed expressions so the task can rerun correctly and update as
desired.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb
index a2afe2cd1500987d1a748965b7bfdddc930a73d2..039090df720331ec976fd2a6dce48d8ac944eda7 100644 (file)
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb
@@ -121,8 +121,8 @@ FILES:${PN}-staticdev += "${libdir}/libnfsidmap/*.a"
 FILES:${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/ ${nonarch_libdir}/modprobe.d"
 
 do_configure:prepend() {
-       sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \
-               -e 's,udev_rulesdir = /usr/lib/udev/rules.d/,udev_rulesdir = ${nonarch_base_libdir}/udev/rules.d/,g' \
+       sed -i -e 's,sbindir = .*,sbindir = ${base_sbindir},g' \
+               -e 's,udev_rulesdir = .*,udev_rulesdir = ${nonarch_base_libdir}/udev/rules.d/,g' \
                ${S}/utils/mount/Makefile.am ${S}/utils/nfsdcltrack/Makefile.am \
                ${S}/systemd/Makefile.am ${S}/tools/nfsrahead/Makefile.am
 }