custom-scripts/scripts/pre_remove_40_find_unowned_lib_links

@@ -25,7 +25,8 @@ do
 		if [ "$owned" = "0" ]
 		then
 			case "$f" in
-				/lib/ld-lsb.so.?)
+				/lib/ld-lsb.so.?|\
+				/lib/ld-lsb-*.so.?)
 					# created by lsb-core
 					continue
 					;;
@@ -35,6 +36,7 @@ do
 					continue
 					;;
 				/usr/lib/libfmpich.so.12|\
+				/usr/lib/libmpi_cxx.so.20|\
 				/usr/lib/libmpich.so.12|\
 				/usr/lib/libmpichcxx.so.12|\
 				/usr/lib/libmpichf90.so.12|\

instances/piuparts.conf-template.pejacevic

@@ -13,6 +13,15 @@ flags-default =
 	%(flags-base)s
 	--warn-on-leftovers-after-purge
 
+# default flags for --merged-usr tests
+flags-merged-usr =
+	%(flags-default)s
+# test in --merged-usr environment
+	--merged-usr
+# these exist unowned and empty in an initial --merged-usr environment
+	-i /usr/lib32/
+	-i /usr/libx32/
+
 # like default flags, but failing on leftover files
 flags-leftovers =
 	%(flags-base)s
@@ -265,8 +274,7 @@ max-tgz-age = 259200
 
 [tarball/sid-merged-usr]
 piuparts-flags =
-	--merged-usr
-	%(flags-default)s
+	%(flags-merged-usr)s
 distro = None
 upgrade-test-distros = sid
 chroot-tgz = %(upgrade-test-distros)s-merged-usr_@ARCH@.tgz
@@ -388,8 +396,7 @@ precedence = 5
 description = + In --merged-usr environment.
 json-sections = none
 piuparts-flags =
-	--merged-usr
-	%(flags-default)s
+	%(flags-merged-usr)s
 distro = sid
 chroot-tgz = %(distro)s-merged-usr_@ARCH@.tgz
 

instances/piuparts.conf.anbe

@@ -11,6 +11,11 @@ flags-base =
 flags-default =
 	%(flags-base)s
 	--warn-on-leftovers-after-purge
+flags-merged-usr =
+	--merged-usr
+	-i /usr/lib32/
+	-i /usr/libx32/
+	%(flags-default)s
 flags-leftovers =
 	--warn-on-others
 	%(flags-base)s
@@ -485,8 +490,7 @@ max-tgz-age = 172800
 
 [tarball/sid-merged-usr/amd64]
 piuparts-flags =
-	--merged-usr
-	%(flags-default)s
+	%(flags-merged-usr)s
 distro = None
 upgrade-test-distros = sid
 arch = amd64
@@ -499,8 +503,7 @@ max-tgz-age = 172800
 
 [tarball/sid-merged-usr/i386]
 piuparts-flags =
-	--merged-usr
-	%(flags-default)s
+	%(flags-merged-usr)s
 distro = None
 upgrade-test-distros = sid
 arch = i386
@@ -926,8 +929,7 @@ reschedule-old-days = 60
 precedence = 30
 description = + In --merged-usr environment.
 piuparts-flags =
-	--merged-usr
-	%(flags-default)s
+	%(flags-merged-usr)s
 distro = sid
 arch = amd64
 area = main
@@ -938,8 +940,7 @@ chroot-tgz = %(distro)s-merged-usr_%(arch)s.tgz
 precedence = 45
 description = + In --merged-usr environment.
 piuparts-flags =
-	--merged-usr
-	%(flags-default)s
+	%(flags-merged-usr)s
 depends-sections = sid-merged-usr/main sid-merged-usr/non-free
 distro = sid
 arch = amd64
@@ -950,8 +951,7 @@ chroot-tgz = %(distro)s-merged-usr_%(arch)s.tgz
 precedence = 45
 description = + In --merged-usr environment.
 piuparts-flags =
-	--merged-usr
-	%(flags-default)s
+	%(flags-merged-usr)s
 depends-sections = sid-merged-usr/main sid-merged-usr/contrib
 distro = sid
 arch = amd64