Changeset 796

Timestamp:

Aug 6, 2008, 4:53:24 AM (15 years ago)

Author:

geofft

Message:

oh hai, i fixed ur maekfile

Location:

server

Files:

• doc/install-howto (modified) (1 diff)
• fedora/Makefile (modified) (7 diffs)
• fedora/meta-patches (deleted)

server/doc/install-howto

@@ -9 +9 @@
 
 * Create a scripts-build account, and set up rpm to build in $HOME.
-  Or you can just use the default setup, which will generate packages
+  If you just use the default setup, it will generate packages
   in /usr/src/redhat.
 
 * Use the Makefile to build the scripts.mit.edu-specific Fedora
   packages.
+  - export PATH=$PATH:/usr/sbin
   - make download
   - make setup
   - make all
   - openafs-devel is a build-dependency of accountadm, so you'll need to
-    install it by hand.
+    install it by hand when that fails.
   Then install all the packages as root.
+
+* Rebuild mit-zephyr on a 32-bit machine, like the one at Joe's home.
 
 * Run "make suexec" and "make suexec-install" to overwrite

server/fedora/Makefile

@@ -19 +19 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream        = openafs krb5 httpd openssh
+upstream_yum    = krb5 httpd openssh
+upstream        = openafs $(upstream_yum)
 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd mit-zephyr 
 allsrc          = $(upstream) $(oursrc)
 oursrcdir       = ${PWD}/../common/oursrc
 patches         = ${PWD}/../common/patches
-metapatches     = ${PWD}/meta-patches
 specs           = ${PWD}/specs
 
@@ -38 +38 @@
 server_url      = "http://web.mit.edu/scripts/src"
 server_arch     = "fedora.stable"
+openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.7/openafs-1.4.7-1.1.1.src.rpm"
 
 .PHONY: minimal-clean
@@ -57 +58 @@
         ln -sTf $(topdir) rpmbuild
 
-download:
+download: download_stamp
+download_stamp:
         @mkdir -p $(dload); \
-        wget -qO- -nv $(server_url)/$(server_arch) | xargs make
+        #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
+        cd $(dload) && yumdownloader --source $(upstream_yum)
+        wget -P $(dload) $(openafs_url)
+        touch download_stamp
 
 %.src.rpm:
@@ -66 +71 @@
 copy-patches: mkdir-tree
         @cp $(patches)/*.patch $(tmp_src); \
-        cd $(tmp_src); \
-        list=`ls $(metapatches)/*.patch`; \
-        for i in $$list; do \
-                patch < $$i; \
-        done;
+        cd $(tmp_src);
 
 install-srpms: mkdir-tree download
@@ -121 +122 @@
 
 $(upstream):
-        rpmbuild $(rpmbuild_args) --rebuild $(dload)/$@*.src.rpm
+        rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$@.spec
 
 openafs-kernel: setup
@@ -127 +128 @@
         rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/openafs*.spec
 
-kernvers = $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)
+#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
+#kernvers = $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)
+kernvers = $(shell uname -r | sed "s/\(.*\)[.].*/\1/")
 kvariants = ''
 openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)" --nodeps
@@ -163 +166 @@
 httpdmods-deps  = httpd-devel
 httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
-krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel
+krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex
 openafs-deps    = pam-devel automake
 mit-zephyr-deps = readline-devel hesiod-devel hesiod-devel.i386 hesiod.i386 libXt.i386 #compat-readline43