Merge ~ogayot/ubuntu/+source/sysvinit:merge-lp2018596-mantic into ubuntu/+source/sysvinit:debian/sid

[Olivier Gayot]

[Olivier Gayot (ogayot)]

Tags base URL
-------------
https://git.launchpad.net/~ogayot/ubuntu/+source/sysvinit/log/?h=merge-lp2018596-mantic

Relevant tags
-------------
lp2018596/logical/3.06-2ubuntu1
lp2018596/split/3.06-2ubuntu1
lp2018596/reconstruct/3.06-4ubuntu1
lp2018596/new/debian
lp2018596/old/ubuntu
lp2018596/old/debian

PPA
---
https://launchpad.net/~ogayot/+archive/ubuntu/mantic-proposed/+packages

[Robie Basak (racb)]

I'll review this.

[Robie Basak (racb)]

Thank you for working on this! It looks like this is a straightforward merge from a mechnical perspective, and you've followed git-ubuntu merge workflow correctly.

However, what about this delta that we're carrying? What's the status of minimising it? To that end I've a few questions inline.

review: Needs Information

[Olivier Gayot (ogayot)]

Thanks for your review Robie!

I answered your comments and will work on adjusting the MP.

Olivier

[Robie Basak (racb)]

On Tue, May 09, 2023 at 05:39:09PM -0000, Olivier Gayot wrote:
> How would you feel about dropping the change? I'd also like to take the opportunity to fix the previous changelog entries so that it does not wrongly appear as "Adjust d/rules to fix an arch: all build".

If the delta serves no purpose then we should drop it. And if we can't
figure out any reason for it to exist then it's reasonable to proceed on
the assumption that it serves no purpose. Have you tried asking the
person who originally introduced it?

However, please do not change previous changelog entries. That's
confusing since previous uploads cannot be changed and they will still
contain the old text. I would treat old changelog entries as immutable.
You can however explain what you are doing in the changelog entry
associated with this upload, in plain English prose, including
any historical context you wish.

> I guess unifying in Ubuntu would make sense now. I can work on doing that. I must say that I'm not particularly fan of the derives_from_ubuntu variable being "yes" or "no" but keeping two mechanisms seems worse.

Great - it's appropriate (and I would argue a requirement) to be doing
this kind of cleanup during an Ubuntu package merge. The goal is to make
the delta clean and minimal as that generally correlates with
ensuring correctness and maintainability.

Using "yes" and "no" doesn't seem clean, but AIUI make can only do
string comparisons in its conditional includes, so it's the cleanest way
to do it.

> I have not asked Debian if they would like to carry more delta from us. I think it would be a bit of a burden for Debian but I'm happy to ask if you think that's acceptable.

I appreciate that this delta would be far more invasive, so I leave it
to you to decide what would be most appropriate.

> I sent the fix to Debian back when I added it as a delta in Ubuntu. A few days ago, they included it in 3.07 (currently in experimental).
>
> I'd expect it won't need to be carried as a delta in the next upload.
>
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028586

