PR#21: build: Remove --with-systemd and --with-sysvinit - oddjob

oddjob

#21 build: Remove --with-systemd and --with-sysvinit

Merged a year ago by abbra. Opened a year ago by salahx.

Unknown source systemd into master

build: Remove --with-systemd and --with-sysvinit

Christopher Byrne • a year ago

f63287a

configure.ac

file modified

+7 -55

		`@@ -74,20 +74,13 @@`
		`AC_DEFINE_UNQUOTED(DEFAULT_RECONNECT_TIMEOUT,$DEFAULT_RECONNECT_TIMEOUT,[Define to the default amount of time which oddjobd will pause between attempts to reconnect to the system message bus after being disconnected for any reason.])`
		`AC_SUBST(DEFAULT_RECONNECT_TIMEOUT)`

		`- AC_ARG_ENABLE(systemd,`
		`- AS_HELP_STRING([--enable-systemd],[install unit file for systemd]),`
		`- SYSTEMD=$enableval,`
		`- SYSTEMD=no)`
		`-`
		`- AC_SUBST(SYSTEMD)`
		`- AM_CONDITIONAL(SYSTEMD,test x$SYSTEMD != xno)`
		`- if test x$SYSTEMD = xyes ; then`
		- SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null`
		`- AC_MSG_RESULT(will install systemd unit file)`
		`- else`
		`- AC_MSG_RESULT(will install sysv init script)`
		`- fi`
		`- AC_SUBST(SYSTEMDSYSTEMUNITDIR)`
		`+ AC_ARG_WITH([systemdsystemunitdir],`
		`+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR],`
		`+ [Directory for systemd service files])],,`
		`+ [PKG_CHECK_VAR([with_systemdsystemunitdir],[systemd],`
		`+ [systemdsystemunitdir],,`
		`+ [with_systemdsystemunitdir=${libdir}/systemd/system])])`
		`+ AC_SUBST([systemdsystemunitdir],[$with_systemdsystemunitdir])`

		`AC_ARG_ENABLE(sample,`
		`AS_HELP_STRING(--enable-sample,[Build and install a sample service.]),`
		`@@ -365,47 +358,6 @@`
		`AC_SUBST(currentgid)`
		`AC_PATH_PROGS(PATH_PWD,pwd,pwd)`

		`- AC_ARG_ENABLE(systemd,`
		`- AS_HELP_STRING(--enable-systemd,[Install systemd unit files]),`
		`- systemd=$enableval`
		`- if test x$systemd = xyes ; then`
		- SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd`
		`- fi`
		`- ,`
		`- if pkg-config systemd 2> /dev/null ; then`
		- SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null`
		`- systemd=yes`
		`- else`
		`- systemd=no`
		`- fi`
		`- )`
		`-`
		`- AC_ARG_ENABLE(sysvinit,`
		`- AS_HELP_STRING(--enable-sysvinit,[Install sysvinit unit files]),`
		`- sysvinit=$enableval,`
		`- if test x$systemd = xno ; then`
		`- sysvinit=yes`
		`- else`
		`- sysvinit=no`
		`- fi`
		`- )`
		`- if test x$systemd = xyes ; then`
		`- AC_MSG_RESULT([installing systemd unit file])`
		`- if test "x$SYSTEMDSYSTEMUNITDIR" = x ; then`
		`- AC_MSG_ERROR([error locating systemd system unit directory])`
		`- fi`
		`- AC_SUBST(SYSTEMDSYSTEMUNITDIR)`
		`- else`
		`- AC_MSG_RESULT([not installing systemd unit file])`
		`- fi`
		`- AM_CONDITIONAL(SYSTEMD,test x$systemd = xyes)`
		`- if test x$sysvinit = xyes ; then`
		`- AC_MSG_RESULT([installing sysv init script])`
		`- else`
		`- AC_MSG_RESULT([not installing sysv init script])`
		`- fi`
		`- AM_CONDITIONAL(SYSVINIT,test x$sysvinit = xyes)`
		`-`
		`AC_ARG_ENABLE(pie,`
		`AS_HELP_STRING(--enable-pie,[Build position-independent executables.]),`
		`pie=$enableval,`

oddjob.spec

file modified

+5 -5

		`@@ -100,11 +100,6 @@`
		`--with-selinux-labels \`
		`--without-python --enable-xml-docs --enable-compat-dtd \`
		`--disable-dependency-tracking \`
		`- %if %{systemd}`
		`- --enable-systemd --disable-sysvinit \`
		`- %else`
		`- --enable-sysvinit --disable-systemd \`
		`- %endif`
		`$sample_flag`
		`make %{_smp_mflags}`

		`@@ -119,6 +114,11 @@`
		`mv "$RPM_BUILD_ROOT"/%{_libdir}/security/*.so "$RPM_BUILD_ROOT"/%{_lib}/security/`
		`fi`
		`%endif`
		`+ %if %{systemd}`
		`+ rm -f "$RPM_BUILD_ROOT"%{_initrddir}/oddjobd`
		`+ %else`
		`+ rm -f "$RPM_BUILD_ROOT"%{_unitdir}/oddjobd.service`
		`+ %endif`
		`# Recommended, though I disagree.`
		`rm -f "$RPM_BUILD_ROOT"/%{_libdir}/*.la`

scripts/Makefile.am

file modified

+2 -6

		`@@ -1,9 +1,5 @@`
		`EXTRA_DIST = oddjobd.in oddjobd.service.in`
		`- if SYSVINIT`
		`+ systemdsystemunit_DATA = oddjobd.service`
		`initdir = $(sysconfdir)/rc.d/init.d`
		`init_SCRIPTS = oddjobd`
		`- endif`
		`- if SYSTEMD`
		`- unitdir = @SYSTEMDSYSTEMUNITDIR@`
		`- unit_DATA = oddjobd.service`
		`- endif`
		`+`

salahx commented a year ago

There is no need to conditionally install one or the other, furthermore, this package does not used "systemdsysunitdir". This patch removes the conditional install logic and installs both (the systemd unit in systemdsysunitdir). The "uneeded" one can be deleted at install/merge time (Spec file updated to do just that).

rebased onto a6cf8b4

a year ago

rebased onto 6579fe4

a year ago

rebased onto 1ade572

a year ago