diff --git a/debian/changelog b/debian/changelog index 91f17ac..d065b98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.193ubuntu1) UNRELEASED; urgency=medium + + * Set apt preferences for the -proposed pocket in mk-sbuild so that + it works as expected for lunar and forward. + + -- Steve Langasek Wed, 12 Apr 2023 09:44:22 -0700 + ubuntu-dev-tools (0.193) unstable; urgency=medium * Don't run linters at build time, or in autopkgtests. (Closes: #1031436). diff --git a/mk-sbuild b/mk-sbuild index 52e15a1..6e162b4 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -874,6 +874,13 @@ EOM fi fi if [ -z "$SKIP_PROPOSED" ]; then + TEMP_PREFERENCES=`mktemp -t preferences-XXXXXX` + cat >> "$TEMP_PREFERENCES" <> "$TEMP_SOURCES" < $MNT/etc/apt/sources.list" rm -f "$TEMP_SOURCES" +if [ -n "$TEMP_PREFERENCES" ]; then + sudo mv "TEMP_PREFERENCES" $MNT/etc/apt/preferences.d/proposed.pref +fi # Copy the timezone (comment this out if you want to leave the chroot at UTC) sudo cp -P --remove-destination /etc/localtime /etc/timezone "$MNT"/etc/