Changeset 2202 for branches/fc17-dev


Ignore:
Timestamp:
May 24, 2012, 7:50:10 PM (10 years ago)
Author:
ezyang
Message:
Merge in changes from trunk (punting php.spec)
Location:
branches/fc17-dev
Files:
8 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

  • branches/fc17-dev/server/fedora/Makefile

    r2197 r2202  
    4040server_url      = "http://web.mit.edu/scripts/src"
    4141server_arch     = "fedora.stable"
    42 openafs_url     = "http://dl.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-1.src.rpm"
     42openafs_url     = "http://dl.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-1.src.rpm"
    4343zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz"
    4444
     
    7373        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
    7474        cabal update
    75         cabal fetch $(hackage)
     75        cabal fetch --no-dependencies $(hackage)
    7676        cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
    7777        spectool -g -R $(specs)/python-zephyr.spec
  • branches/fc17-dev/server/fedora/specs/openafs.spec.patch

    r2195 r2202  
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -237,6 +237,15 @@
     12@@ -237,6 +237,11 @@
    1313 
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1515 
    1616+Patch1000: openafs-scripts.patch
    17 +Patch1001: openafs-systemd.patch
     17+Patch1001: openafs-systemd-remote-fs.patch
    1818+Patch1002: openafs-systemd-crond.patch
    1919+Patch1003: openafs-systemd-csdb.patch
    20 +Patch1004: openafs-linux-3.1-rcu.patch
    21 +Patch1005: openafs-linux-3.1-fsync.patch
    22 +Patch1006: openafs-linux-3.1-zalloc.patch
    23 +Patch1007: openafs-linux-3.2-nlink.patch
    2420+
    2521 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
     
    8379 %else
    8480 
    85 @@ -671,6 +686,16 @@
     81@@ -671,6 +686,12 @@
    8682 #%setup -q -n %{srcdir}
    8783 %setup -q -b 1 -n %{srcdir}
     
    8985+# Apply the Scripts patch
    9086+%patch1000 -p1 -b .scripts
    91 +%patch1001 -p1 -b .systemd
     87+%patch1001 -p1 -b .systemd-remote-fs
    9288+%patch1002 -p1 -b .systemd-crond
    9389+%patch1003 -p1 -b .systemd-csdb
    94 +%patch1004 -p1 -b .rcu
    95 +%patch1005 -p1 -b .fsync
    96 +%patch1006 -p1 -b .zalloc
    97 +%patch1007 -p1 -b .nlink
    9890+
    9991 ##############################################################################
Note: See TracChangeset for help on using the changeset viewer.