[PATCH v4l-utils v2 1/2] configure.ac: autodetect availability of systemd

[PATCH v4l-utils v2 1/2] configure.ac: autodetect availability of systemd

[Ulrich Ölmann]

Import systemd's official suggestion [1] how this should be handled in packages
using autoconf. A side effect of this is the removal of the hardcoded fallback
path "/lib/systemd/system" which leaks build host information when cross
compiling v4l-utils and therefore defeats reproducible builds.

[1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
v1 --> v2:
  - fixed autodetection
  - extended commit message

 configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 727730c5ccf4..8470116df4b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir,
 AC_ARG_WITH(systemdsystemunitdir,
 	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]),
 	[],
-	[with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`])
+	[with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"],
+      [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
+       AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+             [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+                    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
+              with_systemdsystemunitdir=no],
+             [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
 
 # Generic check: works with most distributions
 def_gconv_dir=`for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do if @<:@ -d \$i/gconv @:>@; then echo \$i/gconv; break; fi; done`
-- 
2.29.2

[PATCH v4l-utils v2 2/2] keytable: restrict installation of 50-rc_keymap.conf

[Ulrich Ölmann]

It is only needed if BPF is effectively used and the package is compiled for a
systemd based target.

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
 utils/keytable/Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am
index c5eb414acf2f..eee61f0e0551 100644
--- a/utils/keytable/Makefile.am
+++ b/utils/keytable/Makefile.am
@@ -3,9 +3,13 @@ man_MANS = ir-keytable.1 rc_keymap.5
 sysconf_DATA = rc_maps.cfg
 keytablesystem_DATA = $(srcdir)/rc_keymaps/*
 udevrules_DATA = 70-infrared.rules
+if WITH_BPF
+if HAVE_SYSTEMD
 if HAVE_UDEVDSYSCALLFILTER
 systemdsystemunit_DATA = 50-rc_keymap.conf
 endif
+endif
+endif
 
 ir_keytable_SOURCES = keytable.c parse.h ir-encode.c ir-encode.h toml.c toml.h keymap.c keymap.h
 
-- 
2.29.2

Re: [PATCH v4l-utils v2 1/2] configure.ac: autodetect availability of systemd

[Ulrich Ölmann]

Gentle ping!

There is series [1] ("Add support for meson building") which is
currently discussed. If you want me to take that into account and extend
my patches to meson, as well, I could readily do that in a v3.

Best regards
Ulrich


[1] https://patchwork.linuxtv.org/project/linux-media/list/?series=4887

On Thu, Mar 04 2021 at 14:23 +0100, Ulrich Ölmann <u.oelmann@pengutronix.de> wrote:
> Import systemd's official suggestion [1] how this should be handled in packages
> using autoconf. A side effect of this is the removal of the hardcoded fallback
> path "/lib/systemd/system" which leaks build host information when cross
> compiling v4l-utils and therefore defeats reproducible builds.
>
> [1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files
>
> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> ---
> v1 --> v2:
>   - fixed autodetection
>   - extended commit message
>
>  configure.ac | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 727730c5ccf4..8470116df4b1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir,
>  AC_ARG_WITH(systemdsystemunitdir,
>  	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]),
>  	[],
> -	[with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`])
> +	[with_systemdsystemunitdir=auto])
> +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"],
> +      [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
> +       AS_IF([test "x$def_systemdsystemunitdir" = "x"],
> +             [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
> +                    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
> +              with_systemdsystemunitdir=no],
> +             [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
> +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
>  
>  # Generic check: works with most distributions
>  def_gconv_dir=`for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do if @<:@ -d \$i/gconv @:>@; then echo \$i/gconv; break; fi; done`
-- 
Pengutronix e.K.                           | Ulrich Ölmann               |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH v4l-utils v2 1/2] configure.ac: autodetect availability of systemd

[Ulrich Ölmann]

Hi Sean,

another gentle ping for my small series. I am addressing you directly
this time as you are recorded as delegate in [1].

Best regards
Ulrich


[1] https://patchwork.linuxtv.org/project/linux-media/list/?series=4756

On Fri, Mar 26 2021 at 09:16 +0100, Ulrich Ölmann <u.oelmann@pengutronix.de> wrote:
> Gentle ping!
>
> There is series [1] ("Add support for meson building") which is
> currently discussed. If you want me to take that into account and extend
> my patches to meson, as well, I could readily do that in a v3.
>
> Best regards
> Ulrich
>
>
> [1] https://patchwork.linuxtv.org/project/linux-media/list/?series=4887
>
> On Thu, Mar 04 2021 at 14:23 +0100, Ulrich Ölmann <u.oelmann@pengutronix.de> wrote:
>> Import systemd's official suggestion [1] how this should be handled in packages
>> using autoconf. A side effect of this is the removal of the hardcoded fallback
>> path "/lib/systemd/system" which leaks build host information when cross
>> compiling v4l-utils and therefore defeats reproducible builds.
>>
>> [1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files
>>
>> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
>> ---
>> v1 --> v2:
>>   - fixed autodetection
>>   - extended commit message
>>
>>  configure.ac | 10 +++++++++-
>>  1 file changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 727730c5ccf4..8470116df4b1 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir,
>>  AC_ARG_WITH(systemdsystemunitdir,
>>  	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]),
>>  	[],
>> -	[with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`])
>> +	[with_systemdsystemunitdir=auto])
>> +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"],
>> +      [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
>> +       AS_IF([test "x$def_systemdsystemunitdir" = "x"],
>> +             [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
>> +                    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
>> +              with_systemdsystemunitdir=no],
>> +             [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
>> +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
>>  
>>  # Generic check: works with most distributions
>>  def_gconv_dir=`for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do if @<:@ -d \$i/gconv @:>@; then echo \$i/gconv; break; fi; done`
-- 
Pengutronix e.K.                           | Ulrich Ölmann               |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH v4l-utils v2 1/2] configure.ac: autodetect availability of systemd

[Sean Young]

Hi Ulrich,

You are right to remind me again -- I am sorry it took so long. Your patches
look great and they have been merged now.

Thank you,

Sean

On Tue, Apr 06, 2021 at 09:53:36AM +0200, Ulrich Ölmann wrote:
> Hi Sean,
> 
> another gentle ping for my small series. I am addressing you directly
> this time as you are recorded as delegate in [1].
> 
> Best regards
> Ulrich
> 
> 
> [1] https://patchwork.linuxtv.org/project/linux-media/list/?series=4756
> 
> On Fri, Mar 26 2021 at 09:16 +0100, Ulrich Ölmann <u.oelmann@pengutronix.de> wrote:
> > Gentle ping!
> >
> > There is series [1] ("Add support for meson building") which is
> > currently discussed. If you want me to take that into account and extend
> > my patches to meson, as well, I could readily do that in a v3.
> >
> > Best regards
> > Ulrich
> >
> >
> > [1] https://patchwork.linuxtv.org/project/linux-media/list/?series=4887
> >
> > On Thu, Mar 04 2021 at 14:23 +0100, Ulrich Ölmann <u.oelmann@pengutronix.de> wrote:
> >> Import systemd's official suggestion [1] how this should be handled in packages
> >> using autoconf. A side effect of this is the removal of the hardcoded fallback
> >> path "/lib/systemd/system" which leaks build host information when cross
> >> compiling v4l-utils and therefore defeats reproducible builds.
> >>
> >> [1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files
> >>
> >> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> >> ---
> >> v1 --> v2:
> >>   - fixed autodetection
> >>   - extended commit message
> >>
> >>  configure.ac | 10 +++++++++-
> >>  1 file changed, 9 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/configure.ac b/configure.ac
> >> index 727730c5ccf4..8470116df4b1 100644
> >> --- a/configure.ac
> >> +++ b/configure.ac
> >> @@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir,
> >>  AC_ARG_WITH(systemdsystemunitdir,
> >>  	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]),
> >>  	[],
> >> -	[with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`])
> >> +	[with_systemdsystemunitdir=auto])
> >> +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"],
> >> +      [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
> >> +       AS_IF([test "x$def_systemdsystemunitdir" = "x"],
> >> +             [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
> >> +                    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
> >> +              with_systemdsystemunitdir=no],
> >> +             [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
> >> +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
> >>  
> >>  # Generic check: works with most distributions
> >>  def_gconv_dir=`for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do if @<:@ -d \$i/gconv @:>@; then echo \$i/gconv; break; fi; done`
> -- 
> Pengutronix e.K.                           | Ulrich Ölmann               |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |