Changeset 1622


Ignore:
Timestamp:
Sep 6, 2010, 11:41:39 PM (11 years ago)
Author:
ezyang
Message:
Preliminary updates to Makefile.  The following changes were made:

  * shadow-utils, libpng and ghostscript were descriptsified, as the
    patches we added were fixed in upstream.  In particular, see:

        http://pkgs.fedoraproject.org/gitweb/?p=shadow-utils.git;a=commit;h=e772ed6ecf59a7e90a3ecf6953676e03e00a7951
        http://pkgs.fedoraproject.org/gitweb/?p=libpng.git;a=commit;h=7698ae05180c8526550413a153933cd594dcd3e3
        http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git;a=commit;h=33c4fe6c8ba1c7dd71d84a7213a375d3530930fb

  * Fedora 12 s/i586/i686/, see http://fedoraproject.org/wiki/Features/F12X86Support#Summary

  * Mock environments updated (relevant /etc changes not committed yet)

  * Sketchy readline RPM temporarily punted; we'll need to bring it
    back later.

Location:
branches/fc13-dev/server/fedora
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev/server/fedora/Makefile

    r1621 r1622  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i586 httpd openssh shadow-utils libpng ghostscript
     21upstream_yum    = krb5 krb5.i686 httpd openssh
    2222hackage         = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
    2323upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
    2424upstream        = openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker
    25 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-wizard scripts-base scripts-static-cat
     25oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd mit-zephyr athrun php_scripts scripts-wizard scripts-base scripts-static-cat
    2626allsrc          = $(upstream) $(oursrc)
    2727oursrcdir       = ${PWD}/../common/oursrc
     
    4545pacemaker_url   = "http://kojipkgs.fedoraproject.org/packages/pacemaker/1.0.5/5.fc12/src/pacemaker-1.0.5-5.fc12.src.rpm"
    4646
    47 PKG             = $(patsubst %.i586,%,$@)
     47PKG             = $(patsubst %.i686,%,$@)
    4848
    4949.PHONY: minimal-clean
     
    140140$(oursrc): rpmbuild_args += --define 'scriptsversion $(shell svnversion ${oursrcdir}/$** | tr ':' '_' | sed -e 's/-.*/0.uncommitted/')'
    141141
    142 $(filter %.i586,$(oursrc)): %.i586: setup
     142$(filter %.i686,$(oursrc)): %.i686: setup
    143143        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    144144        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    145         /usr/bin/mock -r scripts-fc11-i386 --arch=i586 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    146 
    147 $(filter-out %.i586,$(oursrc)): %: setup
     145        /usr/bin/mock -r scripts-fc13-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     146
     147$(filter-out %.i686,$(oursrc)): %: setup
    148148        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    149149        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    150         /usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     150        /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    151151
    152152$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
    153153
    154 $(filter %.i586,$(upstream)): %.i586: setup patch-specs
    155         rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    156         /usr/bin/mock -r scripts-fc11-i386 --arch=i586 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    157 
    158 $(filter-out %.i586,$(upstream)): %: setup patch-specs
    159         rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    160         /usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     154$(filter %.i686,$(upstream)): %.i686: setup patch-specs
     155        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
     156        /usr/bin/mock -r scripts-fc13-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     157
     158$(filter-out %.i686,$(upstream)): %: setup patch-specs
     159        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
     160        /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    161161
    162162openafs-kernel: setup
    163163        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    164164        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    165         /usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     165        /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    166166
    167167#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
     
    200200
    201201# The following packages are needed for our packages
    202 basic-deps      = kernel-devel rpm-build rpmdevtools mock gcc autoconf patch krb5-workstation glibc-devel.i586 glibc-devel libtool libgcc.i586
    203 oursrc-deps     = hesinfo openldap-clients openldap-devel.i586 php-devel
     202basic-deps      = kernel-devel rpm-build rpmdevtools mock gcc autoconf patch krb5-workstation glibc-devel.i686 glibc-devel libtool libgcc.i686
     203oursrc-deps     = hesinfo openldap-clients openldap-devel.i686 php-devel
    204204httpdmods-deps  = httpd-devel
    205205httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
    206206krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex texlive-latex
    207207openafs-deps    = pam-devel automake
    208 mit-zephyr-deps = readline-devel hesiod-devel hesiod-devel.i586 hesiod.i586 libXt.i586 #compat-readline43
     208mit-zephyr-deps = readline-devel hesiod-devel hesiod-devel.i686 hesiod.i686 libXt.i686 #compat-readline43
    209209openssh-deps    = gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth pango-devel cairo-devel libedit-devel nss-devel fipscheck-devel
    210210php-deps        = bzip2-devel curl-devel gmp-devel libstdc++-devel sqlite-devel gcc-c++ libc-client-devel mysql-devel postgresql-devel unixODBC-devel libxml2-devel net-snmp-devel libxslt-devel libxml2-devel libXpm-devel libjpeg-devel t1lib-devel libmcrypt-devel mhash-devel libtidy-devel freetds-devel aspell-devel recode-devel
     
    212212install-deps:
    213213        yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps)
    214         rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
     214# XXX: We need to figure out what's going on with compat-readline43
     215#       rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
    215216#       rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
    216217
Note: See TracChangeset for help on using the changeset viewer.