[PATCH] build: give explicit error when unable to setuid on install.
Pekka Paalanen
ppaalanen at gmail.com
Thu Apr 9 23:53:48 PDT 2015
On Fri, 10 Apr 2015 11:13:55 +1000
Peter Hutterer <peter.hutterer at who-t.net> wrote:
> On Thu, Apr 09, 2015 at 05:52:56PM -0700, Jon A. Cruz wrote:
> > Added build error message when 'make install' is run as non-root
> > and the --disable-setuid-install configuration option has not been
> > used.
> >
> > Signed-off-by: Jon A. Cruz <jonc at osg.samsung.com>
> > ---
> > Makefile.am | 11 +++++++++--
> > 1 file changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index 4aa41ff..c1347b8 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -161,8 +161,15 @@ weston_launch_LDADD = $(PAM_LIBS) $(SYSTEMD_LOGIN_LIBS) $(LIBDRM_LIBS)
> >
> > if ENABLE_SETUID_INSTALL
> > install-exec-hook:
> > - chown root $(DESTDIR)$(bindir)/weston-launch
> > - chmod u+s $(DESTDIR)$(bindir)/weston-launch
> > + can_suid_files=no; \
> > + chown root $(DESTDIR)$(bindir)/weston-launch \
> > + && chmod u+s $(DESTDIR)$(bindir)/weston-launch \
> > + && can_suid_files=yes;\
> > + if test $$can_suid_files=no; then \
> > + echo 'Error: unable to unable to change ownership/setuid on weston-launch.'; \
> > + echo 'To skip this step, re-run ./configure using --disable-setuid-install'; \
> > + false; \
> > + fi
> > endif
> >
> > endif # BUILD_WESTON_LAUNCH
> > --
> > 2.1.0
>
> oh yes, please. Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
Tested by me, pushed.
4937214..90f23ca master -> master
Thanks,
pq
More information about the wayland-devel
mailing list