Browse Source

Get rid of systemd dependencies

tags/devuan/2.0.1+devuan1
Andreas Messer 7 months ago
parent
commit
63828d6803
5 changed files with 19 additions and 5 deletions
  1. +12
    -0
      debian/apt.cron.daily
  2. +0
    -2
      debian/apt.install
  3. +2
    -0
      debian/changelog
  4. +0
    -1
      debian/control
  5. +5
    -2
      debian/rules

+ 12
- 0
debian/apt.cron.daily View File

@@ -0,0 +1,12 @@
#!/bin/sh
# /etc/cron.daily/apt: APT daily maintance script
# Derived from *.{service,timer} by Andreas Messer <andi@bastelmap.de>

# Todo: check if this is really need when not using systemd
/usr/lib/apt/apt-helper wait-online || exit 0

# apt-daily.{service,timer}: update package resources
/usr/lib/apt/apt.systemd.daily update

# apt-daily-upgrade.{service,timer}: upgrade system
timeout 900s /usr/lib/apt/apt.systemd.daily install

+ 0
- 2
debian/apt.install View File

@@ -1,5 +1,3 @@
debian/*.service /lib/systemd/system/
debian/*.timer /lib/systemd/system/
debian/apt.systemd.daily usr/lib/apt
etc/apt/
usr/bin/apt


+ 2
- 0
debian/changelog View File

@@ -1,6 +1,8 @@
apt (2.0.1+sanssystemd1) UNRELEASED; urgency=medium

* Prepare for systemd removal
* Remove systemd dependencies
* Introduce cron script

-- Andreas Messer <andi@bastelmap.de> Thu, 02 Apr 2020 18:59:06 +0200



+ 0
- 1
debian/control View File

@@ -18,7 +18,6 @@ Build-Depends: cmake (>= 3.4),
liblz4-dev (>= 0.0~r126),
liblzma-dev,
libseccomp-dev (>= 2.4.2) [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x hppa powerpc powerpcspe ppc64 x32],
libsystemd-dev [linux-any],
libudev-dev [linux-any],
libzstd-dev (>= 1.0),
ninja-build,


+ 5
- 2
debian/rules View File

@@ -38,6 +38,9 @@ override_dh_installcron:
dh_installcron --name=apt-compat

override_dh_installsystemd:
# entirely disable systemd rules

override_dh_installsystemd_disabled_:
# Do not restart "apt-daily.service" because this script runs
# unattended-upgrades. So if apt itself is upgraded as part of
# an unattended-upgrades run it would kill itself
@@ -45,7 +48,7 @@ override_dh_installsystemd:
dh_installsystemd -papt --no-restart-on-upgrade --no-restart-after-upgrade --no-start apt-daily.service apt-daily-upgrade.service
dh_installsystemd --remaining-packages

override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF
override_dh_auto_configure-indep: flags=-DWITH_DOC=ON
override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Systemd=TRUE
override_dh_auto_configure-indep: flags=-DWITH_DOC=ON -DCMAKE_DISABLE_FIND_PACKAGE_Systemd=TRUE
override_dh_auto_configure-arch override_dh_auto_configure-indep:
dh_auto_configure -- $(flags) $(configure_test_flags)

Loading…
Cancel
Save