diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-25 19:33:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-25 19:33:33 +0000 |
| commit | de891825115ca65a3145b21cc2e61b9a2ad767da (patch) | |
| tree | 690548ea5591a06d8252cb0554e4dcb2cf13bd22 | |
| parent | Releasing progress-linux version 0.85.7-0.0~progress7.99u1. (diff) | |
| download | sbuild-de891825115ca65a3145b21cc2e61b9a2ad767da.tar.xz sbuild-de891825115ca65a3145b21cc2e61b9a2ad767da.zip | |
Merging upstream version 0.85.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | lib/Sbuild/ChrootUnshare.pm | 14 | ||||
| -rw-r--r-- | lib/Sbuild/Utility.pm | 12 | ||||
| -rw-r--r-- | man/sbuild-createchroot.8.in | 2 |
3 files changed, 25 insertions, 3 deletions
diff --git a/lib/Sbuild/ChrootUnshare.pm b/lib/Sbuild/ChrootUnshare.pm index c4a3064..8fb2350 100644 --- a/lib/Sbuild/ChrootUnshare.pm +++ b/lib/Sbuild/ChrootUnshare.pm @@ -288,6 +288,18 @@ sub _get_exec_argv { $init = "/usr/bin/dumb-init"; } + # Detect whether linux32 personality might be needed + my %personalities = ( + 'armel:arm64' => 1, + 'armhf:arm64' => 1, + 'i386:amd64' => 1, + 'mipsel:mips64el' => 1, + 'powerpc:ppc64' => 1, + 's390:s390x' => 1, + 'sparc:sparc64' => 1, + ); + my $linux32 = exists $personalities{($self->get_conf('BUILD_ARCH') . ':' . $self->get_conf('ARCH'))}; + my @bind_mounts = (); for my $entry (@{$self->get_conf('UNSHARE_BIND_MOUNTS')}) { push @bind_mounts, $entry->{directory}, $entry->{mountpoint}; @@ -295,7 +307,7 @@ sub _get_exec_argv { return ( 'env', 'PATH=' . $self->get_conf('PATH'), - get_unshare_cmd({UNSHARE_FLAGS => $unshare, FORK => 1, IDMAP => $self->get('Uid Gid Map')}), 'sh', '-c', " + get_unshare_cmd({UNSHARE_FLAGS => $unshare, FORK => 1, IDMAP => $self->get('Uid Gid Map'), LINUX32 => $linux32}), 'sh', '-c', " rootdir=\"\$1\"; shift; user=\"\$1\"; shift; dir=\"\$1\"; shift; diff --git a/lib/Sbuild/Utility.pm b/lib/Sbuild/Utility.pm index 5a59b28..9cdfff1 100644 --- a/lib/Sbuild/Utility.pm +++ b/lib/Sbuild/Utility.pm @@ -56,7 +56,7 @@ BEGIN { @EXPORT = qw(setup cleanup shutdown check_url download get_unshare_cmd read_subuid_subgid CLONE_NEWNS CLONE_NEWUTS CLONE_NEWIPC CLONE_NEWUSER - CLONE_NEWPID CLONE_NEWNET test_unshare get_tar_compress_options); + CLONE_NEWPID CLONE_NEWNET PER_LINUX32 test_unshare get_tar_compress_options); $SIG{'INT'} = \&shutdown; $SIG{'TERM'} = \&shutdown; @@ -379,6 +379,11 @@ use constant { CLONE_NEWNET => 0x40000000, }; +# from personality.h +use constant { + PER_LINUX32 => 0x0008, +}; + sub get_unshare_cmd($) { my $options = shift; @@ -515,6 +520,11 @@ if (\$cpid != 0) { EOF } + if ($options->{'LINUX32'}) { + my $personality = PER_LINUX32; + $command .= "syscall &SYS_personality, $personality;"; + } + $command .= 'exec { $ARGV[0] } @ARGV or die "exec() failed: $!";'; # remove code comments $command =~ s/^\s*#.*$//gm; diff --git a/man/sbuild-createchroot.8.in b/man/sbuild-createchroot.8.in index 23b4b4d..b54e4b5 100644 --- a/man/sbuild-createchroot.8.in +++ b/man/sbuild-createchroot.8.in @@ -332,7 +332,7 @@ the unshare backend: .br --make-sbuild-tarball ~/.cache/sbuild/unstable-amd64.tar.gz \\ .br - unstable `mktemp -d` http://deb.debian.org/debian/ \\ + unstable `mktemp -d` http://deb.debian.org/debian\fP\[CR] .PP .SH HISTORY sbuild\-createchroot was previously known as \fBbuildd.chroot\fP. |