Changeset 2452 for trunk/server/fedora

Timestamp:

Jul 25, 2013, 11:25:09 PM (11 years ago)

Author:

andersk

Message:

Quick Makefile cleanup: remove some unused cruft, use https

File:

• trunk/server/fedora/Makefile (modified) (4 diffs)

trunk/server/fedora/Makefile

@@ -38 +38 @@
 
 dload           = ${PWD}/.dload
-server_url      = "http://web.mit.edu/scripts/src"
-server_arch     = "fedora.stable"
-openafs_url     = "http://www.openafs.org/dl/openafs/1.6.5/openafs-1.6.5-1.src.rpm"
+openafs_url     = "https://www.openafs.org/dl/openafs/1.6.5/openafs-1.6.5-1.src.rpm"
 zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 
@@ -67 +65 @@
 download_stamp:
         mkdir -p $(dload)
-        #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
         cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
         wget -P $(dload) $(openafs_url)
         wget -P $(dload) $(zephyr_url)
-        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
+        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
         cabal update
         cabal fetch --no-dependencies $(hackage)
@@ -79 +76 @@
         touch download_stamp
 
-        cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
-        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
+        cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
+        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
         cp $(oursrcdir)/discuss/* $(tmp_src)
-%.src.rpm:
-        wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
 
 copy-patches: mkdir-tree
@@ -190 +185 @@
         fi
 
-# XXX: We need to figure out what's going on with compat-readline43
-#       rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
-#       rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
-
 fedora:
         make upstream