[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: spellfix
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Wed Apr 6 15:18:15 BST 2022
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
cca79ae0 by Michael Tokarev at 2022-04-06T15:08:29+03:00
spellfix
- - - - -
aa3828ec by Michael Tokarev at 2022-04-06T17:17:41+03:00
d/rules: add little dh magic back
Commit 7c67aec1942c9 "make dh magic a bit less magical" broke
arch-indep-only build, so return some of the dh magic back and
create the list of packages to build using dh_listpackages
instead of checking only the list of packages to omit.
This is because dh_listpackages will not only look at -Npkg
but also at -i/-a build and to Architecture: fields in d/control.
But still make it more explicit and obvious where this list is
coming from, instead of the black magic which were before that
commit.
But we might still want to split -arch and -indep builds properly.
- - - - -
2 changed files:
- debian/changelog
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -10,7 +10,7 @@ samba (2:4.16.0+dfsg-2) UNRELEASED; urgency=medium
so that symbols versioning works correctly. Unfortunately the previous
upload to experimental used the first form which is greather than the
correct one, so temporarily (just for this 2.5.0 version of ldb) use
- this: ldb_2:2.5.0+smb-1+samba4.16.0
+ this: ldb_2:2.5.0+smb-1+samba4.16.0
(with "+smb" suffix to be removed for 2.5.1+)
* exclude samba-vfs-modules for i386 ubuntu build since this package
is useless without samba itself (which is not built on this environment)
=====================================
debian/rules
=====================================
@@ -16,8 +16,8 @@ DEB_REVISION = $(call dpkg_late_eval,DEB_REVISION,v='${DEB_VERSION}'; echo "$${v
LDB_EPOCH := 2:
LDB_VERSION = $(call dpkg_late_eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
- # for 2.5.0 we uploaded wrongly versioned ldb to experimental (2.5.0+samba should be 2.5.0)
- # temporarily add a suffix. This can be removed for 2.5.1+.
+ # For 2.5.0 we uploaded wrongly versioned ldb to experimental (2.5.0+samba should be 2.5.0)
+ # Temporarily add a suffix so it sorts after the wrong version. Remove for 2.5.1+.
LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}$(if $(filter ${LDB_VERSION},2.5.0),+smb)-${DEB_REVISION}+samba${DEB_VERSION_UPSTREAM}
LDB_DEPENDS := libldb2 (= ${LDB_DEB_VERSION})
@@ -105,22 +105,17 @@ else
--without-systemd
endif
-# only a few packages can be omitted (handled below)
-omit_packages =
-
# Ubuntu i386 binary compatibility only effort: Disable some i386 packages
ifeq ($(DEB_VENDOR) $(DEB_HOST_ARCH), Ubuntu i386)
- omit_packages += \
- ctdb \
- libpam-winbind \
- samba \
- samba-testsuite \
- samba-vfs-modules
+export DH_OPTIONS += $(addprefix -N,\
+ ctdb libpam-winbind samba samba-testsuite samba-vfs-modules )
endif
+# build_pakages will honour arch/indep and the above disabled list
+build_packages := $(shell dh_listpackages)
binary binary-arch binary-indep build build-arch build-indep \
clean install install-arch install-indep: %:
- dh $* --with python3 $(addprefix -N,${omit_packages})
+ dh $* --with python3
override_dh_auto_configure configure: bin/configured.stamp
.PHONY: configure
@@ -154,7 +149,7 @@ override_dh_auto_build:
testbuild/copied.stamp:
rm -rf testbuild; mkdir testbuild
cp -a -l $$(ls -1 | egrep -v '^(bin|testbuild)$$') testbuild/
-# cleanup some file just in case, do not interfere with production build
+# cleanup some files just in case, do not interfere with production build
find testbuild -name __pycache__ -exec rm -rf {} +
rm -f testbuild/compile_commands.json
touch $@
@@ -244,17 +239,17 @@ override_dh_install:
DEB_PY3_INCDIR=$$(${PYTHON}-config --includes | sed 's,^-I\([^ ]*\).*,\1,') \
dh_install
-# include a command only if the given package is being build
-ifpkg = $(if $(filter ${1},${omit_packages}),,${2})
+# include a command only if the given package is being built
+ifpkg = $(if $(filter ${1},${build_packages}),${2})
override_dh_installinit:
-ifeq (,$(filter samba, ${omit_packages}))
+ifneq (,$(filter samba, ${build_packages}))
dh_installinit -psamba --name smbd
dh_installinit -psamba --name nmbd --error-handler nmbd_error_handler
dh_installinit -psamba --name samba-ad-dc
endif
$(call ifpkg, winbind, dh_installinit -pwinbind)
-ifeq (,$(filter ctdb, ${omit_packages}))
+ifneq (,$(filter ctdb, ${build_packages}))
# Install /etc/init.d/ctdb
mkdir -p debian/ctdb/etc/init.d
install -m755 ctdb/config/ctdb.init debian/ctdb/etc/init.d/ctdb
@@ -300,13 +295,13 @@ override_dh_shlibdeps:
# to change Depends to Recommends for them in d/control
dh_shlibdeps -l${CURDIR}/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/samba \
-Xceph.so -Xglusterfs.so -Xsnapper.so -Xctdb_mutex_ceph_rados_helper
-ifeq (,$(filter ctdb, ${omit_packages}))
+ifneq (,$(filter ctdb, ${build_packages}))
ifneq ($(WITH_CEPH),)
dpkg-shlibdeps -Tdebian/ctdb.substvars -prados \
debian/ctdb/usr/libexec/ctdb/ctdb_mutex_ceph_rados_helper
endif
endif
-ifeq (,$(filter samba-vfs-modules,${omit_packages}))
+ifneq (,$(filter samba-vfs-modules,${build_packages}))
dpkg-shlibdeps -Tdebian/samba-vfs-modules.substvars -pvfsmods \
debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so \
$(if ${WITH_CEPH}, debian/samba-vfs-modules/usr/lib/*/samba/vfs/ceph.so) \
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f2c02f9900c3a28bf46f32931a0f8826bea0ca88...aa3828ec34f83e9f31e3e45e1438df1d4a34c29c
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f2c02f9900c3a28bf46f32931a0f8826bea0ca88...aa3828ec34f83e9f31e3e45e1438df1d4a34c29c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20220406/16509668/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list