Skip to content

Commit

Permalink
Ignore imageonly repos in kiwi image builds
Browse files Browse the repository at this point in the history
Those define the repos that are configured in the image, but they
are not used for building the image.
  • Loading branch information
mlschroe committed Jun 28, 2017
1 parent 0f2bc07 commit 91c070a
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Build/Kiwi.pm
Expand Up @@ -101,7 +101,10 @@ sub kiwiparse {
# for kiwi 3.8 and before
push @types, $type->{'_content'};
}
# save containerconfig so that we can retrievethe tag
$containerconfig = $type->{'containerconfig'}->[0] if $type->{'containerconfig'};

# add derived container dependency
if ($type->{'derived_from'}) {
my $derived = $type->{'derived_from'};
my ($name, $prp);
Expand All @@ -125,6 +128,7 @@ sub kiwiparse {
push @packages, "container:$name";
push @containerrepos, $prp if $prp;
}

push @packages, "kiwi-filesystem:$type->{'filesystem'}" if $type->{'filesystem'};
if (defined $type->{'boot'}) {
if ($type->{'boot'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/) {
Expand Down Expand Up @@ -198,6 +202,8 @@ sub kiwiparse {
my %repoprio;
for my $repository (@repositories) {
my $kiwisource = ($repository->{'source'} || [])->[0];
next unless $kiwisource; # huh?
next if $repository->{'imageonly'};
next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr
if ($kiwisource->{'path'} eq 'obsrepositories:/') {
push @repos, '_obsrepositories/';
Expand Down

0 comments on commit 91c070a

Please sign in to comment.