Bug#1057089: bullseye-pu: package usrmerge/37~deb12u1

Andreas Beckmann

unread,

Nov 29, 2023, 10:00:06 AM11/29/23

to

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.d...@packages.debian.org
Usertags: pu
X-Debbugs-Cc: usrm...@packages.debian.org
Control: affects -1 + src:usrmerge

[ Reason ]
Improve the usrmerge experience in bookworm.
A few more ancient packages were found that need to be removed first for
usrmerge to succeed, add versioned Breaks against them.
Depending on the time a system was bootstrapped or converted, there may
be biarch directories/links not owned by any package
(e.g. /usr/libx32 and /libx32 -> /usr/libx32)
Since these are now handled by the respective packages from src:glibc,
bootstrapping and conversion no longer create them and we can clean them
up if they are empty and not owned by a package.
Clarify errors in case something goes wrong during usrmerge conversion.

[ Impact ]
Unclear errors if something fails.
Failing usrmerge conversion if certain ancient packages are installed.
Leftover unowned files that may disappear on certain upgrade paths and
confuse CI tools.
Inconsistent handling of /etc/shells and shells.state.

[ Tests ]
Local piuparts tests of bookworm (w/ updated package) and various
distupgrade tests from bullseye (or earlier) to bookworm (w/ updated
package).

[ Risks ]
Low.

[ Checklist ]
[*] *all* changes are documented in the d/changelog
[*] I reviewed all changes and I approve them
[*] attach debdiff against the package in (old)stable
[*] the issue is verified as fixed in unstable

[ Changes ]

+usrmerge (37~deb12u1) bookworm; urgency=medium
+
+ * Rebuild for bookworm.
+
+ -- Andreas Beckmann <an...@debian.org> Mon, 27 Nov 2023 11:35:49 +0100
+
+usrmerge (37) unstable; urgency=medium
+
+ [ Johannes Schauer Marin Rodrigues ]
+ * Use $DPKG_ROOT in usr-is-merged.postinst. (Closes: #1050755)
+
+ -- Marco d'Itri <m...@linux.it> Tue, 29 Aug 2023 02:14:10 +0200
+
+usrmerge (36) unstable; urgency=medium
+
+ * Added code by Andreas Beckmann to clean up the biarch libraries
+ directories when they are not needed. (Closes: #1038853)
+ * Changed postinst to not run convert-etc-shells again on already
+ converted systems and to run update-shells to make sure that the
+ new shells.state file introduced in bookworm is up to date.
+ (Closes: #1033167)
+ * Improved the instructions to deal with a mounted /lib/modules/,
+ which can also happen on some Xen-based systems. (Closes: 1034346)
+ * Greatly improved the error messages when commands execution fails
+ (see #1037362).
+ * Added a versioned conflict with libc-bin, only relevant for the
+ conversion script. (Closes: #1037362)
+ * Added a versioned conflict with dhcpcd. (Closes: #1038832)
+ * Added a versioned conflict with libparted1.8-10. (Closes: #1038832)
+ * Added a versioned conflict with lustre-utils. (Closes: #1038832)
+
+ -- Marco d'Itri <m...@linux.it> Sun, 27 Aug 2023 13:56:49 +0200

convert-usrmerge | 34 +++++++++++++++++++---------------
debian/README.Debian | 6 ++----
debian/changelog | 33 +++++++++++++++++++++++++++++++++
debian/control | 9 ++++++++-
debian/usr-is-merged.postinst | 28 ++++++++++++++++++++++++++++
debian/usrmerge.postinst | 28 ++++++++++++++++++++++++++--
6 files changed, 116 insertions(+), 22 deletions(-)

[ Other info ]
This is a rebuild of a package that was previously in sid and testing.
(The current version (38) in sid made usrmerge mandatory in all cases
and is not applicable to bookworm (which supports the usrmerge opt-out.)

Andreas

usrmerge_37~deb12u1.diff

Luca Boccassi

unread,

Nov 29, 2023, 10:20:06 AM11/29/23

to

On Wed, 29 Nov 2023 15:46:30 +0100 Andreas Beckmann <an...@debian.org>
wrote:

> Package: release.debian.org
> Severity: normal
> Tags: bullseye
> User: release.d...@packages.debian.org
> Usertags: pu
> X-Debbugs-Cc: usrm...@packages.debian.org
> Control: affects -1 + src:usrmerge
>
> [ Reason ]
> Improve the usrmerge experience in bookworm.

Hi Andreas,

This looks like a good idea to me, and the diff looks good - but
assuming you did mean bookworm, as the changelog implies, the
tags/title are referencing bullseye.

--
Kind regards,
Luca Boccassi

signature.asc

Marco d'Itri

unread,

Nov 30, 2023, 4:00:05 AM11/30/23

to

On Nov 29, Andreas Beckmann <an...@debian.org> wrote:

> Improve the usrmerge experience in bookworm.

Great idea, thank you for working on this!

--
ciao,
Marco

signature.asc

Jonathan Wiltshire

unread,

Dec 21, 2023, 5:10:04 PM12/21/23

to

Control: tag -1 confirmed

On Wed, Nov 29, 2023 at 03:46:30PM +0100, Andreas Beckmann wrote:
> [ Reason ]
> Improve the usrmerge experience in bookworm.
> A few more ancient packages were found that need to be removed first for
> usrmerge to succeed, add versioned Breaks against them.
> Depending on the time a system was bootstrapped or converted, there may
> be biarch directories/links not owned by any package
> (e.g. /usr/libx32 and /libx32 -> /usr/libx32)
> Since these are now handled by the respective packages from src:glibc,
> bootstrapping and conversion no longer create them and we can clean them
> up if they are empty and not owned by a package.
> Clarify errors in case something goes wrong during usrmerge conversion.

Please go ahead.

Thanks,

--
Jonathan Wiltshire j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
ed25519/0x196418AAEB74C8A1: CA619D65A72A7BADFC96D280196418AAEB74C8A1

Jonathan Wiltshire

unread,

Jan 15, 2024, 3:30:04 AM1/15/24

to

package release.debian.org
tags 1057089 = bookworm pending
thanks

Hi,

The upload referenced by this bug report has been flagged for acceptance into the proposed-updates queue for Debian bookworm.

Thanks for your contribution!

Upload details
==============

Package: usrmerge
Version: 37~deb12u1

Explanation: clean up biarch directories when not needed; don't run convert-etc-shells again on converted systems; handle mounted /lib/modules on Xen systems; improve error reporting; add versioned conflicts with libc-bin, dhcpcd, libparted1.8-10 and lustre-utils