Browse Source

Remove workaround for missing dracut.pc

Christoph Biedl 5 years ago
parent
commit
23abf79acc
4 changed files with 1 additions and 26 deletions
  1. 1 1
      debian/control
  2. 0 20
      debian/patches/disable-dracut-check.patch
  3. 0 1
      debian/patches/series
  4. 0 4
      debian/rules

+ 1 - 1
debian/control

@@ -6,7 +6,7 @@ Vcs-Browser: https://git.in-ulm.de/cbiedl/clevis
 Vcs-Git: https://git.in-ulm.de/cbiedl/clevis.git
 Build-Depends: debhelper (>= 10~),
     curl,
-    dracut,
+    dracut (>= 047+31-1~),
     jose,
     libaudit-dev (>= 1:2.7.8),
     libglib2.0-dev,

+ 0 - 20
debian/patches/disable-dracut-check.patch

@@ -1,20 +0,0 @@
-Description: Disable configure check for dracut
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2017-11-06
-Forwarded: not-needed
-
-    The dracut package does not provide dracut.pc, so this check would
-    always fail.
-
-    See also: https://bugs.debian.org/880984
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,6 @@
- PKG_CHECK_MODULES([udisks2], [udisks2])
- PKG_CHECK_MODULES([jose], [jose >= 8])
- PKG_CHECK_MODULES([systemd], [systemd])
--PKG_CHECK_MODULES([dracut], [dracut])
- PKG_CHECK_MODULES([audit], [audit >= 2.7.8])
- 
- AC_CHECK_PROG([PWMAKE], [pwmake], [yes])

+ 0 - 1
debian/patches/series

@@ -1,4 +1,3 @@
 test-exec-path.patch
-disable-dracut-check.patch
 fix-manpage-add-name.patch
 use-socat.patch

+ 0 - 4
debian/rules

@@ -7,9 +7,5 @@ include /usr/share/dpkg/buildflags.mk
 %:
 	dh $@
 
-# wait for #880984
-override_dh_auto_configure:
-	dh_auto_configure -- --with-dracutmodulesdir=/usr/lib/dracut/modules.d
-
 override_dh_missing:
 	dh_missing --fail-missing