Ah, perfect. Thanks! I did look but hadn't spotted that. For this
reason, connecting the dots for other developers can be very useful. For
example, you could use:

    d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu (Closes: #1028586)

in the Ubuntu changelog entry.

[Olivier Gayot (ogayot)]

> If the delta serves no purpose then we should drop it. And if we can't
> figure out any reason for it to exist then it's reasonable to proceed on
> the assumption that it serves no purpose. Have you tried asking the
> person who originally introduced it?

Agreed, I'm going to go ahead and drop it. I did ask the original author of the patch but they do not remember what purpose the patched served at the time.

> However, please do not change previous changelog entries. That's
> confusing since previous uploads cannot be changed and they will still
> contain the old text. I would treat old changelog entries as immutable.
> You can however explain what you are doing in the changelog entry
> associated with this upload, in plain English prose, including
> any historical context you wish.

ACK, will do as suggested. Thanks!

> I appreciate that this delta would be far more invasive, so I leave it
> to you to decide what would be most appropriate.

I opened a discussion [1] in Debian so we can move forward from the current situation. Today our delta for sysvinit is partially managed in Debian (i.e., inclusion of init-functions.d/50-ubuntu-logging) and partially in Ubuntu (i.e., we build only sysvinit-utils on Ubuntu). It does not seem like a sane approach IMO.
Ideally for us, we would upstream our both patches in Debian - and if the other changes are dropped, we could go back to syncing. That said, so far Debian suggests that we keep our vendor specific delta on our side. I'm sure we can discuss but I don't think we can expect syncing to be an option anytime soon.

> example, you could use:
>
> d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
> (Closes: #1028586)
>
> in the Ubuntu changelog entry.

Good point, will do that, thanks!

[1] http://www.chiark.greenend.org.uk/pipermail/debian-init-diversity/2023-May/006077.html

[Olivier Gayot (ogayot)]

I updated the merge proposal with the changes discussed :)

[Robie Basak (racb)]

This looks good. Thanks! Have you tested the current version? +1, pending your testing if needed. Let me know when ready and I'll sponsor.

review: Approve

[Olivier Gayot (ogayot)]

> This looks good. Thanks! Have you tested the current version? +1, pending your testing if needed. Let me know when ready and I'll sponsor.

Thanks Robie! Yes, upgrade to 3.06-4ubuntu1 is painless and I've been running this version on my laptop without issue. As far as tests go, there is no autopkgtest suite.

> Adding a trailing newline?

Yeah, this newline has been around for a while. I actually moved it to a separate commit in the split view [1] (not sure if that was needed) but it comes back at the merge-changelog step.

[1] https://git.launchpad.net/~ogayot/ubuntu/+source/sysvinit/commit/?h=lp2018596/split/3.06-2ubuntu1&id=b88c0f732d73c5c8e72688e0d6151ef5ec47dfd1 ..

[Robie Basak (racb)]

Sponsored. Thanks!

diff --git a/debian/changelog b/debian/changelog
index 5a9b4ce..d3ef3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+sysvinit (3.06-4ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2018596). Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils
+    - d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
+      (Closes: #1028586)
+  * Dropped changes:
+    - Define the DEB_HOST_* variables in d/rules if not defined already
+
+  * The dropped change was undocumented and first introduced in focal. It is
+    unclear what it was originally fixing. One assumption is that, when Debian
+    started relying on /usr/share/dpkg/common.mk, the file was not present (or
+    incomplete) on some architectures in Ubuntu. We have kept this change
+    around for nearly four years, potentially for no valid reason.
+    In 3.06-2ubuntu1, this change was worded as "Adjust debian/rules to fix an
+    arch: all build failure". This is a mistake and should not be trusted.
+
+ -- Olivier Gayot <[e-mail]>  Sun, 07 May 2023 01:04:33 +0200
+
 sysvinit (3.06-4) unstable; urgency=medium
 
   * Add Romanian debconf translations with thanks to Remus-Gabriel Chelu
@@ -14,6 +33,16 @@ sysvinit (3.06-3) unstable; urgency=medium
 
  -- Mark Hindley <[e-mail]>  Thu, 30 Mar 2023 13:59:53 +0100
 
+sysvinit (3.06-2ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #2007421). Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils
+    - Fix absence of changelog.Debian.gz in sysvinit-utils binary package
+    - Adjust debian/rules to fix an arch: all build failure
+    - d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
+
+ -- Olivier Gayot <[e-mail]>  Thu, 16 Feb 2023 14:53:59 +0100
+
 sysvinit (3.06-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -49,6 +78,23 @@ sysvinit (3.06~beta1-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  Fri, 02 Dec 2022 11:29:21 +0000
 
+sysvinit (3.05-7ubuntu2) lunar; urgency=medium
+
+  * d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
+    (LP: #2002789)
+
+ -- Olivier Gayot <[e-mail]>  Fri, 13 Jan 2023 11:33:36 +0100
+
+sysvinit (3.05-7ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable (LP: #1998325). Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils
+    - Define the DEB_HOST_* variables in d/rules if not defined already
+  * Fix absence of changelog.Debian.gz in sysvinit-utils binary package.
+    (LP: #1998324)
+
+ -- Olivier Gayot <[e-mail]>  Wed, 30 Nov 2022 10:32:54 +0100
+
 sysvinit (3.05-7) unstable; urgency=medium
 
   * Drop libcrypt-dev from B-Depends, we don't ship sulogin since Stretch
@@ -109,6 +155,14 @@ sysvinit (3.05-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  Wed, 24 Aug 2022 13:05:57 +0100
 
+sysvinit (3.04-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. (LP: #1987257) Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils
+    - Define the DEB_HOST_* variables in d/rules if not defined already
+
+ -- Olivier Gayot <[e-mail]>  Sat, 22 Aug 2022 09:57:41 +0200
+
 sysvinit (3.04-1) unstable; urgency=medium
 
   * New upstream version 3.04
@@ -135,6 +189,14 @@ sysvinit (3.02-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  Tue, 29 Mar 2022 16:00:24 +0100
 
+sysvinit (3.01-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. (Closes: LP: #1958666) Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils
+    - Define the DEB_HOST_* variables in d/rules if not defined already
+
+ -- Olivier Gayot <[e-mail]>  Tue, 14 Dec 2021 21:17:22 +0000
+
 sysvinit (3.01-1) unstable; urgency=medium
 
   * Update upstream signing key.
@@ -196,6 +258,19 @@ sysvinit (3.00~beta-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  Wed, 15 Sep 2021 11:19:13 +0100
 
+sysvinit (2.96-7ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:25:10 +0200
+
+sysvinit (2.96-7ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+
+ -- Steve Langasek <[e-mail]>  Tue, 27 Apr 2021 20:19:54 -0700
+
 sysvinit (2.96-7) unstable; urgency=medium
 
   [ Mark Hindley ]
@@ -208,6 +283,15 @@ sysvinit (2.96-7) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Sun, 18 Apr 2021 17:38:40 +0200
 
+sysvinit (2.96-6ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+  * Dropped changes, no longer needed:
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Wed, 17 Mar 2021 10:02:02 -0700
+
 sysvinit (2.96-6) unstable; urgency=medium
 
   [ Matthew Vernon ]
@@ -222,6 +306,14 @@ sysvinit (2.96-6) unstable; urgency=medium
 
  -- Matthew Vernon <[e-mail]>  Sun, 21 Feb 2021 13:53:09 +0000
 
+sysvinit (2.96-5ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Sat, 24 Oct 2020 19:04:47 -0700
+
 sysvinit (2.96-5) unstable; urgency=low
 
   * Team upload.
@@ -265,6 +357,14 @@ sysvinit (2.96-4) unstable; urgency=critical
 
  -- Thorsten Glaser <[e-mail]>  Fri, 14 Aug 2020 02:29:31 +0200
 
+sysvinit (2.96-3ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Fri, 01 May 2020 07:41:28 -0700
+
 sysvinit (2.96-3) unstable; urgency=medium
 
   * Update Dmitry's address.
@@ -274,6 +374,14 @@ sysvinit (2.96-3) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Thu, 19 Mar 2020 23:37:42 +0100
 
+sysvinit (2.96-2.1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Thu, 13 Feb 2020 10:38:21 -0800
+
 sysvinit (2.96-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -291,6 +399,14 @@ sysvinit (2.96-2) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  Thu, 28 Nov 2019 21:07:03 +0000
 
+sysvinit (2.96-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Thu, 31 Oct 2019 15:59:53 -0700
+
 sysvinit (2.96-1) unstable; urgency=medium
 
   * New upstream release.
@@ -305,6 +421,21 @@ sysvinit (2.96-1) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  Sat, 19 Oct 2019 00:37:48 +0000
 
+sysvinit (2.96~beta-3ubuntu2) focal; urgency=medium
+
+  * Fix debian/rules to not try to install bits into a sysvinit-core package
+    we aren't building.
+
+ -- Steve Langasek <[e-mail]>  Fri, 25 Oct 2019 13:21:15 -0700
+
+sysvinit (2.96~beta-3ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Fri, 18 Oct 2019 14:21:33 -0700
+
 sysvinit (2.96~beta-3) unstable; urgency=medium
 
   * Team upload.
@@ -358,6 +489,20 @@ sysvinit (2.95-6) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  Fri, 23 Aug 2019 16:26:28 +0000
 
+sysvinit (2.95-5ubuntu2) eoan; urgency=medium
+
+  * Adjust debian/rules to fix an arch: all build failure.
+
+ -- Steve Langasek <[e-mail]>  Fri, 16 Aug 2019 09:01:15 -0700
+
+sysvinit (2.95-5ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Thu, 15 Aug 2019 23:55:53 -0700
+
 sysvinit (2.95-5) unstable; urgency=medium
 
   * [2d158bc6] Make default TTYMODE match default TTYPERM of `login' package
@@ -404,6 +549,14 @@ sysvinit (2.95-3) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  Mon, 29 Jul 2019 08:10:44 +0000
 
+sysvinit (2.95-2ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Wed, 24 Jul 2019 12:32:57 -0700
+
 sysvinit (2.95-2) unstable; urgency=medium
 
   * [22e43c01] Make sure dh_fixperms is called during build.
@@ -497,6 +650,14 @@ sysvinit (2.93-9) experimental; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  Thu, 14 Feb 2019 20:55:23 +0000
 
+sysvinit (2.93-8ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+    - Make mountpoint.c compile with new glibc.
+
+ -- Steve Langasek <[e-mail]>  Mon, 29 Apr 2019 22:02:02 -0700
+
 sysvinit (2.93-8) unstable; urgency=medium
 
   * Return alternative dependency on file-rc for convenience of
@@ -715,6 +876,19 @@ sysvinit (2.88dsf-59.11) unstable; urgency=medium
 
  -- Michael Biebl <[e-mail]>  Sun, 07 Oct 2018 16:04:09 +0200
 
+sysvinit (2.88dsf-59.10ubuntu2) cosmic; urgency=medium
+
+  * Make mountpoint.c compile with new glibc.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 04 Oct 2018 16:32:29 +0100
+
+sysvinit (2.88dsf-59.10ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian, restoring 6ac609340af19a8d021c5ab8fea50c65241d1d0b:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils.
+
+ -- Adam Conrad <[e-mail]>  Wed, 01 Nov 2017 15:00:29 -0600
+
 sysvinit (2.88dsf-59.10) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -5559,3 +5733,4 @@ sysvinit (2.66-1) unstable; urgency=medium
     /var/log and /etc itself.
 
  -- Miquel van Smoorenburg <[e-mail]>  Tue, 29 Oct 1996 13:46:54 +0100
+
diff --git a/debian/control b/debian/control
index e3b9c91..de14b0e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sysvinit
 Section: admin
 Priority: optional
-Maintainer: Debian sysvinit maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian sysvinit maintainers <[e-mail]>
 Uploaders:
  Ian Jackson <[e-mail]>,
  Benda Xu <[e-mail]>,
diff --git a/debian/rules b/debian/rules
index 0a0bb84..723fef6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,10 @@ endif
 
 DH_OPTIONS =
 
+ifeq ($(derives_from_ubuntu),yes)
+	DH_OPTIONS = -Nsysvinit-core -Nsysv-rc -Ninitscripts -Nbootlogd
+endif
+
 # Use debhelper's dh
 %:
 	dh $@ $(DH_OPTIONS)
@@ -44,6 +48,7 @@ override_dh_auto_install-indep:
 override_dh_install-arch:
 	dh_install
 
+ifneq (,$(findstring sysvinit-core, $(shell dh_listpackages)))
 	# sysvinit package
 	if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
 	then \
@@ -59,6 +64,7 @@ override_dh_install-arch:
 		$(INSTALL_DATA) debian/share/inittab \
 			$(sysvtmp)/usr/share/sysvinit/inittab ; \
 	fi
+endif
 
 	# initscripts package may include /sys
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
@@ -66,8 +72,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
 endif
 
 ifeq ($(derives_from_ubuntu),yes)
-ifneq (,$(findstring lsb-base, $(shell dh_listpackages)))
-	cp -p debian/src/lsb-base/init-functions.d/50-ubuntu-logging debian/lsb-base/lib/lsb/init-functions.d/
+ifneq (,$(findstring sysvinit-utils, $(shell dh_listpackages)))
+	cp -p debian/src/lsb-base/init-functions.d/50-ubuntu-logging \
+		debian/sysvinit-utils/lib/lsb/init-functions.d/
 endif
 endif
 
@@ -75,25 +82,31 @@ install-arch: build-arch
 	dh $@ $(DH_OPTIONS)
 
 override_dh_installchangelogs-arch:
+ifneq ($(derives_from_ubuntu),yes)
 	dh_installchangelogs -psysvinit-core doc/Changelog
+endif
 
 	dh_installchangelogs -psysvinit-utils
 	rm -f $(utiltmp)$(doc)/sysvinit-utils/changelog
 	sed -i -ne '/sysvinit (2.93-8)/q' -e p \
 		$(utiltmp)$(doc)/sysvinit-utils/changelog.Debian
 
+ifneq ($(derives_from_ubuntu),yes)
 	dh_installchangelogs -pbootlogd
 	sed -i -ne '/sysvinit (2.93-8)/q' -e p \
 		$(bootlogdtmp)$(doc)/bootlogd/changelog.Debian
+endif
 
 override_dh_installchangelogs-indep:
 	dh_installchangelogs
+ifneq ($(derives_from_ubuntu),yes)
 	sed -i -ne '/sysvinit (2.93-8)/q' -e p \
 		$(rctmp)$(doc)/sysv-rc/changelog.Debian
 
 	dh_installchangelogs -pinitscripts
 	sed -i -ne '/sysvinit (2.93-8)/q' -e p \
 		$(inittmp)$(doc)/initscripts/changelog.Debian
+endif
 
 override_dh_installdeb:
 	dh_installdeb