Skip to content

Commit

Permalink
build: Make kiwi result bundling optional
Browse files Browse the repository at this point in the history
pbuild: opt-out by default to reduce build times and allow direct
usage/testing
  • Loading branch information
adrianschroeter committed Apr 19, 2021
1 parent 87c7f9b commit d906691
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions PBuild/Job.pm
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ sub createjob {
}

push @args, '--clean' unless $opts->{'noclean'};
push @args, '--skip-bundle';
push @args, '--changelog';
#push @args, '--oldpackages', $oldpkgdir if $oldpkgdir && -d $oldpkgdir;
push @args, '--dist', "$buildroot/.build.config";
Expand Down
3 changes: 3 additions & 0 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,9 @@ while test -n "$1"; do
OBSURL=$ARG
shift
;;
-skip-bundle)
BUILD_SKIP_BUNDLE=1
;;
---noarg)
cleanup_and_exit 1 "$ARG does not take an argument"
;;
Expand Down
3 changes: 2 additions & 1 deletion build-recipe-kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,9 @@ perform_image_build() {
perform_image_bundle() {
local imgtype=$1
local profile=$2
local bundle_call
test -n "$BUILD_SKIP_BUNDLE" && return 0

local bundle_call
local bundle_id="Build$RELEASE"
test -n "$profile" && bundle_id="${profile}-$bundle_id"

Expand Down

0 comments on commit d906691

Please sign in to comment.