Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: sysupgrade with relink filling disk
To:
Renaud Allard <renaud@allard.it>
Cc:
tech@openbsd.org
Date:
Fri, 31 Oct 2025 19:00:08 +0000

Download raw body.

Thread
> > (I think I would support rm'ing kernel relink files there; the relink
> > files are extracted relatively late, and removing them before upgrade
> > reduces the chance of more important files getting truncated due to
> > running out of space during extract).
> > 
> > Also, should this use .so.* instead of the version for libLLVM? Or if
> > not, then the version number bumped.
> > 
> 
> You mean something like the attached patch? Or we should be selective with
> LLVM?

If we're going to remove old libLLVM at all, I don't think we
particularly need to be selective. If we remove any libLLVM then
there's risk of breaking a few packages that might be installed
until pkg_add -u is done, though nothing really critical. vlc is
the one that's most popular. And it's by far the largest in
/usr/lib (~90MB) so I think the helpfulness in terms of avoiding
too much growth in /usr outweighs the downside.

So this is what I'd probably choose..

Index: distrib/miniroot/install.sub
===================================================================
RCS file: /cvs/src/distrib/miniroot/install.sub,v
diff -u -p -r1.1279 install.sub
--- distrib/miniroot/install.sub	22 Oct 2025 19:26:13 -0000	1.1279
+++ distrib/miniroot/install.sub	31 Oct 2025 18:51:39 -0000
@@ -1793,8 +1793,8 @@ install_files() {
 		# with potential space shortage in /usr by deleting a few
 		# versioned areas which will be replaced from the new sets
 		if isin base$VERSION.tgz $_get_sets; then
-			rm -f /mnt/usr/share/relink/usr/lib/*
-			rm -rf /mnt/usr/lib/libLLVM.so.[0-7].0
+			rm -rf /mnt/usr/share/relink/*
+			rm -f /mnt/usr/lib/libLLVM.so.*
 			rm -rf /mnt/usr/libdata/perl5
 		fi
 		if isin comp$VERSION.tgz $_get_sets; then