Hi, As noted in #752407, here's an updated patch rebased onto the current master branch; also available at https://gitorious.org/roam-debian-bootstrap/krb5-debian/commits/roam-stage1-control-3
G'luck, Peter -- Peter Pentchev [email protected] [email protected] [email protected] PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13
From 9dce31ad667c0154bc20068d35ba746a8f2ba479 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <[email protected]> Date: Mon, 23 Jun 2014 13:08:34 +0300 Subject: [PATCH] Add build profile annotations to debian/control. Use <!profile.stage1> to drop the LDAP build dependency in the stage1 profile. Use Build-Profiles: !stage1 instead of -N... to skip building the LDAP interface package and minimize the changes to the rules file. --- debian/control | 4 ++-- debian/rules | 57 +++++++++++++++++++++++++++------------------------------ 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/debian/control b/debian/control index 4594b71..8bf7181 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,9 @@ Source: krb5 Section: net Priority: standard -# For stage1 builds, remove the libldap2-dev dependency. Build-Depends: debhelper (>= 8.1.3), byacc | bison, comerr-dev, docbook-to-man, - libkeyutils-dev [linux-any], libldap2-dev, + libkeyutils-dev [linux-any], libldap2-dev <!profile.stage1>, libncurses5-dev, libssl-dev, ss-dev, libverto-dev (>= 0.2.4), pkg-config build-depends-indep: python-cheetah, python-lxml, python-sphinx, doxygen-latex, doxygen @@ -57,6 +56,7 @@ Description: MIT Kerberos key server (KDC) Package: krb5-kdc-ldap Architecture: any Priority: extra +Build-Profiles: !stage1 Depends: ${misc:Depends}, ${shlibs:Depends}, krb5-kdc (= ${binary:Version}) Description: MIT Kerberos key server (KDC) LDAP plugin Kerberos is a system for authenticating users and services on a network. diff --git a/debian/rules b/debian/rules index a15ae9b..b23de4a 100755 --- a/debian/rules +++ b/debian/rules @@ -51,11 +51,8 @@ EXCLUDE = -Xtmac.doc -Xexamples/krb5 -Xgnats/mit -Xkrb5-send-pr \ LIB_PACKAGES = libkrb5-3 libgssapi-krb5-2 libkadm5clnt-mit9 libkadm5srv-mit9 libkdb5-7 libgssrpc4 \ libkrb5support0 libk5crypto3 libkrad0 -ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) -DH_EXCLUDE= -else +ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES))) KRB5_SKIP_LDAP= 1 -DH_EXCLUDE= -Nkrb5-kdc-ldap endif ifeq (,$(KRB5_SKIP_LDAP)) @@ -140,7 +137,7 @@ endif install -m644 src/util/ac_check_krb5.m4 \ debian/libkrb5-dev/usr/share/aclocal - dh_install --sourcedir=debian/tmp --fail-missing $(EXCLUDE) $(DH_EXCLUDE) + dh_install --sourcedir=debian/tmp --fail-missing $(EXCLUDE) set -e ; find debian/krb5-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5 -type l -name \*.so -print |\ while read linkname; do \ ln -s -f ../`readlink $$linkname` \ @@ -174,17 +171,17 @@ binary-indep: DH_OPTIONS=-i binary-indep: build-indep install dh_testdir dh_testroot - dh_installchangelogs -Xdoc/CHANGES $(DH_EXCLUDE) - dh_installchangelogs -pkrb5-doc -k $(DH_EXCLUDE) doc/CHANGES - dh_installdocs $(DH_EXCLUDE) - dh_installinfo $(DH_EXCLUDE) - dh_link $(DH_EXCLUDE) - dh_compress $(DH_EXCLUDE) - dh_fixperms $(DH_EXCLUDE) - dh_installdeb $(DH_EXCLUDE) - dh_gencontrol $(DH_EXCLUDE) - dh_md5sums $(DH_EXCLUDE) - dh_builddeb $(DH_EXCLUDE) + dh_installchangelogs -Xdoc/CHANGES + dh_installchangelogs -pkrb5-doc -k doc/CHANGES + dh_installdocs + dh_installinfo + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb # Build architecture-dependent files here. # Pass -a to all debhelper commands in this target to reduce clutter. Strip @@ -196,27 +193,27 @@ binary-arch: DH_OPTIONS=-a binary-arch: build-arch install dh_testdir dh_testroot - dh_installchangelogs -Xdoc/CHANGES $(DH_EXCLUDE) - dh_installdocs $(DH_EXCLUDE) - dh_installdebconf $(DH_EXCLUDE) - dh_installinit $(DH_EXCLUDE) -- defaults 18 18 - dh_lintian $(DH_EXCLUDE) + dh_installchangelogs -Xdoc/CHANGES + dh_installdocs + dh_installdebconf + dh_installinit -- defaults 18 18 + dh_lintian set -e ; for pkg in $(LIB_PACKAGES) ; do \ DH_OPTIONS="" dh_strip -p$$pkg --dbg-package=libkrb5-dbg; \ DH_OPTIONS="" dh_makeshlibs -p$$pkg -Xusr/lib/$(DEB_HOST_MULTIARCH)/krb5/plugins -- -c4 ; \ done - dh_strip $(DH_EXCLUDE) - dh_link $(DH_EXCLUDE) - dh_compress $(DH_EXCLUDE) - dh_fixperms $(DH_EXCLUDE) + dh_strip + dh_link + dh_compress + dh_fixperms chmod u+s debian/krb5-user/usr/bin/ksu chmod 700 debian/krb5-kdc/var/lib/krb5kdc chmod 700 debian/krb5-kdc/etc/krb5kdc - dh_installdeb $(DH_EXCLUDE) - dh_shlibdeps $(DH_EXCLUDE) - dh_gencontrol $(DH_EXCLUDE) - dh_md5sums $(DH_EXCLUDE) - dh_builddeb $(DH_EXCLUDE) + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb binary: binary-indep binary-arch .PHONY: build clean configure binary-indep binary-arch binary install -- 2.0.0
signature.asc
Description: Digital signature
