From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Fri, 31 May 2013 08:45:52 +0000 (+0800)
Subject: put build conf file under repodata directory
X-Git-Tag: 0.14~118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5482f819a0b5be7adf0bfbadf102fdd46b9a5038;p=services%2Fjenkins-scripts.git

put build conf file under repodata directory

Change-Id: I77444c09559eb244e200db5f74bd53e132df1580
---

diff --git a/common/repomaker.py b/common/repomaker.py
index 24e2fac..79fd301 100644
--- a/common/repomaker.py
+++ b/common/repomaker.py
@@ -163,14 +163,8 @@ class RepoMaker(object):
             if is_imageconf:
                 self.load_imagedata(fpath)
 
-        # Save build configuration file if provided
-        if buildconf:
-            confpath = os.path.join(repo_dir, "%s-build.conf" % name)
-            with open(confpath, 'w') as conf:
-                conf.write(buildconf)
-
         # Generate or update build.xml
-        self.update_builddata(name, dirs, buildconf)
+        self.update_builddata(name, dirs)
 
         # Run createrepo
         for _rtype, _rarch, rpath in dirs:
@@ -182,6 +176,15 @@ class RepoMaker(object):
                     os.system('modifyrepo %s %s' % (metafile,
                               os.path.join(rpath, "repodata")))
 
+            # update build configuration file to repodata
+            if buildconf:
+                confpath = os.path.join(rpath, "repodata",
+                                           'build.conf')
+                with open(confpath, 'w') as conf:
+                    conf.write(buildconf)
+                os.system('modifyrepo %s %s' % (confpath,
+                          os.path.join(rpath, "repodata")))
+
         # sign if gpg_key is provided
         if gpg_key and os.path.exists(signer) and os.access(signer, os.X_OK):
             for _rtype, _rarch, rpath in dirs: