remove --debuginfo and --incremental

--debuginfo useless not so remove it, we will have new design version
of incremental build

diff --git a/README.rst b/README.rst
index 8b45da9..0da4619 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -241,7 +241,6 @@ usage of subcommand `build` can be available using `gbs build --help`
   if -D not specified, distconf key in ~/.gbs.conf would be used.
   Options:
       -h, --help          show this help message and exit
-      --debuginfo         Enable build debuginfo sub-packages
       --noinit            Skip initialization of build root and start with build
                           immediately
       -C, --clean         Delete old build root before initializing it

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 8af214a..ddd23c4 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -278,8 +278,7 @@ def do(opts, args):
     except GitRepositoryError, err:
         msger.error(str(err))
 
-    if not opts.incremental:
-        utils.gitStatusChecker(repo, opts)
+    utils.gitStatusChecker(repo, opts)
     workdir = repo.path
 
     hostarch = get_hostarch()
@@ -310,8 +309,6 @@ def do(opts, args):
         cmd += ['--jobs=%s' % build_jobs]
     if opts.clean:
         cmd += ['--clean']
-    if opts.debuginfo:
-        cmd += ['--debug']
 
     if opts.noinit:
         cmd += ['--no-init']
@@ -421,11 +418,6 @@ def do(opts, args):
 
     cmd += [spec.specfile]
 
-    if opts.incremental:
-        cmd += ['--rsync-src=%s' % os.path.abspath(workdir)]
-        cmd += ['--rsync-dest=/home/abuild/rpmbuild/BUILD/%s-%s' % \
-                (spec.name, spec.version)]
-
     # if current user is root, don't run with sucmd
     if os.getuid() != 0:
         cmd = ['sudo'] + proxies + cmd

diff --git a/tools/gbs b/tools/gbs
index 5774862..5108505 100755 (executable)
--- a/tools/gbs
+++ b/tools/gbs
@@ -203,13 +203,6 @@ class Gbs(cmdln.Cmdln):
                   default=False,
                   dest='ccache',
                   help='Use ccache to speed up rebuilds')
-    @cmdln.option('-I', '--incremental',
-                  action="store_true",
-                  default=False,
-                  dest='incremental',
-                  help='Do incremental build, which needs support of spec file,'
-                       ' and tar ball unpack stage should be enabled with the '
-                       'condition of RPM macro RSYNCDONE')
     @cmdln.option('--skip-conf-repos',
                   action="store_true",
                   default=False,
@@ -238,11 +231,6 @@ class Gbs(cmdln.Cmdln):
                   default=None,
                   dest='out',
                   help='Output directory for RPMs')
-    @cmdln.option('--debuginfo',
-                  action='store_true',
-                  default=False,
-                  dest='debuginfo',
-                  help='Enable build debuginfo sub-packages')
     def do_build(self, _subcmd, opts, *args):
         """${cmd_name}: local build package