Browse code

Add rocket package and fix yum check failure of lvm2-devel.

Change-Id: I6497db7cd75655b5f29f7e6447ebeb09f31313b0
Reviewed-on: http://photon-jenkins.eng.vmware.com/79
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George

xiaolin-vmware authored on 2015/10/29 06:49:07
Showing 4 changed files
... ...
@@ -38,6 +38,7 @@ Group:		Development/Libraries
38 38
 License:	LGPLv2
39 39
 Requires:	%{name} = %{version}-%{release}
40 40
 Requires:	device-mapper-devel = %{version}-%{release}
41
+Requires:   util-linux-devel
41 42
 
42 43
 %description	devel
43 44
 This package contains files needed to develop applications that use
... ...
@@ -8,7 +8,7 @@
8 8
                 "gobject-introspection", "gobject-introspection-devel", "gobject-introspection-python", "procps-ng-devel", 
9 9
                 "bash-lang", "kbd", "coreutils-lang", "libxslt", "docbook-xml", "docbook-xsl", "gtk-doc", "popt-devel", "texinfo", "tar", 
10 10
                 "kubernetes", "cyrus-sasl", "openldap", "binutils", "binutils-devel", "python-iniparse", "psmisc", "etcd", "openssl-devel", 
11
-                "util-linux-lang", "db-docs", "linux-dev", "linux-docs", "mpc", "json-glib", "json-glib-devel", 
11
+                "util-linux-lang", "util-linux-devel", "db-docs", "linux-dev", "linux-docs", "mpc", "json-glib", "json-glib-devel", 
12 12
                 "automake", "libpcap", "tcpdump", "elfutils-libelf-devel", "elfutils", "elfutils-devel", "elfutils-devel-static", "elfutils-libelf-devel-static", 
13 13
                 "go", "grub2","grub2-lang", "diffutils", "groff", "man-db", "mpfr-devel", "man-pages", 
14 14
                 "hawkey-devel", "python-hawkey", "libxml2-devel", "ruby", "readline-devel", "wget",
... ...
@@ -226,8 +226,9 @@ class Installer(object):
226 226
         selected_packages = self.install_config['packages']
227 227
         for package in selected_packages:
228 228
             pattern = package + '-[0-9]*.rpm'
229
+            pattern2 = package + '-[a-z][0-9]*.rpm'
229 230
             for rpm in rpms:
230
-                if fnmatch.fnmatch(rpm['filename'], pattern):
231
+                if fnmatch.fnmatch(rpm['filename'], pattern) or fnmatch.fnmatch(rpm['filename'], pattern2):
231 232
                     rpm['package'] = package
232 233
                     self.rpms_tobeinstalled.append(rpm)
233 234
                     progressbar_num_items += rpm['size'] + rpm['size'] * self.install_factor
... ...
@@ -109,7 +109,7 @@ rm -rf ${BUILDROOT}/RPMS
109 109
 cd ${RPMS_PATH}
110 110
 mkdir ${WORKINGDIR}/RPMS
111 111
 for rpm_name in $RPM_LIST; do
112
-    FILENAME="`find . -name "$rpm_name-[0-9]*" -type f`"
112
+    FILENAME="`find . -name "$rpm_name-[0-9]*" -or -name "$rpm_name-[a-z][0-9]*" -type f`"
113 113
     if [ -n "$FILENAME" ]; then
114 114
         cp --parent $FILENAME ${WORKINGDIR}/RPMS/;
115 115
     fi