josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

since debootstrap 1.0.133, the buildd variant only installs apt and not priority:required anymore

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2023-10-23 10:38:10 +02:00
parent 261cfda58f
commit 27d1bad2a5
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mmdebstrap
View file

@ -2962,15 +2962,15 @@ sub run_install() {
my @pkgs_to_install = (@{ $options->{include} }); my @pkgs_to_install = (@{ $options->{include} });
if ($options->{variant} eq 'buildd') { if ($options->{variant} eq 'buildd') {
push @pkgs_to_install, 'build-essential'; push @pkgs_to_install, 'build-essential', 'apt';
} }
if (any { $_ eq $options->{variant} } if (any { $_ eq $options->{variant} }
('required', 'important', 'standard', 'buildd')) { ('required', 'important', 'standard')) {
# Many of the priority:required packages are also essential:yes. We # Many of the priority:required packages are also essential:yes. We
# make sure not to select those here to avoid useless "xxx is already # make sure not to select those here to avoid useless "xxx is already
# the newest version" messages. # the newest version" messages.
my $priority; my $priority;
if (any { $_ eq $options->{variant} } ('required', 'buildd')) { if (any { $_ eq $options->{variant} } ('required')) {
$priority = '?and(?priority(required),?not(?essential))'; $priority = '?and(?priority(required),?not(?essential))';
} elsif ($options->{variant} eq 'important') { } elsif ($options->{variant} eq 'important') {
$priority = '?and(?or(?priority(required),?priority(important)),' $priority = '?and(?or(?priority(required),?priority(important)),'

7
tests/check-against-debootstrap-dist
View file

@ -174,6 +174,13 @@ if [ "{{ VARIANT }}" = "-" ]; then
done done
fi fi
# since debootstrap 1.0.133 there is no tzdata in the buildd variant and thus
# debootstrap creates its own /etc/localtime
if [ "{{ VARIANT }}" = "buildd" ]; then
[ "$(readlink /tmp/debian-{{ DIST }}-debootstrap/etc/localtime)" = /usr/share/zoneinfo/UTC ]
rm /tmp/debian-{{ DIST }}-debootstrap/etc/localtime
fi
# check if the file content differs # check if the file content differs
diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2 diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2