Hi Andreas,
as promised, I am sending you an updated patch to add a stage1 profile
without systemd to util-linux. This patch is used for the rebootstrap
jobs on jenkins.d.n and works there.
Two things changed since my last posting:
* Uses current build profile syntax.
* Install fstrim example units even when building without systemd.
Please consider applying the patch now that the archive accepts it. The
packages gem2deb and nss also use profiles already.
Helmut
diff -Nru util-linux-2.25.1/debian/control util-linux-2.25.1/debian/control
--- util-linux-2.25.1/debian/control
+++ util-linux-2.25.1/debian/control
@@ -9,15 +9,15 @@
dpkg-dev (>=1.16.0),
gettext,
libncurses5-dev,
- libpam0g-dev,
+ libpam0g-dev <!stage1>,
libselinux1-dev [linux-any],
libslang2-dev (>=2.0.4),
- libsystemd-dev [linux-any],
+ libsystemd-dev [linux-any] <!stage1>,
libtool,
lsb-release,
pkg-config,
po-debconf,
- systemd [linux-any],
+ systemd [linux-any] <!stage1>,
zlib1g-dev
Section: base
Priority: required
@@ -32,6 +32,7 @@
Package: util-linux
Architecture: any
+Build-Profiles: <!stage1>
Section: utils
Essential: yes
Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}
@@ -48,6 +49,7 @@
Package: util-linux-locales
Architecture: all
+Build-Profiles: <!stage1>
Section: localization
Priority: optional
Depends: util-linux (>= ${source:Upstream-Version}), ${misc:Depends}
@@ -61,6 +63,7 @@
Package: mount
Architecture: linux-any
+Build-Profiles: <!stage1>
Essential: yes
Section: admin
Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}
@@ -73,6 +76,7 @@
Package: bsdutils
Architecture: any
+Build-Profiles: <!stage1>
Essential: yes
Section: utils
Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}
@@ -86,6 +90,7 @@
Package: fdisk-udeb
Architecture: hurd-any linux-any
+Build-Profiles: <!stage1>
Priority: extra
Section: debian-installer
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -95,6 +100,7 @@
Package: cfdisk-udeb
Architecture: hurd-any linux-any
+Build-Profiles: <!stage1>
Priority: extra
Section: debian-installer
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -224,6 +230,7 @@
Package: uuid-runtime
Architecture: any
+Build-Profiles: <!stage1>
Section: utils
Priority: optional
Pre-Depends: libuuid1 (>= 2.25-5~), ${misc:Pre-Depends}
@@ -275,6 +282,7 @@
Package: util-linux-udeb
Architecture: any
+Build-Profiles: <!stage1>
Priority: optional
Section: debian-installer
Depends: ${misc:Depends}, ${shlibs:Depends}
diff -Nru util-linux-2.25.1/debian/rules util-linux-2.25.1/debian/rules
--- util-linux-2.25.1/debian/rules
+++ util-linux-2.25.1/debian/rules
@@ -12,7 +12,11 @@
CONFOPTS += --enable-raw
CONFOPTS += --with-selinux
CONFOPTS += --enable-partx
-CONFOPTS += --with-systemd
+ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ CONFOPTS += --without-systemd
+else
+ CONFOPTS += --with-systemd
+endif
CONFOPTS += --enable-tunelp
endif
@@ -58,6 +58,12 @@
override_dh_auto_install:
dh_auto_install
+ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ # dh-exec as used in util-linux.install does not support profiles
+ install -d debian/tmp/lib/systemd/system
+ install -m644 sys-utils/fstrim.service.in
debian/tmp/lib/systemd/system/fstrim.service
+ install -m644 sys-utils/fstrim.timer
debian/tmp/lib/systemd/system/fstrim.timer
+endif
#
# the version in bsdmainutils seems newer.
rm -f debian/tmp/usr/bin/look debian/tmp/usr/share/man/man1/look.1
@@ -117,7 +121,9 @@
dh_installman --language=C
override_dh_gencontrol:
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
dh_gencontrol --package=bsdutils -- -v1:$(DEB_VERSION_UPSTREAM_REVISION)
+endif
dh_gencontrol --remaining-packages
override_dh_installinit:
