Changeset 12486

Timestamp:

11/12/10 01:11:31 (18 months ago)

Author:

build

Message:

Get the architecture right in all cases. Specify nomd5 so we can use srpms from Fedora 11 and up. This allows us to build python-sqlalchemy and pytz from srpms

Location:

packaging/centuryegg

Files:

• build-expat-rpm (modified) (2 diffs)
• build-libxml-rpm (modified) (2 diffs)
• find-srpms (modified) (1 diff)
• install-python-rpm (modified) (1 diff)
• makeall (modified) (2 diffs)

packaging/centuryegg/build-expat-rpm

@@ -3 +3 @@
 EXPAT_MAJOR_VERSION=$(echo $EXPAT_VERSION | cut -d "-" -f 1)
 mkdir -p logs rpms srpms
-if [ -f rpms/expat-$EXPAT_VERSION.i386.rpm ]
+rpm_arch=`rpmbuild -E %{_arch} 2>/dev/null`
+if [ -f rpms/expat-$EXPAT_VERSION.${rpm_arch}.rpm ]
 then
-    echo "Not building expat as rpms/expat-$EXPAT_VERSION.i386.rpm already exists"
+    echo "Not building expat as rpms/expat-$EXPAT_VERSION.${rpm_arch}.rpm already exists"
     exit
 fi
@@ -22 +23 @@
 cd srpms
 wget -c http://mirror.centos.org/centos/5/os/SRPMS/expat-$EXPAT_VERSION.src.rpm
-rpm -ivh expat-$EXPAT_MAJOR_VERSION*.src.rpm
+rpm -ivh --nomd5 expat-$EXPAT_MAJOR_VERSION*.src.rpm
 )
 # add to changelog
 src_rpm=`rpmbuild -bs --nodeps $HOME/rpmbuild/SPECS/expat.spec | sed 's/^Wrote: //'`
-rpm_arch=`rpmbuild -E %{_arch} 2>/dev/null`
 sudo cp -pv /etc/yum.conf{,.builddep.orig}
 sudo python -c "import ConfigParser ; cp = ConfigParser.RawConfigParser() ; cp.read('/etc/yum.conf') ; cp.set('main', 'assumeyes', '1') ; cp.write(open('/etc/yum.conf', 'w'))"

packaging/centuryegg/build-libxml-rpm

@@ -3 +3 @@
 LIBXML_MAJOR_VERSION=$(echo $LIBXML_VERSION | cut -d "-" -f 1)
 mkdir -p logs rpms srpms
-if [ -f rpms/libxml2-$LIBXML_VERSION.i386.rpm ]
+rpm_arch=`rpmbuild -E %{_arch} 2>/dev/null`
+if [ -f rpms/libxml2-$LIBXML_VERSION.${rpm_arch}.rpm ]
 then
-    echo "Not building libxml2 as rpms/libxml2-$LIBXML_VERSION.i386.rpm already exists"
+    echo "Not building libxml2 as rpms/libxml2-$LIBXML_VERSION.${rpm_arch}.rpm already exists"
     exit
 fi
@@ -22 +23 @@
 cd srpms
 wget -c http://mirror.centos.org/centos/5/os/SRPMS/libxml2-$LIBXML_VERSION.src.rpm
-rpm -ivh libxml2-$LIBXML_MAJOR_VERSION*.src.rpm
+rpm -ivh --nomd5 libxml2-$LIBXML_MAJOR_VERSION*.src.rpm
 )
 # add to changelog
 src_rpm=`rpmbuild -bs --nodeps $HOME/rpmbuild/SPECS/libxml2.spec | sed 's/^Wrote: //'`
-rpm_arch=`rpmbuild -E %{_arch} 2>/dev/null`
 sudo cp -pv /etc/yum.conf{,.builddep.orig}
 sudo python -c "import ConfigParser ; cp = ConfigParser.RawConfigParser() ; cp.read('/etc/yum.conf') ; cp.set('main', 'assumeyes', '1') ; cp.write(open('/etc/yum.conf', 'w'))"

packaging/centuryegg/find-srpms

@@ -209 +209 @@
         continue
     src_rpm = src_rpm_files[-1]
-    subprocess.call(["rpm", "-ivh", src_rpm])
+    subprocess.call(["rpm", "-ivh", "--nomd5", src_rpm])
     specfile_name = os.path.join(rpmbuild_dir, "SPECS", "%s.spec" % (p,))
     if not os.path.exists(specfile_name):

packaging/centuryegg/install-python-rpm

@@ -22 +22 @@
 # this will build setuptools by side-effect; we simply ignore and rebuild it
 ./find-srpms python-setuptools
-rpm -ivh $HOME/Packaging/centuryegg/srpms/python-setuptools*.src.rpm
+rpm -ivh --nomd5 $HOME/Packaging/centuryegg/srpms/python-setuptools*.src.rpm
 sed -ie 's/^\(Version: *\)[0-9].*/\10.6c9/g' $HOME/rpmbuild/SPECS/python-setuptools.spec
 sed -ie 's/^\(Name: *\)python-\([a-z0-9]*\)/\1python$PYTHON_SUFFIX-\2/g' $HOME/rpmbuild/SPECS/python-setuptools.spec

packaging/centuryegg/makeall

@@ -40 +40 @@
     sudo yum install -y python-setuptools-devel
 fi
-./build-rpms decorator Genshi Routes ZSI xlwt html5lib multiprocessing soaplib "pyparsing==1.5.1" "CherryPy>=3.0" SQLAlchemy pytz || exit
+./build-rpms decorator Genshi Routes ZSI xlwt html5lib multiprocessing soaplib "pyparsing==1.5.1" "CherryPy>=3.0" || exit
 if [ "x`rpm -qa Routes`" == "x" ]
 then
@@ -78 +78 @@
 ./find-srpms "python-ldap>=2.3" || exit
 ./find-srpms "python-xlrd>=0.6" || exit
-./find-srpms python-imaging python-simplejson MySQL-python numpy python-pgsql protobuf python-lxml python-crypto python-suds python-dateutil || exit
+./find-srpms python-imaging python-simplejson MySQL-python numpy python-pgsql protobuf python-lxml python-crypto python-suds python-dateutil "python-sqlalchemy>=0.6" "pytz>=2010" || exit
 ./find-srpms PyXML || exit 1
 # j5 build requires lxml, dateutil and pytz