Commit 9c8ed4d1 authored by NoisyCoil's avatar NoisyCoil
Browse files

Bug 41137: '--add-architecture' in containers only when actually cross-compiling 

Mainly so that the container's id, which is also determined by 'pre',
does not change if we call the project with 'linux-cross' but don't
actually need to cross-compile.
parent 08c95509

projects/container-image/config

+1 −1
Changes for projects/container-image/config: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ pre: | 
  apt-get update -y -q

  [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) -%]

    [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %]

    [% IF c("var/linux-cross") -%]

    [% IF c("var/linux-cross") && ! pc(c('origin_project'), 'var/no_crosscompile', { step => c('origin_step') }) -%]

      dpkg --add-architecture [% c("var/arch_debian") %]

    [% END -%]

    # Update the package cache again because `pre_pkginst` may change the