Merge ~rafaeldtinoco/ubuntu/+source/samba:lp1858479-focal into ubuntu/+source/samba:ubuntu/focal-devel

Proposed by Rafael David Tinoco
Status: Merged
Merged at revision: c3606a403272c7e036d808f5cc3b0d5d951cda80
Proposed branch: ~rafaeldtinoco/ubuntu/+source/samba:lp1858479-focal
Merge into: ubuntu/+source/samba:ubuntu/focal-devel
Diff against target: 130 lines (+55/-7)
3 files modified
debian/changelog (+19/-0)
debian/control (+2/-2)
debian/rules (+34/-5)
Reviewer Review Type Date Requested Status
Rafael David Tinoco (community) Approve
Steve Langasek (community) Approve
Canonical Server Pending
Canonical Server Core Reviewers Pending
Review via email: mp+377241@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :

Steve,

I have 2 questions:

1) Would you like me to use the "-Nctdb" approach for the other packages mentioned in:

https://people.canonical.com/~ubuntu-archive/proposed-migration/focal_uninst.txt

"libnss-winbind libpam-winbind python3-samba samba samba-common-bin samba-testsuite winbind"

?

2) How to solve the upstream-ability "Build-Depend" problem ?

I can't make a build-depend optional per Debian packaging guidelines, as it seems, so I would have to remove "libcephfs-dev"/"librados-dev" from Build-Depends entirely for i386. UNLESS I got this wrong, and you're keeping these packages around for build-purposes only.

Final doubt:

Should I request a merge in Salsa after I'm done ?

Cheers o/

Revision history for this message
Steve Langasek (vorlon) wrote :

On Wed, Jan 08, 2020 at 01:50:28PM -0000, Rafael David Tinoco wrote:

> 1) Would you like me to use the "-Nctdb" approach for the other packages
> mentioned in:

> https://people.canonical.com/~ubuntu-archive/proposed-migration/focal_uninst.txt

> "libnss-winbind libpam-winbind python3-samba samba samba-common-bin samba-testsuite winbind"

> ?

Yes, please.

> 2) How to solve the upstream-ability "Build-Depend" problem ?

> I can't make a build-depend optional per Debian packaging guidelines, as
> it seems, so I would have to remove "libcephfs-dev"/"librados-dev" from
> Build-Depends entirely for i386. UNLESS I got this wrong, and you're
> keeping these packages around for build-purposes only.

That part is not sanely upstreamable to Debian; but everything except the
changes to debian/control should be upstreamable.

> Final doubt:

> Should I request a merge in Salsa after I'm done ?

Yes, please!

Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :
Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :
Revision history for this message
Steve Langasek (vorlon) wrote :

LGTM with one minor comment.

review: Approve
Revision history for this message
Rafael David Tinoco (rafaeldtinoco) :
Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :

Alright, just tested amd64 and i386 and this new version worked.

Since you already did a +1, I'll go ahead and upload it.

Thanks Steve!

review: Approve
Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :

Errr,

I can't push the commits/tag to usd-imported nor upload samba source package.

I need a little hand over this one.

Subscribed canonical-server again.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

The card "samba (late cycle re-merge)" says started.
@Andreas/Rafael - do you want this to be one upload (all the testing just once) or shall we upload this change here ahead of time to resolve now and not be entangled with the version bump?

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

upload this now, I can rebase my merge

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/samba
 * [new tag] upload/2%4.11.1+dfsg-3ubuntu2 -> upload/2%4.11.1+dfsg-3ubuntu2

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.11.1+dfsg-3ubuntu2.dsc: done.
  Uploading samba_4.11.1+dfsg-3ubuntu2.debian.tar.xz: done.
  Uploading samba_4.11.1+dfsg-3ubuntu2_source.buildinfo: done.
  Uploading samba_4.11.1+dfsg-3ubuntu2_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 2271609..e1322b4 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,22 @@
