Format default config template.

- Add more comments and two tizen url to default config template.
- Remove useless config item buildconf and build_cmd

Change-Id: I0faec1b20ad1a41044f6115770fb087371f70303

diff --git a/README.rst b/README.rst
index 0336f75..b847c42 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -139,9 +139,7 @@ configuration file by yourself.  Just make sure it looks like as below:
   passwd  = <PASSWORD in plaintext> (will be updated w/ base64 encoded one)
 
   [build]
-  build_cmd = /usr/bin/build
   su-wrapper= sudo
-  distconf=/usr/share/gbs/tizen-1.0.conf
   repo1.url=
   repo1.user=
   repo1.passwd=
@@ -167,10 +165,6 @@ passwdx
 
 In the [build] section, the following values can be specified:
 
-build_cmd
-    build script path for building RPMs in a chroot environment
-distconf
-    Specify distribution configure file
 repox.url
     Specify the repo url used for gbs build
 repox.user
@@ -229,13 +223,13 @@ usage of subcommand `build` can be available using `gbs build --help`
       gbs build -R repository -A arch [options] [package git dir]
       [package git dir] is optional, if not specified, current dir would
       be used.
+
   Examples:
       gbs build -R http://example1.org/packages/ \
                 -R http://example2.org/packages/ \
                 -A i586                          \
                 -D /usr/share/gbs/tizen-1.0.conf
-  Note:
-  if -D not specified, distconf key in ~/.gbs.conf would be used.
+
   Options:
       -h, --help          show this help message and exit
       --noinit            Skip initialization of build root and start with build
@@ -261,27 +255,22 @@ Examples to run gbs build:
 
   $ gbs build -R http://example1.org/ -A i586 -D /usr/share/gbs/tizen-1.0.conf
 
-2) Use dist conf file specified in ~/.gbs.conf, if distconf key exist.
-::
-
-  $ gbs build -R http://example1.org/ -A i586
-
-3) Multi repos specified
+2) Multi repos specified
 ::
 
   $ gbs lb -R http://example1.org/  -R http://example2.org/  -A i586
 
-4) With --noinit option, Skip initialization of build root and start with build immediately
+3) With --noinit option, Skip initialization of build root and start with build immediately
 ::
 
   $ gbs build -R http://example1.org/ -A i586  --noinit
 
-5) Specify a package git directory, instead of running in git top directory
+4) Specify a package git directory, instead of running in git top directory
 ::
 
   $ gbs build -R http://example1.org/ -A i586  PackageKit
 
-6) Local repo example
+5) Local repo example
 ::
 
   $ gbs build -R /path/to/repo/dir/ -A i586

diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py
index 4ffa4ea..a65ed79 100644 (file)
--- a/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@ -188,37 +188,41 @@ class ConfigMgr(object):
                 'upstream_tag': 'upstream/${upstreamversion}',
                 'squash_patches_until': '',
             },
-            'build': {
-                'build_cmd':    '/usr/bin/build',
-                'distconf':     '/usr/share/gbs/tizen-1.0.conf',
-            },
     }
 
     DEFAULT_CONF_TEMPLATE = '''[general]
+#Current profile name which should match a profile section name
 profile = profile.tizen
-tmpdir = /var/tmp
 
 [profile.tizen]
-; common authentication info for whole profile
+#Common authentication info for whole profile
 #user =
-; CAUTION: please use the key name "passwd" to reset plaintext password
+#CAUTION: please use the key name "passwd" to reset plaintext password
 #passwd =
 obs = obs.tizen
-; comma separated list of repositories
+#Comma separated list of repositories
 repos = repo.tizen_latest
-distconf = /usr/share/gbs/tizen-1.0.conf
+#repos = repo.tizen_main, repo.tizen_base
 
 [obs.tizen]
+#OBS API URL pointing to a remote OBS.
 url = https://api.tizen.org
-; optinal user/passwd, set if differ from proflie's user/passwd
+#Optional user and password, set if differ from profile's user and password
 #user =
 #passwd =
 
 [repo.tizen_latest]
-url = http://download.tizen.org/snapshots/trunk/common/latest/
-; optinal user/passwd, set if differ from proflie's user/passwd
+#Build against repo's URL
+url = http://download.tizen.org/snapshots/trunk/common/latest
+#Optional user and password, set if differ from profile's user and password
 #user =
-#passwdx =
+#passwd =
+
+[repo.tizen_base]
+url = http://download.tizen.org/snapshots/trunk/common/latest/repos/base/ia32/packages/
+
+[repo.tizen_main]
+url = http://download.tizen.org/snapshots/trunk/common/latest/repos/main/ia32/packages/
 '''
 
     # make the manager class as singleton