Commit a4003492 authored by Michael Stapelberg's avatar Michael Stapelberg
Browse files

add stage1 bootstrap support to avoid Build-Depends cycles

Patch by Daniel Schepler
parent 3a99ed9d
......@@ -2,6 +2,8 @@ systemd (204-7) unstable; urgency=low
* fix systemctl enable/disable/ error message Failed to issue method call:
No such file or directory (Closes: #734809)
* add stage1 bootstrap support to avoid Build-Depends cycles (Thanks Daniel
Schepler) (Closes: #738319)
* cherry-pick:
order remote mounts from mountinfo before remote-fs.target (77009452cfd)
(Closes: #719945)
......
......@@ -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 @@ CONFFLAGS = \
--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 @@ override_dh_install:
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 @@ override_dh_install:
# 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 @@ override_dh_autoreconf:
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment