On Tue, Aug 25, 2015 at 11:53:00AM -0700, Daniel Schepler wrote:
The new (much simpler) equivalent would be putting "Build-Profiles:
<!stage1>" into the slapd-smbk5pwd debian/control stanza.
Great, that seems to work nicely.
I would definitely want to exclude that package from the stage1 profile
build as otherwise it might not provide all expected functionality of
the package.
OK. I should have read the wiki first. I see it recommends against
varying package functionality across profiles.
I don't see the point in building the addon if it's not going to be
packaged in the stage1 profile anyway
I had been thinking "build the same package, but with reduced features".
Since we're not doing that, then:
- so I would just update to
ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
$(MAKE) -C contrib/slapd-modules/smbk5pwd
endif
is fine and makes me happy. :)
I think we also want a debian/control hunk, right? Is the
build-profiles syntax supported for uploading to the archive these
days?
Yup, for example nss and util-linux are already using it.
Great!
I'm at work at the moment so I don't have time to look at it in detail
right now - I'll try to look at it this evening.
No hurry. Revised patch attached... I think it's correct, but would
appreciate a thumbs-up when you have time. Thanks a lot for your help!
>From 66fdaa6fd0b4da8b25dd53cd8e2e7fef7c914b38 Mon Sep 17 00:00:00 2001
From: Ryan Tandy <r...@nardis.ca>
Date: Tue, 25 Aug 2015 18:16:30 +0000
Subject: [PATCH] Omit smbk5pwd from stage1 build (#724518)
---
debian/control | 5 +++--
debian/rules | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 135abdf..74f7ffa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,13 @@ Uploaders: Roland Bauerschmidt <r...@debian.org>,
Matthijs Möhlmann <matth...@cacholong.nl>,
Timo Aaltonen <tjaal...@ubuntu.com>,
Ryan Tandy <r...@nardis.ca>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20140227),
dpkg-dev (>= 1.16.1),
libdb5.3-dev, nettle-dev,
libgnutls28-dev, unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
libwrap0-dev, perl, po-debconf,
- groff-base, time, heimdal-multidev,
+ groff-base, time, heimdal-multidev <!stage1>,
dh-autoreconf
Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13
Standards-Version: 3.9.6
@@ -45,6 +45,7 @@ Package: slapd-smbk5pwd
Section: net
Priority: extra
Architecture: any
+Build-Profiles: <!stage1>
Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Keeps Samba and Kerberos passwords in sync within slapd.
Extends the PasswordModify Extended Operation to update Kerberos keys
diff --git a/debian/rules b/debian/rules
index 33a9901..204c8e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,14 +87,18 @@ override_dh_auto_configure:
override_dh_auto_build:
dh_auto_build -- $(MAKEVARS)
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
$(MAKE) -C contrib/slapd-modules/smbk5pwd
+endif
$(MAKE) -C contrib/slapd-modules/autogroup
$(MAKE) -C contrib/slapd-modules/lastbind
$(MAKE) -C contrib/slapd-modules/passwd/sha2
override_dh_auto_install:
dh_auto_install -- $(MAKEVARS)
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
+endif
$(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir)
$(MAKE) -C contrib/slapd-modules/lastbind install DESTDIR=$(installdir)
$(MAKE) -C contrib/slapd-modules/passwd/sha2 install DESTDIR=$(installdir)
--
2.1.4
