| Message ID | 20220603203459.21422-1-danielrparks@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | cifs-utils: Make automake treat /sbin as exec, not data | expand |
Merged into the next branch. Sorry, I somehow missed this patch before. -- Best regards, Pavel Shilovsky вс, 5 июн. 2022 г. в 22:05, Daniel Parks <danielrparks@ti.com>: > > Otherwise, $(DESTDIR)/sbin doesn't get created until install-data on a > -j1 build and install-exec-hook can fail because it might not exist. > > Steps to reproduce this bug: > $ autoreconf -i > $ ./configure > $ mkdir image > $ make DESTDIR=image install -j1 > > Signed-off-by: Daniel Parks <danielrparks@ti.com> > --- > Makefile.am | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 84dd119..b1444f6 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -1,8 +1,8 @@ > AM_CFLAGS = -Wall -Wextra -D_FORTIFY_SOURCE=2 $(PIE_CFLAGS) $(RELRO_CFLAGS) > ACLOCAL_AMFLAGS = -I aclocal > > -root_sbindir = $(ROOTSBINDIR) > -root_sbin_PROGRAMS = mount.cifs > +root_exec_sbindir = $(ROOTSBINDIR) > +root_exec_sbin_PROGRAMS = mount.cifs > mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c > mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) > include_HEADERS = cifsidmap.h > -- > 2.17.1 >
diff --git a/Makefile.am b/Makefile.am index 84dd119..b1444f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ AM_CFLAGS = -Wall -Wextra -D_FORTIFY_SOURCE=2 $(PIE_CFLAGS) $(RELRO_CFLAGS) ACLOCAL_AMFLAGS = -I aclocal -root_sbindir = $(ROOTSBINDIR) -root_sbin_PROGRAMS = mount.cifs +root_exec_sbindir = $(ROOTSBINDIR) +root_exec_sbin_PROGRAMS = mount.cifs mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) include_HEADERS = cifsidmap.h
Otherwise, $(DESTDIR)/sbin doesn't get created until install-data on a -j1 build and install-exec-hook can fail because it might not exist. Steps to reproduce this bug: $ autoreconf -i $ ./configure $ mkdir image $ make DESTDIR=image install -j1 Signed-off-by: Daniel Parks <danielrparks@ti.com> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)