[Piuparts-devel] [Git][debian/piuparts][develop] 2 commits: p.conf: [sid-merged-usr] ignore disappearing /usr/lib{32, x32}/

[Holger Levsen]

Holger Levsen pushed to branch develop at Debian / piuparts


Commits:
6c49a00d by Andreas Beckmann at 2019-05-01T10:45:55Z
p.conf: [sid-merged-usr] ignore disappearing /usr/lib{32,x32}/

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
fbce8a83 by Andreas Beckmann at 2019-05-01T10:46:01Z
pre_remove_40_find_unowned_lib_links: ignore some more links

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- custom-scripts/scripts/pre_remove_40_find_unowned_lib_links
- instances/piuparts.conf-template.pejacevic
- instances/piuparts.conf.anbe


Changes:

=====================================
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_ at 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_ at 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



View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/2854cd5877f5f8362a6b145b94493abdff6c9644...fbce8a830e932cd515754c7e2c1bbb4618acff8e

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/2854cd5877f5f8362a6b145b94493abdff6c9644...fbce8a830e932cd515754c7e2c1bbb4618acff8e
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20190501/a563a6c8/attachment-0001.html>