From 62a1653f228f87f9630c78c68f7d2c987d4d5e62 Mon Sep 17 00:00:00 2001 From: Rong Jinhui Date: Thu, 10 Sep 2015 10:49:32 +0800 Subject: [PATCH] fix CentOS 7 require 1.add fail fast option 2.fix CentOS 7 require Change-Id: Ieefcd8c748fe6a7708ade54f5d1c06dd0fa39504 Conflicts: depanneur --- depanneur | 4 ++-- packaging/depanneur.spec | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/depanneur b/depanneur index a5f5d60..0567a31 100755 --- a/depanneur +++ b/depanneur @@ -87,7 +87,7 @@ my $includeall = 0; # build all content of including uncommitted and # untracked files my $upstream_branch = ""; # upstream branch name my $upstream_tag = ""; # upstream tag name used for generate tar ball -my $fallback_to_native = 0; # fallback to native packaging mode if export fails +my $fallback_to_native = 0; # fallback to native packaging mode if export fails my $squash_patches_until = ""; # Commit_ID used for generate one patch my $no_patch_export = 0; # don't generate patches if it's 1 my $packaging_dir = "packaging";# packaging dir @@ -1514,7 +1514,7 @@ sub worker_thread { info("build failed, exit..."); $TERM = 1; } - } + } debug("*** build $name exit with status($status), is dirty:$dirty, (worker: $thread) ***"); return $status; diff --git a/packaging/depanneur.spec b/packaging/depanneur.spec index 01b414d..dc15aa5 100644 --- a/packaging/depanneur.spec +++ b/packaging/depanneur.spec @@ -11,7 +11,11 @@ Requires: perl(YAML) Requires: perl(JSON) Requires: perl(HTML::Template) Requires: tizen-build >= 20140612 +%if 0%{?centos_ver} == 7 + +%else Requires: tizen-build-initvm-i586 >= 20140612 +%endif %ifarch x86_64 Requires: tizen-build-initvm-x86_64 >= 20140612 %endif -- 2.34.1