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.