From 27d1bad2a58b4897f88e382c4cf3aee8aa3732b4 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Mon, 23 Oct 2023 10:38:10 +0200
Subject: [PATCH] since debootstrap 1.0.133, the buildd variant only installs
 apt and not priority:required anymore

---
 mmdebstrap                           | 6 +++---
 tests/check-against-debootstrap-dist | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mmdebstrap b/mmdebstrap
index dfa4dc9..c1a41de 100755
--- a/mmdebstrap
+++ b/mmdebstrap
@@ -2962,15 +2962,15 @@ sub run_install() {
 
     my @pkgs_to_install = (@{ $options->{include} });
     if ($options->{variant} eq 'buildd') {
-        push @pkgs_to_install, 'build-essential';
+        push @pkgs_to_install, 'build-essential', 'apt';
     }
     if (any { $_ eq $options->{variant} }
-        ('required', 'important', 'standard', 'buildd')) {
+        ('required', 'important', 'standard')) {
         # Many of the priority:required packages are also essential:yes. We
         # make sure not to select those here to avoid useless "xxx is already
         # the newest version" messages.
         my $priority;
-        if (any { $_ eq $options->{variant} } ('required', 'buildd')) {
+        if (any { $_ eq $options->{variant} } ('required')) {
             $priority = '?and(?priority(required),?not(?essential))';
         } elsif ($options->{variant} eq 'important') {
             $priority = '?and(?or(?priority(required),?priority(important)),'
diff --git a/tests/check-against-debootstrap-dist b/tests/check-against-debootstrap-dist
index c4b929f..781cc23 100644
--- a/tests/check-against-debootstrap-dist
+++ b/tests/check-against-debootstrap-dist
@@ -174,6 +174,13 @@ if [ "{{ VARIANT }}" = "-" ]; then
 	done
 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
 diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2