Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 16:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mk-sbuild-not-automatic'

Browse Source
This commit is contained in:
Steve Langasek 2023-04-12 09:44:08 -07:00
commit 2e4e8b35b2
2 changed files with 17 additions and 0 deletions

7
debian/changelog vendored

@ -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 <steve.langasek@ubuntu.com> Wed, 12 Apr 2023 09:44:22 -0700
ubuntu-dev-tools (0.193) unstable; urgency=medium ubuntu-dev-tools (0.193) unstable; urgency=medium
* Don't run linters at build time, or in autopkgtests. (Closes: #1031436). * Don't run linters at build time, or in autopkgtests. (Closes: #1031436).

10
mk-sbuild

@ -874,6 +874,13 @@ EOM
fi fi
fi fi
if [ -z "$SKIP_PROPOSED" ]; then if [ -z "$SKIP_PROPOSED" ]; then
TEMP_PREFERENCES=`mktemp -t preferences-XXXXXX`
cat >> "$TEMP_PREFERENCES" <<EOM
# override for NotAutomatic: yes
Package: *
Pin: release a=*-proposed
Pin-Priority: 500
EOM
cat >> "$TEMP_SOURCES" <<EOM cat >> "$TEMP_SOURCES" <<EOM
deb ${MIRROR_ARCHS}${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS} deb ${MIRROR_ARCHS}${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}
deb-src ${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS} deb-src ${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}
@ -899,6 +906,9 @@ fi
cat "$TEMP_SOURCES" | sed -e "s|RELEASE|$RELEASE|g" | \ cat "$TEMP_SOURCES" | sed -e "s|RELEASE|$RELEASE|g" | \
sudo bash -c "cat > $MNT/etc/apt/sources.list" sudo bash -c "cat > $MNT/etc/apt/sources.list"
rm -f "$TEMP_SOURCES" 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) # 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/ sudo cp -P --remove-destination /etc/localtime /etc/timezone "$MNT"/etc/