Drop no longer needed systemd config in build system
It was only used to install osmo-hnbgw, which is no longer there. Change-Id: Idae258d895d8b25dbbfb5e9bb4386997475a71ddchanges/01/26801/2
parent
52ceee7c90
commit
0ac9844c92
|
@ -13,9 +13,6 @@ EXTRA_DIST = \
|
|||
debian \
|
||||
$(NULL)
|
||||
|
||||
AM_DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
|
||||
|
||||
@RELMAKE@
|
||||
|
||||
BUILT_SOURCES = $(top_srcdir)/.version
|
||||
|
|
16
configure.ac
16
configure.ac
|
@ -130,22 +130,6 @@ then
|
|||
AC_SUBST([OSMO_GSM_MANUALS_DIR])
|
||||
fi
|
||||
|
||||
# https://www.freedesktop.org/software/systemd/man/daemon.html
|
||||
AC_ARG_WITH([systemdsystemunitdir],
|
||||
[AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
|
||||
[with_systemdsystemunitdir=auto])
|
||||
AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
|
||||
def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
|
||||
|
||||
AS_IF([test "x$def_systemdsystemunitdir" = "x"],
|
||||
[AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
|
||||
[AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
|
||||
with_systemdsystemunitdir=no],
|
||||
[with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
|
||||
AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
|
||||
[AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
|
||||
AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
|
||||
|
||||
AC_MSG_RESULT([CFLAGS="$CFLAGS"])
|
||||
AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
|
||||
|
||||
|
|
|
@ -27,9 +27,6 @@ BuildRequires: lksctp-tools-devel
|
|||
BuildRequires: pkgconfig >= 0.20
|
||||
# python3 for asn1tostruct.py
|
||||
BuildRequires: python3
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libasn1c) >= 0.9.30
|
||||
BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0
|
||||
BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0
|
||||
|
@ -38,7 +35,6 @@ BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0
|
|||
BuildRequires: pkgconfig(libosmogb) >= 1.5.0
|
||||
BuildRequires: pkgconfig(libosmogsm) >= 1.5.0
|
||||
BuildRequires: pkgconfig(libosmovty) >= 1.5.0
|
||||
%{?systemd_requires}
|
||||
|
||||
%description
|
||||
Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
|
||||
|
@ -118,8 +114,7 @@ echo "%{version}" >.tarball-version
|
|||
autoreconf -fi
|
||||
%configure \
|
||||
--disable-static \
|
||||
--docdir="%{_docdir}/%{name}" \
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
--docdir="%{_docdir}/%{name}"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
|
|
|
@ -8,10 +8,6 @@ VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
|
|||
%:
|
||||
dh $@ --with autoreconf
|
||||
|
||||
CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- $(CONFIGURE_FLAGS)
|
||||
|
||||
# See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg
|
||||
override_dh_strip:
|
||||
dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg
|
||||
|
|
Loading…
Reference in New Issue