diff options
| author | Guillem Jover <guillem@debian.org> | 2014-04-05 05:25:46 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2014-08-19 20:12:18 +0200 |
| commit | d69cf19881732900ff964f1f10545b51e3de4282 (patch) | |
| tree | 0325e1747c98a626e738fbb3313a4692ab75836e | |
| parent | 5fb63f2db08482d5d553105e4ed3055426aa3a87 (diff) | |
| download | dpkg-d69cf19881732900ff964f1f10545b51e3de4282.tar.gz | |
s-s-d: Switch GNU/kFreeBSD systems to use libkvm
Use libkvm instead of relying on linprocfs, which is not the native
procfs on kFreeBSD, and it is usually not mounted as FreeBSD programs
do not expect it to be present.
This stops making the code handle GNU/kFreeBSD as if it was a
Linux-based system.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | utils/start-stop-daemon.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b3a979104..757ee7b86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ dpkg (1.17.13) UNRELEASED; urgency=low Reported by Neil Williams <codehelp@debian.org>. * Only test the strerror() compatible code if sys_errlist and sys_nerr are present. This fixes a build failure on GNU/Hurd. Closes: #758199 + * Switch start-stop-daemon on GNU/kFreeBSD systems to use libkvm, instead + of relying on linprocfs which is not the native procfs on kFreeBSD, and it + is usually not mounted as FreeBSD programs do not expect it to be present. [ Updated programs translations ] * Czech (Miroslav Kure). diff --git a/debian/control b/debian/control index 19e49d02b..76f607dc9 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 7), pkg-config, flex, gettext (>= 0.18), po4a (>= 0.41), zlib1g-dev, libbz2-dev, liblzma-dev, libselinux1-dev (>= 1.28-4) [linux-any], + libkvm-dev [kfreebsd-any], libncursesw5-dev, libtimedate-perl, libio-string-perl diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 901d62f52..93850e308 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -25,7 +25,7 @@ #include <dpkg/macros.h> -#if defined(linux) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) +#if defined(linux) # define OSLinux #elif defined(__GNU__) # define OSHurd @@ -35,7 +35,7 @@ # define OSOpenBSD #elif defined(hpux) # define OShpux -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # define OSFreeBSD #elif defined(__NetBSD__) # define OSNetBSD |