1. photon
  2. Commit fe74719658ef7e96714d9dc3dcfe3ea652fbf711
Browse code

Fixing glibc locale typo, adding missing packages in packages_full.json and fixing package builder logic to not to build packages if they already built Please enter the commit message for your changes. Lines starting

dthaluru authored on 2015/07/29 05:43:29
Showing 4 changed files
SPECS/glibc/glibc.spec
History View file @ fe74719
... ... 
@@ -91,8 +91,8 @@ install -vdm 755 %{buildroot}/var/cache/nscd
91 91 
 install -vdm 755 %{buildroot}%{_libdir}/locale
92 92 
 cp -v ../%{name}-%{version}/nscd/nscd.conf %{buildroot}%{_sysconfdir}/nscd.conf
93 93 
 #	Install locale generation script and config file
94 
-cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}
95 
-cp -v %{SOURCE2} %{buildroot}/sbin
94 
+cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}
95 
+cp -v %{SOURCE1} %{buildroot}/sbin
96 96 
 #	Remove unwanted cruft
97 97 
 rm -rf %{buildroot}%{_infodir}
98 98 
 #	Install configuration files
common/data/packages_full.json
History View file @ fe74719
... ... 
@@ -24,7 +24,7 @@
24 24 
                 "rpm-devel","pycurl","urlgrabber","yum-metadata-parser","yum", "rocket", "strace", "cracklib-python",
25 25 
                 "haveged", "haveged-devel", "vim-extra",
26 26 
                 "postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch", "eventlog", "syslog-ng", "syslog-ng-devel", "zookeeper", "fuse", "fleet",
27 
-                "nss-altfiles", "apache-maven", "subversion", "mesos", "python3", "python3-libs", "python3-devel", "python3-tools", "fakeroot-ng", "ctags"]
27 
+                "nss-altfiles", "apache-maven", "subversion", "mesos", "python3", "python3-libs", "python3-devel", "python3-tools", "fakeroot-ng", "ctags", "libtirpc","libtirpc-devel","lsof"]
28 28 
 }
29 29
30 30
installer/mk-finalize-system.sh
History View file @ fe74719
... ... 
@@ -24,5 +24,5 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name
24 24 
 /usr/sbin/pwconv
25 25 
 /usr/sbin/grpconv
26 26 
 /bin/systemd-machine-id-setup
27 
-/sbin/locale-gen.sh
27 
+#/sbin/locale-gen.sh
28 28 
 exit 0
support/package-builder/PackageManager.py
History View file @ fe74719
... ... 
@@ -26,7 +26,6 @@ class PackageManager(object):
26 26 
         self.mapOutputThread={}
27 27 
         self.mapThreadsLaunchTime={}
28 28 
         self.listAvailableCyclicPackages=[]
29 
-        self.listPackagesToBuild=[]
30 29
31 30 
     def readPackageBuildData(self, listPackages):
32 31 
         try:
... ... 
@@ -71,21 +70,16 @@ class PackageManager(object):
71 71 
         self.mapCyclesToPackageList.clear()
72 72 
         self.mapPackageToCycle.clear()
73 73 
         self.sortedPackageList=[]
74 
-        self.listPackagesToBuild=[]
75 
-
76 
-        if not self.readPackageBuildData(listPackages):
77 
-            return False
78 74
79 75 
         self.listOfPackagesAlreadyBuilt = self.readAlreadyAvailablePackages()
80 76
81 
-        self.listPackagesToBuild=self.sortedPackageList[:]
82 
-        for pkg in self.sortedPackageList:
77 
+        listPackagesToBuild=listPackages[:]
78 
+        for pkg in listPackages:
83 79 
             if pkg in self.listOfPackagesAlreadyBuilt:
84 
-                self.listPackagesToBuild.remove(pkg)
85 
-
86 
-        self.logger.info(self.listPackagesToBuild)
87 
-        self.logger.info(listPackages)
80 
+                listPackagesToBuild.remove(pkg)
88 81
82 
+        if not self.readPackageBuildData(listPackagesToBuild):
83 
+            return False
89 84 
         return True
90 85
91 86 
     def buildToolChain(self):