5:42 p.m.
ehlo,
patches for master and 1-11 branchare attached.
Resolves:
https://fedorahosted.org/sssd/ticket/2314
how to test:
#generate tarball with "make distcheck"
#move tarball to another directory
#extract tarball
#change dir to sssd-$(VERSION)
./configure --with-initscript=systemd --prefix=/usr
make
# look into generated file src/sysv/systemd/sssd.service
./configure --with-initscript=systemd --prefix=/usr --exec-prefix=/usr/local
# do not run make clean
make
# look into generated file src/sysv/systemd/sssd.service
# it should be changed
LS
4:25 a.m.
On (11/04/14 00:42), Lukas Slebodnik wrote:
ehlo,
patches for master and 1-11 branchare attached.
Resolves:
https://fedorahosted.org/sssd/ticket/2314
how to test:
#generate tarball with "make distcheck"
#move tarball to another directory
#extract tarball
#change dir to sssd-$(VERSION)
./configure --with-initscript=systemd --prefix=/usr
make
# look into generated file src/sysv/systemd/sssd.service
./configure --with-initscript=systemd --prefix=/usr --exec-prefix=/usr/local
# do not run make clean
make
# look into generated file src/sysv/systemd/sssd.service
# it should be changed
LS
self NACK
generated initscrips are also included in tarball
dist_init_SCRIPTS += \
src/sysv/sssd
I will send another patch
LS
4:41 a.m.
On Fri, Apr 11, 2014 at 11:25:45AM +0200, Lukas Slebodnik wrote:
On (11/04/14 00:42), Lukas Slebodnik wrote:
>ehlo,
>
>patches for master and 1-11 branchare attached.
>
>Resolves:
>https://fedorahosted.org/sssd/ticket/2314
>
>how to test:
>#generate tarball with "make distcheck"
>#move tarball to another directory
>#extract tarball
>#change dir to sssd-$(VERSION)
>
>./configure --with-initscript=systemd --prefix=/usr
>make
> # look into generated file src/sysv/systemd/sssd.service
>
>./configure --with-initscript=systemd --prefix=/usr --exec-prefix=/usr/local
># do not run make clean
>make
> # look into generated file src/sysv/systemd/sssd.service
> # it should be changed
>
>LS
self NACK
generated initscrips are also included in tarball
dist_init_SCRIPTS += \
src/sysv/sssd
I think this should be a separate patch for master only, since the init
script is still regenerated during configure time. So the paths in the
sysv file are correct.
I tested the whole process to RPMs, generated a tarball with make dist,
then applied the following patch to rawhide sssd.spec:
diff --git a/sssd.spec b/sssd.spec
index d1e3dbf..920fcdd 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -13,7 +13,7 @@
%global ldb_version 1.1.16
Name: sssd
-Version: 1.11.5
+Version: 1.11.6
Release: 2%{?dist}
Group: Applications/System
Summary: System Security Services Daemon
@@ -377,12 +377,11 @@ autoreconf -ivf
--enable-ldb-version-check \
--disable-static \
--disable-rpath \
+ --with-initscript=systemd \
--with-test-dir=/dev/shm \
%{?with_cifs_utils_plugin_option}
-rm -f src/sysv/systemd/sssd.service
-
-make %{?_smp_mflags} all docs src/sysv/systemd/sssd.service
+make %{?_smp_mflags} all docs
The resulting build is here:
http://koji.fedoraproject.org/koji/taskinfo?taskID=6726897
I was able to start it fine on a F-20 test machine. I think that qualifies
as ACK for your patch.
6:57 a.m.
On (11/04/14 11:41), Jakub Hrozek wrote:
On Fri, Apr 11, 2014 at 11:25:45AM +0200, Lukas Slebodnik wrote:
> On (11/04/14 00:42), Lukas Slebodnik wrote:
> >ehlo,
> >
> >patches for master and 1-11 branchare attached.
> >
> >Resolves:
> >https://fedorahosted.org/sssd/ticket/2314
> >
> >how to test:
> >#generate tarball with "make distcheck"
> >#move tarball to another directory
> >#extract tarball
> >#change dir to sssd-$(VERSION)
> >
> >./configure --with-initscript=systemd --prefix=/usr
> >make
> > # look into generated file src/sysv/systemd/sssd.service
> >
> >./configure --with-initscript=systemd --prefix=/usr --exec-prefix=/usr/local
> ># do not run make clean
> >make
> > # look into generated file src/sysv/systemd/sssd.service
> > # it should be changed
> >
> >LS
>
> self NACK
>
> generated initscrips are also included in tarball
> dist_init_SCRIPTS += \
> src/sysv/sssd
I think this should be a separate patch for master only, since the init
Why separe
patch?
generated files should not in in tarball.
script is still regenerated during configure time. So the paths in
the
sysv file are correct.
I tested the whole process to RPMs, generated a tarball with make dist,
then applied the following patch to rawhide sssd.spec:
Updated patches are attached.
LS
9:49 a.m.
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.
10:29 a.m.
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
10:34 a.m.
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
Thank you, I think that's fine, master is still in the early stages.
I already run some tests with a scratch build based on a tarball
generated with your previous patch:
http://koji.fedoraproject.org/koji/taskinfo?taskID=6727883
And everything went fine. I will run some tests with the modified
mini-patch as well before acking, but the changes look good!
10:49 a.m.
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(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
---
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).
10:59 a.m.
On Fri, Apr 11, 2014 at 05:49:55PM +0200, Jakub Hrozek wrote:
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(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
> ---
> 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).
Pushed to sssd-1-11: baf3646f5ac2c76d6c2ca59c465d2e2431664274
1:19 p.m.
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
1:35 p.m.
On Fri, Apr 11, 2014 at 08:19:55PM +0200, Jakub Hrozek wrote:
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).
Pushed to master: 4f6931e854c698dcb1c09f99eb330ce2fb97e7c6
> 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
Pushed to sssd-1-11: 4795d7169e9f56318119ab7defd116feaf39d42e
3678
days inactive
3679
days old
sssd-devel@lists.fedorahosted.org
10 comments
2 participants
participants (2)
-
Jakub Hrozek -
Lukas Slebodnik