6+samba (2:4.11.1+dfsg-3ubuntu2) focal; urgency=medium
7+
8+ * Ubuntu i386 binary compatibility effort: (LP: #1858479)
9+ - debian/control:
10+ + drop ceph support
11+ - debian/rules:
12+ + drop ceph support
13+ + disable the following binary packages generation:
14+ - ctdb
15+ - libnss-winbind
16+ - libpam-winbind
17+ - python3-samba
18+ - samba
19+ - samba-common-bin
20+ - samba-testsuite
21+ - winbind
22+
23+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Thu, 09 Jan 2020 00:40:31 +0000
24+
25 samba (2:4.11.1+dfsg-3ubuntu1) focal; urgency=medium
26
27 * Merge with Debian unstable. Remaining changes:
28diff --git a/debian/control b/debian/control
29index 7b7fa6e..7bf1f69 100644
30--- a/debian/control
31+++ b/debian/control
32@@ -24,7 +24,7 @@ Build-Depends: bison,
33 libblkid-dev,
34 libbsd-dev,
35 libcap-dev [linux-any],
36- libcephfs-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32],
37+ libcephfs-dev [amd64 arm64 armel armhf mips64el mipsel ppc64el ppc64 s390x x32],
38 libcmocka-dev (>= 1.1.3),
39 libcups2-dev,
40 libdbus-1-dev,
41@@ -38,7 +38,7 @@ Build-Depends: bison,
42 libparse-yapp-perl,
43 libpcap-dev [hurd-i386 kfreebsd-any],
44 libpopt-dev,
45- librados-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32],
46+ librados-dev [amd64 arm64 armel armhf mips64el mipsel ppc64el ppc64 s390x x32],
47 libreadline-dev,
48 libsystemd-dev [linux-any],
49 libtalloc-dev (>= 2.2.0~),
50diff --git a/debian/rules b/debian/rules
51index 289fac6..2068872 100755
52--- a/debian/rules
53+++ b/debian/rules
54@@ -14,6 +14,12 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
55 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
56 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
57
58+# Ubuntu i386 binary compatibility only effort
59+UBUNTU_I386 = 0
60+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
61+ UBUNTU_I386 = 1
62+endif
63+
64 LDB_VERSION = $(shell pkg-config --modversion ldb)
65 LDB_EPOCH = $(shell dpkg-query -f '$${Version}' -W libldb-dev | sed 's/:.*//')
66 LDB_NEXT_VERSION = $(shell python3 -c "x = '$(LDB_VERSION)'.split('.'); x[-1] = str(int(x[-1])+1); print('.'.join(x))")
67@@ -72,12 +78,20 @@ conf_args = \
68 --with-logdir=/var/log/ctdb \
69 --enable-etcd-reclock
70
71+ifeq ($(UBUNTU_I386), 0)
72 ifneq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32, $(DEB_HOST_ARCH)))
73- conf_args += \
74- --enable-ceph-reclock
75+ conf_args += \
76+ --enable-ceph-reclock
77 else
78- conf_args += \
79- --disable-cephfs
80+ conf_args += \
81+ --disable-cephfs
82+endif
83+endif
84+
85+# Ubuntu i386 binary compatibility only effort: Disable ceph support
86+ifeq ($(UBUNTU_I386), 1)
87+ conf_args += \
88+ --disable-cephfs
89 endif
90
91 ifeq ($(DEB_HOST_ARCH_OS), linux)
92@@ -95,8 +109,21 @@ ifeq ($(DEB_HOST_ARCH_CPU), amd64)
93 --accel-aes=intelaesni
94 endif
95
96+# Ubuntu i386 binary compatibility only effort: Disable some i386 packages
97+ifeq ($(UBUNTU_I386), 1)
98+ BUILD_PACKAGES += \
99+ -Nctdb \
100+ -Nlibnss-winbind \
101+ -Nlibpam-winbind \
102+ -Npython3-samba \
103+ -Nsamba \
104+ -Nsamba-common-bin \
105+ -Nsamba-testsuite \
106+ -Nwinbind
107+endif
108+
109 %:
110- dh $* --with python3
111+ dh $* --with python3 $(BUILD_PACKAGES)
112
113 override_dh_auto_configure:
114 $(WAF_NO_PARALLEL) configure $(conf_args)
115@@ -269,6 +296,7 @@ override_dh_shlibdeps:
116 LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
117 dh_shlibdeps -a -Xceph.so -Xsnapper.so -Xctdb_mutex_ceph_rados_helper
118 ifneq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32, $(DEB_HOST_ARCH)))
119+ifeq ($(UBUNTU_I386), 0)
120 LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
121 dh_shlibdeps -a -- -pvfsceph -dRecommends \
122 -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/ceph.so
123@@ -276,6 +304,7 @@ ifneq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390
124 dh_shlibdeps -a -- -prados -dRecommends \
125 -e debian/ctdb/usr/lib/*/ctdb/ctdb_mutex_ceph_rados_helper
126 endif
127+endif
128 LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
129 dh_shlibdeps -a -- -pvfssnapper -dRecommends \
130 -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so

Subscribers

People subscribed via source and target branches