Merge pull request #37 from z3ntu/drop-ns

ns: Drop qrtr-ns

Author: konradybcio

.github/workflows/ci.yml

@@ -52,20 +52,17 @@ jobs:
           #- ubuntu:xenial
         cross_compile: [""]
         variant: [""]
-        nosystemd: [""]
         include:
           # Alpine (OpenRC)
           - container: "alpine:edge"
             arch: x86-64
             family: x86-64
             compiler: gcc
-            nosystemd: true
 
           - container: "alpine:latest"
             arch: x86-64
             family: x86-64
             compiler: gcc
-            nosystemd: true
 
           # Debian 32-bit builds
           - container: "debian:testing"
@@ -218,7 +215,6 @@ jobs:
     - name: Meson init with cross compile
       if: ${{ matrix.variant == 'cross-compile' }}
       run: |
-        # installing systemd (for pkg-config) has personality issues with cross-compilation
         # Generate cross compile file (see https://mesonbuild.com/Cross-compilation.html#cross-compilation)
         echo "[binaries]" > cross.txt
         echo "c = '${CROSS_COMPILE}-gcc'" >> cross.txt

.gitignore

@@ -2,4 +2,3 @@ out/
 *.so
 qrtr-cfg
 qrtr-lookup
-qrtr-ns

Android.bp

@@ -11,22 +11,6 @@ cc_library {
     local_include_dirs: ["src"],
 }
 
-cc_binary {
-    name: "qrtr-ns",
-    vendor: true,
-    srcs: [
-        "lib/logging.c",
-        "src/addr.c",
-        "src/ns.c",
-        "src/map.c",
-        "src/hash.c",
-        "src/waiter.c",
-        "src/util.c",
-    ],
-    cflags: ["-Wno-error"],
-    local_include_dirs: ["lib"],
-}
-
 cc_binary {
     name: "qrtr-cfg",
     vendor: true,
@@ -45,7 +29,6 @@ cc_binary {
     srcs: [
         "lib/logging.c",
         "src/lookup.c",
-        "src/util.c",
     ],
     cflags: ["-Wno-error"],
     local_include_dirs: ["lib"],

ci/archlinux.sh

@@ -17,7 +17,6 @@ case $CC in
 esac
 
 pacman -Syu --noconfirm \
-	systemd-libs \
 	pkgconf \
 	meson \
 	$PKGS_CC

ci/debian.cross-compile.sh

@@ -22,7 +22,4 @@ apt install -y --no-install-recommends \
 	libc6-dev:${ARCH} \
 	gcc-`dpkg-architecture -a ${ARCH} -q DEB_TARGET_GNU_TYPE`
 
-# Thanks debian
-apt install -y --no-install-recommends systemd-dev:${ARCH} -a ${ARCH} || true
-
 echo "Install finished: $0"

ci/debian.sh

@@ -30,11 +30,7 @@ esac
 apt install -y --no-install-recommends \
 	pkg-config \
 	meson \
-	systemd \
 	libc6-dev \
 	$PKGS_CC
 
-# Thanks debian
-apt install -y --no-install-recommends systemd-dev || true
-
 echo "Install finished: $0"

ci/fedora.sh

@@ -20,8 +20,6 @@ dnf -y install \
 	meson \
 	pkg-config \
 	libudev-devel \
-	systemd-devel \
-	systemd-libs \
 	$PKGS_CC
 
 echo "Install finished: $0"

meson.build

@@ -10,33 +10,8 @@ project('qrtr',
         ])
 
 prefix = get_option('prefix')
-with_qrtr_ns = get_option('qrtr-ns')
-
-install_systemd_unit = get_option('systemd-service')
-systemd = dependency('systemd', required : install_systemd_unit)
-if systemd.found()
-        systemd_system_unit_dir = get_option('systemd-unit-prefix')
-        if systemd_system_unit_dir == ''
-                systemd_system_unit_dir = systemd.get_variable(
-                        pkgconfig : 'systemdsystemunitdir',
-                pkgconfig_define: ['prefix', prefix])
-        else
-                message('Could not resolve systemd dependencies, skipping unit file')
-                install_systemd_unit = false
-        endif
-endif
 
 inc = include_directories('include')
 subdir('lib')
 subdir('include')
 subdir('src')
-
-if systemd.found() and with_qrtr_ns.enabled()
-        systemd_unit_conf = configuration_data()
-        systemd_unit_conf.set('prefix', prefix)
-        configure_file(
-                input : 'qrtr-ns.service.in',
-                output : 'qrtr-ns.service',
-                configuration : systemd_unit_conf,
-                install_dir : systemd_system_unit_dir)
-endif