Changeset 353 for server/fedora


Ignore:
Timestamp:
Jul 2, 2007, 7:05:48 PM (15 years ago)
Author:
jbarnold
Message:
updated Makefile to follow conventional Fedora build process more closely
some packages were not building under FC7 using the old way
File:
1 edited

Legend:

Unmodified
Added
Removed
  • server/fedora/Makefile

    r352 r353  
    2727specs           = ${PWD}/specs
    2828
    29 topdir          = ${PWD}/.tmp
    30 tmp_build       = ${PWD}/.tmp/BUILD
    31 tmp_specs       = ${PWD}/.tmp/SPECS
    32 tmp_src         = ${PWD}/.tmp/SOURCES
    33 out_rpms        = ${PWD}/RPMS
    34 out_srpms       = ${PWD}/SRPMS
    35 tree            = $(topdir) $(tmp_build) $(tmp_specs) $(tmp_src) $(out_rpms) $(out_srpms)
    36 out_sbin        = ${PWD}/sbin
     29topdir          = ${HOME}/rpmbuild
     30tmp_build       = $(topdir)/BUILD
     31tmp_specs       = $(topdir)/SPECS
     32tmp_src         = $(topdir)/SOURCES
     33out_rpms        = $(topdir)/RPMS
     34out_srpms       = $(topdir)/SRPMS
     35out_sbin        = $(topdir)/sbin
    3736
    3837dload           = ${PWD}/.dload
     
    4039server_arch     = "fedora.stable"
    4140
    42 rpm_args        = -E '%define _smp_mflags -j4' -E '%define _topdir $(topdir)' -E '%define _rpmdir $(out_rpms)' -E '%define _srcrpmdir $(out_srpms)'
    4341openafs_rpm_args = -E "%define kernvers $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)"
    4442
     
    5755
    5856mkdir-tree:
    59         @mkdir -p $(tree);
     57        @rpmdev-setuptree; \
     58        mkdir -p $(out_sbin); \
     59        ln -s $(topdir) rpmbuild;
    6060
    6161download:
     
    118118$(allsrc): setup
    119119        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    120         rpmbuild $(rpm_args) -ba ${tmp_specs}/$@*.spec
     120        rpmbuild -ba ${tmp_specs}/$@*.spec
    121121
    122122openafs-kernel: setup
    123123        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    124         rpmbuild $(rpm_args) $(openafs_rpm_args) -bb --define "build_userspace 0" --define "build_modules 1" ${tmp_specs}/openafs*.spec
     124        rpmbuild $(openafs_rpm_args) -bb --define "build_userspace 0" --define "build_modules 1" ${tmp_specs}/openafs*.spec
    125125
    126126suexec: install-srpms
     
    158158# mit-zephyr: readline-devel hesiod.i386 libXt.i386 compat-readline43
    159159install-deps:
    160         yum -y install kernel-devel rpm-build gcc autoconf patch krb5-workstation hesinfo httpd-devel xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel bison ncurses-devel texinfo keyutils-libs-devel pam-devel automake readline-devel hesiod.i386 libXt.i386
     160        yum -y install kernel-devel rpm-build rpmdevtools gcc autoconf patch krb5-workstation hesinfo httpd-devel xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel bison ncurses-devel texinfo keyutils-libs-devel pam-devel automake readline-devel hesiod.i386 libXt.i386
    161161        rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
Note: See TracChangeset for help on using the changeset viewer.