| Message ID | 20250206133114.2974225-2-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] nfs-utils: remove python hashbang rewrites | expand |
On Thu, 2025-02-06 at 13:31 +0000, Ross Burton via lists.openembedded.org wrote: > There's no need to sed the Makefiles as there's an option to simply > respect sbindir. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb > index ff02a3aea01..4683939bff5 100644 > --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb > +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb > @@ -60,6 +60,7 @@ EXTRA_OECONF = "--with-statduser=rpcuser \ > --disable-nfsdcltrack \ > --with-statdpath=/var/lib/nfs/statd \ > --with-rpcgen=${HOSTTOOLS_DIR}/rpcgen \ > + --disable-sbin-override \ > " > > LDFLAGS += "-lsqlite3 -levent" > @@ -107,11 +108,6 @@ 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' \ > - ${S}/utils/mount/Makefile.am > -} > - > # Make clean needed because the package comes with > # precompiled 64-bit objects that break the build > do_compile:prepend() { https://autobuilder.yoctoproject.org/valkyrie/#/builders/19/builds/962/steps/11/logs/stdio Error: Problem: package packagegroup-core-full-cmdline-sys-services-1.0-r0.noarch from oe-repo requires nfs-utils, but none of the providers can be installed - package packagegroup-core-full-cmdline-1.0-r0.noarch from oe-repo requires packagegroup-core-full-cmdline-sys-services, but none of the providers can be installed - package nfs-utils-2.8.2-r0.core2_32 from oe-repo requires nfs-utils-client, but none of the providers can be installed - conflicting requests - nothing provides nfs-utils-mount needed by nfs-utils-client-2.8.2-r0.core2_32 from oe-repo (try to add '--skip-broken' to skip uninstallable packages) Cheers, Richard
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb index ff02a3aea01..4683939bff5 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb @@ -60,6 +60,7 @@ EXTRA_OECONF = "--with-statduser=rpcuser \ --disable-nfsdcltrack \ --with-statdpath=/var/lib/nfs/statd \ --with-rpcgen=${HOSTTOOLS_DIR}/rpcgen \ + --disable-sbin-override \ " LDFLAGS += "-lsqlite3 -levent" @@ -107,11 +108,6 @@ 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' \ - ${S}/utils/mount/Makefile.am -} - # Make clean needed because the package comes with # precompiled 64-bit objects that break the build do_compile:prepend() {
There's no need to sed the Makefiles as there's an option to simply respect sbindir. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)