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 a431d79eebf08423cd823609cef6ee0d4de87bb8 Mon Sep 17 00:00:00
2001
From: Lukas Slebodnik <lslebodn(a)redhat.com>
Date: Fri, 11 Apr 2014 00:14:41 +0200
Subject: [PATCH] AUTOMAKE: Do not include 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 needn't be
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 | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
ACK
tested with a tarball generated with make dist, as make distcheck is
broken on master (#2291).
From 5ff0c49a50236da734f7f48092893779579d6115 Mon Sep 17 00:00:00
2001
From: Lukas Slebodnik <lslebodn(a)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
This one was pushed already.
From 460bb394bbc4d2bb2d52665368b2156a69a51aaf Mon Sep 17 00:00:00
2001
From: Lukas Slebodnik <lslebodn(a)redhat.com>
Date: Fri, 11 Apr 2014 17:21:29 +0200
Subject: [PATCH 2/2] AUTOMAKE: Do not include generated files into tarball
The files are generated by configure script. They needn't be in tarball.
https://fedorahosted.org/sssd/ticket/2314
---
Makefile.am | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
ACK for 1.11