From c2ef7395c10545dc72aface58c9bd15f9b0bc30e Mon Sep 17 00:00:00 2001 From: wanchao-xu Date: Mon, 22 Apr 2024 15:31:11 +0800 Subject: [PATCH] Update options of gbs devel and export commands to support git-buildpackage 0.9.29 version. Change-Id: I3c3882b2f7deb3c99340e545d031dee56fa9758c Signed-off-by: wanchao-xu --- gitbuildsys/cmd_devel.py | 1 - gitbuildsys/cmd_export.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gitbuildsys/cmd_devel.py b/gitbuildsys/cmd_devel.py index 05c119b..1a807b6 100644 --- a/gitbuildsys/cmd_devel.py +++ b/gitbuildsys/cmd_devel.py @@ -44,7 +44,6 @@ def compose_gbp_args(repo, tmp_dir, spec, args): # Compose the list of command line arguments argv = ["argv[0] placeholder", "--color-scheme=magenta:green:yellow:red", - "--vendor=Tizen", "--tmp-dir=%s" % tmp_dir, "--packaging-dir=%s" % packaging_dir, "--new-packaging-dir=%s" % packaging_dir, diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py index 37e9bd6..ee869a8 100644 --- a/gitbuildsys/cmd_export.py +++ b/gitbuildsys/cmd_export.py @@ -197,8 +197,8 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, '--git-rpmbuild-builddir=.', '--git-rpmbuild-builddir=.', '--git-rpmbuild-rpmdir=.', - '--git-rpmbuild-sourcedir=.', - '--git-rpmbuild-specdir=.', + '--git-export-sourcedir=.', + '--git-export-specdir=.', '--git-rpmbuild-srpmdir=.', '--git-rpmbuild-buildrootdir=.', '--short-circuit', '-bs', -- 2.7.4