[Piuparts-devel] [Git][debian/piuparts][develop] 14 commits: Default to merged-/usr chroots
Nicolas Dandrimont (@olasd)
gitlab at salsa.debian.org
Sat Oct 28 22:35:51 BST 2023
Nicolas Dandrimont pushed to branch develop at Debian / piuparts
Commits:
01867473 by Nicolas Dandrimont at 2023-10-28T21:53:06+02:00
Default to merged-/usr chroots
This matches the current supported defaults for Debian build
infrastructure (for trixie and up). --no-merged-usr can be set to
override the default.
Closes: #1054898
- - - - -
feb1fdef by Nicolas Dandrimont at 2023-10-28T22:11:31+02:00
p.conf: the merged-/usr file move moratorium has been repealed
- - - - -
ea41a02f by Nicolas Dandrimont at 2023-10-28T22:11:31+02:00
p.conf: add --no-merged-usr to config for archived suites
- - - - -
d46c32b7 by Nicolas Dandrimont at 2023-10-28T22:11:31+02:00
p.conf: don't schedule jobs for the sid-merged-usr suite
- - - - -
f506518b by Nicolas Dandrimont at 2023-10-28T22:11:31+02:00
p.conf: clean up the sid-merged-usr tarball
- - - - -
12575620 by Nicolas Dandrimont at 2023-10-28T22:11:31+02:00
custom-scripts: usrmerge and usr-is-merged should be testable now
- - - - -
219f6a92 by Nicolas Dandrimont at 2023-10-28T23:09:47+02:00
p.conf: Don't reschedule tests for archived suites
- - - - -
786e5cb8 by Nicolas Dandrimont at 2023-10-28T23:10:08+02:00
p.conf: clean up tarball jobs for archived suites
- - - - -
1e2760b3 by Nicolas Dandrimont at 2023-10-28T23:13:43+02:00
p.conf: set max-reserved to 0 for archived suites
This should skip these sections entirely on the slaves
- - - - -
b956c2b7 by Nicolas Dandrimont at 2023-10-28T23:13:52+02:00
news: fix date for bookworm news item
- - - - -
333dce10 by Nicolas Dandrimont at 2023-10-28T23:13:52+02:00
news: add item for merging test chroots
- - - - -
21eab753 by Nicolas Dandrimont at 2023-10-28T23:13:52+02:00
d/source: Update lintian overrides
- - - - -
80314d5a by Nicolas Dandrimont at 2023-10-28T23:13:52+02:00
d/control: Update to dh compat level 13
- - - - -
e84d0e97 by Nicolas Dandrimont at 2023-10-28T23:17:48+02:00
Finalize changelog for piuparts 1.2
- - - - -
15 changed files:
- custom-scripts/scripts/is_testable_uninstallable
- custom-scripts/scripts/post_purge_exceptions
- custom-scripts/scripts/pre_install_exceptions
- debian/changelog
- debian/control
- debian/piuparts-master.docs
- debian/piuparts.NEWS
- debian/piuparts.docs
- debian/source/lintian-overrides
- docs/piuparts/piuparts.1.txt
- htdocs/news.tpl
- instances/piuparts.conf-template.pejacevic
- piuparts-slave.py
- piuparts.py
- piupartslib/conf.py
Changes:
=====================================
custom-scripts/scripts/is_testable_uninstallable
=====================================
@@ -417,7 +417,4 @@ case ${PIUPARTS_OBJECTS%%=*}@${PIUPARTS_DISTRIBUTION} in
sdic-eijiro@*)
skip_always "requires a dictionary CD"
;;
- usrmerge@*)
- skip_always "performs piuparts-unfriendy filesystem layout changes"
- ;;
esac
=====================================
custom-scripts/scripts/post_purge_exceptions
=====================================
@@ -53,13 +53,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
log_debug
sleep 10
;;
- *usr-is-merged*|*usrmerge*)
- # Remove the exception flag that we added in pre_install_exceptions, if we added it
- if [ -f /etc/unsupported-skip-usrmerge-conversion.piuparts ]; then
- log_debug
- rm -f /etc/unsupported-skip-usrmerge-conversion*
- fi
- ;;
esac
if [ -f /var/run/piuparts-stamp-dkms-installed ]; then
=====================================
custom-scripts/scripts/pre_install_exceptions
=====================================
@@ -106,20 +106,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
mkdir -p /var/state/samhain/
touch /var/state/samhain/samhain_file
;;
- *usr-is-merged*|*usrmerge*)
- # usr-is-merged intentionally fails to install unless either the system is merged-usr, or
- # the exception flag is set.
- # usrmerge does a live-upgrade of the chroot, which piuparts does not expect, so skip it.
- # debootstrap will take care of this in a future update, so remember if we were the ones
- # that added the flag file, to remove it in the post_purge_exceptions script.
- # For details on the flag file, see: https://sources.debian.org/src/usrmerge/27/debian/README.Debian/#L66
- # and: https://lists.debian.org/debian-ctte/2022/07/msg00019.html
- if [ ! -f /etc/unsupported-skip-usrmerge-conversion ]; then
- log_debug
- touch /etc/unsupported-skip-usrmerge-conversion.piuparts
- echo "this system will not be supported in the future" > /etc/unsupported-skip-usrmerge-conversion
- fi
- ;;
esac
if [ "$PIUPARTS_DISTRIBUTION" = "jessie" ]; then
=====================================
debian/changelog
=====================================
@@ -1,9 +1,34 @@
-piuparts (1.1.8) UNRELEASED; urgency=medium
+piuparts (1.2) unstable; urgency=medium
- * Start 1.1.8 development. d/changelog entries will be written on
- release using the git commit messages.
+ [ David Steele ]
+ * Doc - don't include oldoldstable in global summary
+
+ [ Cyril Brulebois ]
+ * piuparts(1): fix syntax for long options.
+ * piuparts(1): fix syntax for bullet lists.
+
+ [ Nicolas Dandrimont ]
+ * piuparts(1): fix a lot of ReStructuredText markup issues
+ * config: bookworm has been released, trixie is now testing
+ * news: Add news for bookworm release
+ * Default to merged-/usr chroots (Closes: #1054898)
+ * p.conf: the merged-/usr file move moratorium has been repealed
+ * p.conf: add --no-merged-usr to config for archived suites
+ * p.conf: don't schedule jobs for the sid-merged-usr suite
+ * p.conf: clean up the sid-merged-usr tarball
+ * custom-scripts: usrmerge and usr-is-merged should be testable now
+ * p.conf: Don't reschedule tests for archived suites
+ * p.conf: clean up tarball jobs for archived suites
+ * p.conf: set max-reserved to 0 for archived suites
+ * news: fix date for bookworm news item
+ * news: add item for merging test chroots
+ * d/source: Update lintian overrides
+ * d/control: Update to dh compat level 13
+
+ [ Evgeni Golov ]
+ * explicitly state that piuparts needs direct access to docker storage
- -- Holger Levsen <holger at debian.org> Wed, 18 Jan 2023 22:53:30 +0100
+ -- Nicolas Dandrimont <olasd at debian.org> Sat, 28 Oct 2023 23:17:21 +0200
piuparts (1.1.7) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Priority: optional
Standards-Version: 4.6.2
Rules-Requires-Root: no
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
dh-python,
python3-all,
python3-apt,
=====================================
debian/piuparts-master.docs
=====================================
@@ -1,2 +1,2 @@
-docs/README_server.txt
+usr/share/doc/piuparts/README_server.txt
docs/README_pejacevic.txt
=====================================
debian/piuparts.NEWS
=====================================
@@ -1,3 +1,16 @@
+piuparts (1.2) unstable; urgency=medium
+
+ Piuparts 1.2 now defaults to creating and using merged-/usr chroots for all
+ suites, as this has been the default for new installed systems since buster,
+ and is now the mandatory layout in unstable (& trixie), including build
+ chroots.
+
+ The --no-merged-usr flag has been introduced to return to the legacy behavior,
+ which can be useful to test packages for older suites, as well as suitability
+ of packages for use in unmerged build chroots.
+
+ -- Nicolas Dandrimont <olasd at debian.org> Sat, 28 Oct 2023 23:17:21 +0200
+
piuparts (0.45) unstable; urgency=low
For those interested in running their own local instance of
=====================================
debian/piuparts.docs
=====================================
@@ -1,2 +1,2 @@
-docs/README.txt
-debian/tmp/usr/share/doc/piuparts/html/
+usr/share/doc/piuparts/README.txt
+usr/share/doc/piuparts/html/
=====================================
debian/source/lintian-overrides
=====================================
@@ -1,4 +1,2 @@
-very-long-line-length-in-source-file 650 > 512 [htdocs/news.tpl:214]
very-long-line-length-in-source-file 671 > 512 [htdocs/index.tpl:46]
-very-long-line-length-in-source-file 777 > 512 [docs/piuparts/piuparts.1.txt:27]
very-long-line-length-in-source-file 515 > 512 [known_problems/db_setup_issue.conf:4]
=====================================
docs/piuparts/piuparts.1.txt
=====================================
@@ -217,6 +217,10 @@ Options must come before the other command line arguments.
to create a chroot with :file:`/bin`, :file:`/lib`, :file:`/sbin` being symlinks to their :file:`/usr`
counterparts.
+.. option:: --no-merged-usr
+
+ When using debootstrap to create the chroot, use the ``--no-merged-usr`` option.
+
.. option:: -m URL, --mirror URL
Which Debian mirror to use. The default is the first mirror named in :file:`/etc/apt/sources.list` or ``http://deb.debian.org/debian`` if none is found. This option may be used multiple times to use multiple mirrors. Only the first mirror is used with :program:`debootstrap`.
=====================================
htdocs/news.tpl
=====================================
@@ -6,7 +6,13 @@
</tr>
<tr class="normalrow">
<td class="contentcell2">
- <b>2022-06-12</b>
+ <b>2023-10-28</b>
+ All chroots used to run tests on piuparts.debian.org now use a merged-/usr layout. See <a href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054898#10">the discussion in bug #1054898</a> for the rationale. The sid-merged-usr suite has been retired.
+ </td>
+ </tr>
+ <tr class="normalrow">
+ <td class="contentcell2">
+ <b>2023-06-12</b>
Update the list of suites for the new (old)stable and testing, after the release of bookworm on June 10th.
</td>
</tr>
=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -42,18 +42,15 @@ flags-end-oldoldstable = %(flags-end-buster)s
# common flags for tests starting in trixie
flags-start-trixie =
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994388#80
- --warn-on-usr-move fail
+# no flags needed
# common flags for tests ending in trixie
flags-end-trixie =
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994388#80
- --warn-on-usr-move fail
+# no flags needed
# common flags for tests starting in bookworm
flags-start-bookworm =
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994388#80
- --warn-on-usr-move fail
+# no flags needed
# common flags for tests ending in bookworm
flags-end-bookworm =
@@ -81,7 +78,8 @@ flags-end-buster =
# common flags for tests starting in stretch
flags-start-stretch =
-# no flags needed
+# stretch needs non-/usr-merged systems
+ --no-merged-usr
# common flags for tests ending in stretch
flags-end-stretch =
@@ -93,7 +91,8 @@ flags-end-stretch =
# common flags for tests starting in jessie
flags-start-jessie =
-# no flags needed
+# jessie needs non-/usr-merged systems
+ --no-merged-usr
# common flags for tests ending in jessie
flags-end-jessie =
@@ -109,7 +108,8 @@ flags-end-jessie =
# common flags for tests starting in wheezy
flags-start-wheezy =
-# no flags needed
+# wheezy needs non-/usr-merged systems
+ --no-merged-usr
# common flags for tests ending in wheezy
flags-end-wheezy =
@@ -124,6 +124,8 @@ flags-end-wheezy =
# common flags for tests starting in squeeze
flags-start-squeeze =
+# squeeze needs non-/usr-merged systems
+ --no-merged-usr
# up to squeeze a non-empty /etc/shells was shipped, actually installing
# and removing a shell would remove its entry from /etc/shells
-i /etc/shells
@@ -140,6 +142,8 @@ flags-end-squeeze =
# common flags for tests starting in lenny
flags-start-lenny =
+# lenny needs non-/usr-merged systems
+ --no-merged-usr
# dpkg --force-unsafe-io was added in squeeze
--dpkg-noforce-unsafe-io
# up to squeeze a non-empty /etc/shells was shipped, actually installing
@@ -188,16 +192,10 @@ flags-broken-symlinks =
[global]
basetgz-sections =
tarball/sid
- tarball/sid-merged-usr
tarball/trixie
tarball/bookworm
tarball/bullseye
tarball/buster
- tarball/stretch
- tarball/jessie
- tarball/wheezy
- tarball/squeeze
- tarball/lenny
sections =
experimental
sid2experimental
@@ -316,15 +314,6 @@ upgrade-test-distros = sid
max-tgz-age = 259200
-[tarball/sid-merged-usr]
-piuparts-flags =
- %(flags-merged-usr)s
-distro = None
-upgrade-test-distros = sid
-# 3 days (60*60*24*3)
-max-tgz-age = 259200
-
-
[tarball/trixie]
piuparts-flags =
%(flags-default)s
@@ -365,55 +354,6 @@ upgrade-test-distros = buster
max-tgz-age = 2592000
-[tarball/stretch]
-piuparts-flags =
- %(flags-default)s
- %(flags-start-stretch)s
-distro = None
-upgrade-test-distros = stretch
-# 1 month (60*60*24*30)
-max-tgz-age = 2592000
-
-
-[tarball/jessie]
-piuparts-flags =
- %(flags-default)s
- %(flags-start-jessie)s
-distro = None
-upgrade-test-distros = jessie
-# 1 month (60*60*24*30)
-max-tgz-age = 2592000
-
-
-[tarball/wheezy]
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
-distro = None
-upgrade-test-distros = wheezy
-max-tgz-age = 0
-
-
-[tarball/squeeze]
-piuparts-flags =
- %(flags-default)s
- %(flags-start-squeeze)s
- --keyring /usr/share/keyrings/debian-archive-removed-keys.gpg
-distro = None
-upgrade-test-distros = squeeze
-max-tgz-age = 0
-
-
-[tarball/lenny]
-piuparts-flags =
- %(flags-default)s
- %(flags-start-lenny)s
- --keyring /usr/share/keyrings/debian-archive-removed-keys.gpg
-distro = None
-upgrade-test-distros = lenny
-max-tgz-age = 0
-
-
[experimental]
precedence = 3
piuparts-flags =
@@ -471,6 +411,9 @@ json-sections = none
piuparts-flags =
%(flags-merged-usr)s
distro = sid
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[sid-broken-symlinks]
@@ -727,6 +670,9 @@ piuparts-flags =
%(flags-end-buster)s
depends-sections = buster
distro = buster-proposed-updates
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[buster-next]
@@ -737,6 +683,9 @@ piuparts-flags =
%(flags-start-buster)s
%(flags-end-buster)s
distro = buster-next
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[buster2next]
@@ -748,6 +697,9 @@ piuparts-flags =
%(flags-end-buster)s
distro = buster
upgrade-test-distros = buster buster-next
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch2buster]
@@ -759,6 +711,9 @@ piuparts-flags =
%(flags-end-buster)s
distro = stretch
upgrade-test-distros = stretch buster
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch2Xbuster]
@@ -773,6 +728,9 @@ piuparts-flags =
distro = stretch
upgrade-test-distros = stretch buster
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch2buster-rcmd]
@@ -786,6 +744,9 @@ piuparts-flags =
%(flags-end-buster)s
distro = stretch
upgrade-test-distros = stretch buster
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch2Xbuster-rcmd]
@@ -801,6 +762,9 @@ piuparts-flags =
distro = stretch
upgrade-test-distros = stretch buster
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch2bpo2buster]
@@ -813,6 +777,9 @@ piuparts-flags =
depends-sections = stretch
distro = stretch-backports
upgrade-test-distros = stretch stretch-backports buster
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch2bpo]
@@ -825,6 +792,9 @@ piuparts-flags =
depends-sections = stretch
distro = stretch-backports
upgrade-test-distros = stretch stretch-backports
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch]
@@ -836,6 +806,9 @@ piuparts-flags =
%(flags-start-stretch)s
%(flags-end-stretch)s
distro = stretch
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch-rcmd]
@@ -848,6 +821,9 @@ piuparts-flags =
%(flags-start-stretch)s
%(flags-end-stretch)s
distro = stretch
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch-security]
@@ -859,6 +835,9 @@ piuparts-flags =
%(flags-end-stretch)s
depends-sections = stretch
distro = stretch/updates
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch-pu]
@@ -870,6 +849,9 @@ piuparts-flags =
%(flags-end-stretch)s
depends-sections = stretch
distro = stretch-proposed-updates
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch-next]
@@ -880,6 +862,9 @@ piuparts-flags =
%(flags-start-stretch)s
%(flags-end-stretch)s
distro = stretch-lts
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[stretch2next]
@@ -891,6 +876,9 @@ piuparts-flags =
%(flags-end-stretch)s
distro = stretch
upgrade-test-distros = stretch stretch-lts
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie2stretch]
@@ -902,6 +890,9 @@ piuparts-flags =
%(flags-end-stretch)s
distro = jessie
upgrade-test-distros = jessie stretch
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie2Xstretch]
@@ -916,6 +907,9 @@ piuparts-flags =
distro = jessie
upgrade-test-distros = jessie stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie2stretch-rcmd]
@@ -929,6 +923,9 @@ piuparts-flags =
%(flags-end-stretch)s
distro = jessie
upgrade-test-distros = jessie stretch
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie2Xstretch-rcmd]
@@ -944,6 +941,9 @@ piuparts-flags =
distro = jessie
upgrade-test-distros = jessie stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie-lts2stretch]
@@ -955,6 +955,9 @@ piuparts-flags =
%(flags-end-stretch)s
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie2bpo2stretch]
@@ -967,6 +970,9 @@ piuparts-flags =
depends-sections = jessie
distro = jessie-backports
upgrade-test-distros = jessie jessie-backports stretch
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie2bpo]
@@ -979,6 +985,9 @@ piuparts-flags =
depends-sections = jessie
distro = jessie-backports
upgrade-test-distros = jessie jessie-backports
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie]
@@ -989,6 +998,9 @@ piuparts-flags =
%(flags-start-jessie)s
%(flags-end-jessie)s
distro = jessie
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie-rcmd]
@@ -1001,6 +1013,9 @@ piuparts-flags =
%(flags-start-jessie)s
%(flags-end-jessie)s
distro = jessie
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie-security]
@@ -1012,6 +1027,9 @@ piuparts-flags =
%(flags-end-jessie)s
depends-sections = jessie
distro = jessie/updates
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie-lts]
@@ -1022,6 +1040,9 @@ piuparts-flags =
%(flags-start-jessie)s
%(flags-end-jessie)s
distro = jessie-lts
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[jessie2lts]
@@ -1033,6 +1054,9 @@ piuparts-flags =
%(flags-end-jessie)s
distro = jessie
upgrade-test-distros = jessie jessie-lts
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy2jessie-lts]
@@ -1044,6 +1068,9 @@ piuparts-flags =
%(flags-end-jessie)s
distro = wheezy
upgrade-test-distros = wheezy jessie-lts
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy2jessie]
@@ -1055,6 +1082,9 @@ piuparts-flags =
%(flags-end-jessie)s
distro = wheezy
upgrade-test-distros = wheezy jessie
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy2jessie-rcmd]
@@ -1069,6 +1099,9 @@ piuparts-flags =
-i /usr/lib/dbus-1.0/dbus-daemon-launch-helper
distro = wheezy
upgrade-test-distros = wheezy jessie
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy2bpo2jessie]
@@ -1081,6 +1114,9 @@ piuparts-flags =
depends-sections = wheezy
distro = wheezy-backports
upgrade-test-distros = wheezy wheezy-backports jessie-lts
+reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy]
@@ -1092,6 +1128,8 @@ piuparts-flags =
%(flags-end-wheezy)s
distro = wheezy
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy-lts]
@@ -1103,6 +1141,8 @@ piuparts-flags =
%(flags-end-wheezy)s
distro = wheezy-lts
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy-security]
@@ -1115,6 +1155,8 @@ piuparts-flags =
depends-sections = wheezy
distro = wheezy/updates
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[wheezy2lts]
@@ -1127,6 +1169,8 @@ piuparts-flags =
distro = wheezy
upgrade-test-distros = wheezy wheezy-lts
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[squeeze2wheezy-lts]
@@ -1139,6 +1183,8 @@ piuparts-flags =
distro = squeeze
upgrade-test-distros = squeeze wheezy-lts
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[squeeze2wheezy]
@@ -1151,6 +1197,8 @@ piuparts-flags =
distro = squeeze
upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[squeeze2bpo2wheezy]
@@ -1164,6 +1212,8 @@ depends-sections = squeeze
distro = squeeze-backports
upgrade-test-distros = squeeze squeeze-backports wheezy-lts
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[squeeze2bpo-sloppy]
@@ -1176,6 +1226,8 @@ piuparts-flags =
depends-sections = squeeze squeeze2bpo2wheezy
upgrade-test-distros = squeeze squeeze-backports-sloppy
reschedule-old-count = 0
+reschedule-fail-count = 0
+max-reserved = 0
[squeeze]
@@ -1188,6 +1240,7 @@ piuparts-flags =
distro = squeeze
reschedule-old-count = 0
reschedule-fail-count = 0
+max-reserved = 0
[squeeze2squeeze-lts]
@@ -1202,6 +1255,7 @@ distro = squeeze-lts
upgrade-test-distros = squeeze squeeze-lts
reschedule-old-count = 0
reschedule-fail-count = 0
+max-reserved = 0
[lenny2squeeze]
@@ -1215,4 +1269,4 @@ distro = lenny
upgrade-test-distros = lenny squeeze
reschedule-old-count = 0
reschedule-fail-count = 0
-
+max-reserved = 0
=====================================
piuparts-slave.py
=====================================
@@ -422,7 +422,7 @@ class Section:
basetgz = self._config["chroot-tgz"] or \
self._distro_config.get_basetgz(self._config.get_start_distro(),
self._config.get_arch(),
- merged_usr="--merged-usr" in self._config["piuparts-flags"])
+ merged_usr="--no-merged-usr" not in self._config["piuparts-flags"])
return os.path.join(self._config["basetgz-directory"], basetgz)
def _check_tarball(self):
=====================================
piuparts.py
=====================================
@@ -198,7 +198,7 @@ class Settings:
self.minimize = False
self.debfoster_options = None
self.docker_image = None
- self.merged_usr = False
+ self.merged_usr = True
# tests and checks
self.no_install_purge_test = False
self.no_upgrade_test = False
@@ -2888,10 +2888,17 @@ def parse_command_line():
"building a new one with debootstrap.")
parser.add_option("--merged-usr",
- default=False,
action='store_true',
+ dest='merged_usr',
+ default=True,
help="Create a --merged-usr chroot (if using debootstrap).")
+ parser.add_option("--no-merged-usr",
+ action='store_false',
+ dest='merged_usr',
+ default=True, # this is the default for the merged_usr dest variable, must match the one above
+ help="Create a --no-merged-usr chroot (if using debootstrap).")
+
parser.add_option("-m", "--mirror", action="append", metavar="URL",
default=[],
help="Which Debian mirror to use.")
=====================================
piupartslib/conf.py
=====================================
@@ -254,7 +254,7 @@ class DistroConfig(UserDict):
c))
return lines
- def get_basetgz(self, distro, arch, merged_usr=False):
+ def get_basetgz(self, distro, arch, merged_usr=True):
# look for the first base distribution
for d in self._expand_depends(distro):
if self.get(d, "depends"):
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/9e7cc536d85a323f4be8788a83a649e75c2cba79...e84d0e979ebc4b9998a7507ad0048769c7314070
--
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/9e7cc536d85a323f4be8788a83a649e75c2cba79...e84d0e979ebc4b9998a7507ad0048769c7314070
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/20231028/fc18311f/attachment-0001.htm>
More information about the Piuparts-devel
mailing list