[SSSD] [PATCH] AUTOMAKE: Do not include makefile generated files into

Jakub Hrozek jhrozek at redhat.com
Fri Apr 11 15:49:55 UTC 2014


On Fri, Apr 11, 2014 at 05:29:35PM +0200, Lukas Slebodnik wrote:
> On (11/04/14 16:49), Jakub Hrozek wrote:
> >On Fri, Apr 11, 2014 at 01:57:52PM +0200, Lukas Slebodnik wrote:
> >> Why separe patch?
> >> generated files should not in in tarball.
> >
> >Because a patch that fixes an issue important enough to trigger a release
> >should be minimal. I would prefer to commit the part that touches the systemd
> >service file in a separate patch, do the release and then apply the rest.
> 
> I split only patch for 1-11 branch.
> 
> LS

> From 5ff0c49a50236da734f7f48092893779579d6115 Mon Sep 17 00:00:00 2001
> From: Lukas Slebodnik <lslebodn at redhat.com>
> Date: Fri, 11 Apr 2014 00:14:41 +0200
> Subject: [PATCH] AUTOMAKE: Do not include makefile generated files into
>  tarball
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> sssd.service was assigned to the dist_systemdunit_DATA variable.
> Automake will install this file into the systemd unit directory after building
> it if necessary. Automake will also include this generated file in the tarball.
> As a result, when building sssd from the tarball, the paths will be not
> recreated.
> 
> The files in DATA primaries are added as dependencies to the all target
> via the internal all-am target. If sssd.service doesn’t exist, make will look
> for a rule to build it. Since there is such a rule, make will simply execute
> that rule when I build the all target.
> 
> Resolves:
> https://fedorahosted.org/sssd/ticket/2314
> ---
>  Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 5abaf1778de4fd5286b13d3bc0bb35817800e3d8..0e861dfb01cea7fbea4fa9f5e306f44f12d464d5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -2001,9 +2001,9 @@ endif
>  #######################
>  
>  dist_init_SCRIPTS =
> -dist_systemdunit_DATA =
> +systemdunit_DATA =
>  if HAVE_SYSTEMD_UNIT
> -    dist_systemdunit_DATA += \
> +    systemdunit_DATA += \
>          src/sysv/systemd/sssd.service
>  else
>  if HAVE_SUSE
> -- 
> 1.9.0
> 

ACK to this patch so far. I haven't tested the version for master yet (I
want to get 1.11.5.1 out first).



More information about the sssd-devel mailing list