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

always create /var/lib/dpkg/arch to make foreign architecture chrootless tarballs bit-by-bit identical

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-09-22 14:22:37 +02:00
parent c6c2baee6a
commit 3999212c48
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mmdebstrap
View file

@ -1858,18 +1858,14 @@ sub run_setup() {
close $fh; close $fh;
} }
# we create /var/lib/dpkg/arch inside the chroot either if there is more # In theory, /var/lib/dpkg/arch is only useful if there are foreign
# than the native architecture in the chroot or if chrootless mode is # architectures configured or if the architecture of a chrootless chroot
# used to create a chroot of a different architecture than the native # is different from the native architecture outside the chroot.
# architecture outside the chroot. # We nevertheless always add /var/lib/dpkg/arch to make a chroot built the
# normal way bit-by-bit identical to a foreign arch chroot built in
# chrootless mode.
chomp(my $hostarch = `dpkg --print-architecture`); chomp(my $hostarch = `dpkg --print-architecture`);
if ( if ((!-e "$options->{root}/var/lib/dpkg/arch")) {
(!-e "$options->{root}/var/lib/dpkg/arch")
and (
scalar @{ $options->{foreignarchs} } > 0
or ( $options->{mode} eq 'chrootless'
and $hostarch ne $options->{nativearch}))
) {
open my $fh, '>', "$options->{root}/var/lib/dpkg/arch" open my $fh, '>', "$options->{root}/var/lib/dpkg/arch"
or error "cannot open /var/lib/dpkg/arch: $!"; or error "cannot open /var/lib/dpkg/arch: $!";
print $fh "$options->{nativearch}\n"; print $fh "$options->{nativearch}\n";