laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26801 ) Change subject: Drop no longer needed systemd config in build system ...................................................................... Drop no longer needed systemd config in build system It was only used to install osmo-hnbgw, which is no longer there. Change-Id: Idae258d895d8b25dbbfb5e9bb4386997475a71dd --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/rules 4 files changed, 1 insertion(+), 29 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index c1359a1..ab3ed63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,9 +13,6 @@ debian \ $(NULL) -AM_DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index b16f3d2..866d6d9 100644 --- a/configure.ac +++ b/configure.ac @@ -130,22 +130,6 @@ 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"]) diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index e542533..ae5fd0c 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -27,9 +27,6 @@ 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(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 @@ autoreconf -fi %configure \ --disable-static \ - --docdir="%{_docdir}/%{name}" \ - --with-systemdsystemunitdir=%{_unitdir} + --docdir="%{_docdir}/%{name}" make %{?_smp_mflags} %install diff --git a/debian/rules b/debian/rules index d1b2ab6..aa1ed32 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,6 @@ %: 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-practic… override_dh_strip: dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idae258d895d8b25dbbfb5e9bb4386997475a71dd Gerrit-Change-Number: 26801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged