Source: systemd
Version: 204-6
Severity: wishlist
Tags: patch

The attached patch implements a stage1 bootstrap for systemd to resolve a 
couple Build-Depends cycles:

systemd Build-Depends on libcryptsetup-dev, but lvm2 Build-Depends on libudev-
dev.
systemd Build-Depends on gobject-introspection; gobject-introspection Build-
Depends on libcairo2-dev; cairo Build-Depends on libgl1-mesa-dev; and mesa 
Build-Depends on libudev-dev.
-- 
Daniel Schepler
diff -urN systemd-204.old/debian/rules systemd-204/debian/rules
--- systemd-204.old/debian/rules	2013-12-31 05:39:51.000000000 -0800
+++ systemd-204/debian/rules	2014-02-08 21:17:55.109166636 -0800
@@ -5,6 +5,10 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+ifneq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
+BOOTSTRAP_DH_FLAGS := -Ngir1.2-gudev-1.0 -Nlibgudev-1.0-0 -Nlibgudev-1.0-dev
+endif
+
 CONFFLAGS = \
 	--with-rootprefix= \
 	--with-rootlibdir=/lib/$(DEB_HOST_MULTIARCH) \
@@ -12,13 +16,15 @@
 	--with-sysvrcnd-path=/etc \
 	--with-firmware-path=/lib/firmware \
 	--with-debug-shell=/bin/bash \
-	--enable-libcryptsetup \
 	--enable-tcpwrap \
 	--disable-coredump \
 	--disable-efi \
 	--disable-myhostname \
 	--disable-vconsole \
 	--disable-silent-rules
+ifeq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
+CONFFLAGS += --enable-libcryptsetup
+endif
 
 CONFFLAGS_deb = \
 	--enable-selinux \
@@ -80,7 +86,7 @@
 	rm -rf debian/install/*/etc/kernel/
 	find debian/install/ -name '*.la' -delete
 	dh_install -pudev-udeb -plibudev1-udeb --sourcedir=debian/install/udeb
-	dh_install -Nudev-udeb -Nlibudev1-udeb --sourcedir=debian/install/deb
+	dh_install $(BOOTSTRAP_DH_FLAGS) -Nudev-udeb -Nlibudev1-udeb --sourcedir=debian/install/deb
 	# install some files manually, --sourcedir makes that necessary
 	# udev-udeb
 	install -D --mode=755 debian/extra/udev.startup \
@@ -169,7 +175,9 @@
 	# files shipped by udev / bash-completion
 	rm debian/systemd/usr/share/bash-completion/completions/udevadm
 	# files systemd by cryptsetup
+ifeq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
 	rm debian/systemd/usr/share/man/man5/crypttab.5
+endif
 	# files shipped by systemd
 	rm debian/udev/lib/udev/rules.d/70-uaccess.rules
 	rm debian/udev/lib/udev/rules.d/73-seat-late.rules
@@ -202,4 +210,8 @@
 	dh_autoreconf debian/rules -- autoreconf
 
 %:
+ifeq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
 	dh $@ --with autoreconf,gir,python2
+else
+	dh $@ --with autoreconf,python2 $(BOOTSTRAP_DH_FLAGS)
+endif

Reply via email to