Control: tags -1 + patch
On Tue, Aug 05, 2014 at 10:31:10PM +0200, Andreas Henriksson wrote:
> I guess something along the lines of the attached patch should be a start.
Thanks a lot. It did help. In fact I could mostly retain it.
> It builds when using "dpkg-buildpackage -Pstage1" but please verify
> it actually solves the bootstrapping problems, see if there's a need
> for a cross profile and possibly see if there's anything that can
> be simplified and/or improved....
I verified that using the attached patch (which is heavily based on your
initial patch), util-linux can be stage1 cross-built (binary-only). This
does not mean that the resulting packages are known to work, but I
generally don't verify that.
You worried about your adding of dh-exec as a Build-Dependency in
another mail. Observe that dh-exec is marked Multi-Arch foreign. In
general, Build-Depends that are marked Multi-Arch foreign are not a
problem to cross building. This is also the reason for why dh-systemd is
not a problem.
So I think this patch solves the present bootstrap problems. It is only
partially ready for merge though. You can apply the debian/rules changes
immediately. The Build-Profile headers in debian/control are subject to
syntax change (I am still using the old syntax because dpkg is broken in
sid) and the Build-Depends hunks will be rejected by dak. Having the
debian/rules hunks applied would help nonetheless, because it makes
patch application failures with new util-linux uploads less likely.
Thanks for taking up util-linux and handling the workload!
Helmut
diff -Nru util-linux-2.25.1/debian/changelog util-linux-2.25.1/debian/changelog
--- util-linux-2.25.1/debian/changelog 2014-10-05 19:06:55.000000000 +0200
+++ util-linux-2.25.1/debian/changelog 2014-10-08 06:51:43.000000000 +0200
@@ -1,3 +1,10 @@
+util-linux (2.25.1-3.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Add stage1 build profile without pam and systemd. (Closes: #757147)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 08 Oct 2014 14:24:37 +0200
+
util-linux (2.25.1-3) unstable; urgency=medium
[ Ben Hutchings ]
diff -Nru util-linux-2.25.1/debian/control util-linux-2.25.1/debian/control
--- util-linux-2.25.1/debian/control 2014-10-05 19:06:55.000000000 +0200
+++ util-linux-2.25.1/debian/control 2014-10-08 06:52:56.000000000 +0200
@@ -9,15 +9,15 @@
dpkg-dev (>=1.16.0),
gettext,
libncurses5-dev,
- libpam0g-dev,
+ libpam0g-dev <!profile.stage1>,
libselinux1-dev [linux-any],
libslang2-dev (>=2.0.4),
- libsystemd-dev [linux-any],
+ libsystemd-dev [linux-any] <!profile.stage1>,
libtool,
lsb-release,
pkg-config,
po-debconf,
- systemd [linux-any],
+ systemd [linux-any] <!profile.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 2014-10-05 19:06:55.000000000 +0200
+++ util-linux-2.25.1/debian/rules 2014-10-08 06:52:31.000000000 +0200
@@ -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
@@ -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:
