anaconda-libdir.patch

   1 --- anaconda/Makefile.inc.org   2007-02-20 21:29:51.230623000 +0100
   2 +++ anaconda/Makefile.inc       2007-02-20 21:30:25.302623000 +0100
   3 @@ -1,8 +1,8 @@
   4  #
   5  # define destination locations
   6  #
   7 -PYTHONLIBDIR = /usr/lib/anaconda
   8 -RUNTIMEDIR = /usr/lib/anaconda-runtime
   9 +PYTHONLIBDIR = /usr/$(LIBDIR)/anaconda
  10 +RUNTIMEDIR = /usr/$(LIBDIR)/anaconda-runtime
  11  ANACONDADATADIR = /usr/share/anaconda
  12  PYVER  := $(shell python -c 'import sys; print sys.version[0:3]')
  13  PYTHON = python$(PYVER)
  14 diff -ur anaconda-11.2.0.24/anaconda anaconda-11.2.0.24/anaconda
  15 --- anaconda-11.2.0.24/anaconda 2007-02-01 23:55:38.000000000 +0100
  16 +++ anaconda-11.2.0.24/anaconda 2007-02-20 18:15:06.726623000 +0100
  17 @@ -147,17 +142,7 @@
  18                            "/tmp/updates/%s/%s" %(pypkg, f))
  19
  20         # get the libdir.  *sigh*
  21 -       if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
  22 -                    os.X_OK):
  23 -           libdir = "lib64"
  24 -        elif os.access("/usr/lib/python%s/site-packages/%s" %(pyver, pypkg),
  25 -                       os.X_OK):
  26 -           libdir = "lib"
  27 -       else:
  28 -            # If the directory doesn't exist, there's nothing to link over.
  29 -            # This happens if we forgot to include one of the above packages
  30 -            # in the image, for instance.
  31 -            continue
  32 +       libdir = sys.lib
  33
  34         if os.access("/tmp/updates/%s" %(pypkg,), os.X_OK):
  35             for f in os.listdir("/usr/%s/python%s/site-packages/%s" %(libdir,
  36 @@ -303,15 +288,15 @@
  37          sys.path.append('textw')
  38          sys.path.append('iw')
  39      else:
  40 -        sys.path.append('/usr/lib/anaconda')
  41 -        sys.path.append('/usr/lib/anaconda/textw')
  42 -        sys.path.append('/usr/lib/anaconda/iw')
  43 +        sys.path.append('/usr/%s/anaconda' % sys.lib)
  44 +        sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
  45 +        sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
  46
  47      if (os.path.exists('booty')):
  48          sys.path.append('booty')
  49          sys.path.append('booty/edd')
  50      else:
  51 -        sys.path.append('/usr/lib/booty')
  52 +        sys.path.append('/usr/%s/booty' % sys.lib)
  53
  54      sys.path.append('/usr/share/system-config-date')
  55
  56 @@ -390,7 +375,7 @@
  57      if child == 0:
  58          for p in ('/mnt/source/RHupdates/pyrc.py', \
  59                  '/tmp/updates/pyrc.py', \
  60 -                '/usr/lib/anaconda-runtime/pyrc.py'):
  61 +                '/usr/%s/anaconda-runtime/pyrc.py' % sys.lib):
  62              if os.access(p, os.R_OK|os.X_OK):
  63                  os.environ['PYTHONSTARTUP'] = p
  64                  break
  65 diff -ur anaconda-11.2.0.24/command-stubs/list-harddrives-stub anaconda-11.2.0.24/command-stubs/list-harddrives-stub
  66 --- anaconda-11.2.0.24/command-stubs/list-harddrives-stub       2006-06-22 19:18:11.000000000 +0200
  67 +++ anaconda-11.2.0.24/command-stubs/list-harddrives-stub       2007-02-20 18:19:21.454623000 +0100
  68 @@ -10,7 +10,7 @@
  69  if (os.path.exists('isys')):
  70      sys.path.append('isys')
  71
  72 -sys.path.append('/usr/lib/anaconda')
  73 +sys.path.append('/usr/%s/anaconda' % sys.lib)
  74
  75  import anaconda_log
  76  import parted
  77 diff -ur anaconda-11.2.0.24/command-stubs/loadkeys-stub anaconda-11.2.0.24/command-stubs/loadkeys-stub
  78 --- anaconda-11.2.0.24/command-stubs/loadkeys-stub      2004-05-11 23:52:00.000000000 +0200
  79 +++ anaconda-11.2.0.24/command-stubs/loadkeys-stub      2007-02-20 18:18:48.482623000 +0100
  80 @@ -7,7 +7,7 @@
  81  if (os.path.exists('isys')):
  82      sys.path.append('isys')
  83
  84 -sys.path.append('/usr/lib/anaconda')
  85 +sys.path.append('/usr/%s/anaconda' % sys.lib)
  86
  87  import isys
  88
  89 diff -ur anaconda-11.2.0.24/command-stubs/losetup-stub anaconda-11.2.0.24/command-stubs/losetup-stub
  90 --- anaconda-11.2.0.24/command-stubs/losetup-stub       2001-02-20 20:48:12.000000000 +0100
  91 +++ anaconda-11.2.0.24/command-stubs/losetup-stub       2007-02-20 18:19:53.858623000 +0100
  92 @@ -7,7 +7,7 @@
  93  if (os.path.exists('isys')):
  94      sys.path.append('isys')
  95
  96 -sys.path.append('/usr/lib/anaconda')
  97 +sys.path.append('/usr/%s/anaconda' % sys.lib)
  98
  99  import isys
 100  from sys import argv
 101 diff -ur anaconda-11.2.0.24/command-stubs/mknod-stub anaconda-11.2.0.24/command-stubs/mknod-stub
 102 --- anaconda-11.2.0.24/command-stubs/mknod-stub 2006-07-31 22:40:00.000000000 +0200
 103 +++ anaconda-11.2.0.24/command-stubs/mknod-stub 2007-02-20 18:20:05.686623000 +0100
 104 @@ -1,7 +1,7 @@
 105  #!/usr/bin/python
 106
 107  import sys, os
 108 -sys.path.append('/usr/lib/anaconda')
 109 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 110  import isys
 111  import string
 112  import stat
 113 diff -ur anaconda-11.2.0.24/command-stubs/pump-stub anaconda-11.2.0.24/command-stubs/pump-stub
 114 --- anaconda-11.2.0.24/command-stubs/pump-stub  2004-01-23 05:01:21.000000000 +0100
 115 +++ anaconda-11.2.0.24/command-stubs/pump-stub  2007-02-20 18:19:06.622623000 +0100
 116 @@ -7,7 +7,7 @@
 117  if (os.path.exists('isys')):
 118      sys.path.append('isys')
 119
 120 -sys.path.append('/usr/lib/anaconda')
 121 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 122
 123  import isys
 124  from sys import argv
 125 diff -ur anaconda-11.2.0.24/command-stubs/raidstart-stub anaconda-11.2.0.24/command-stubs/raidstart-stub
 126 --- anaconda-11.2.0.24/command-stubs/raidstart-stub     2006-03-28 18:49:14.000000000 +0200
 127 +++ anaconda-11.2.0.24/command-stubs/raidstart-stub     2007-02-20 18:19:36.002623000 +0100
 128 @@ -12,7 +12,7 @@
 129      sys.path.append('gnome-map')
 130      sys.path.append('isys')
 131
 132 -sys.path.append('/usr/lib/anaconda')
 133 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 134
 135  import anaconda_log
 136  import fsset
 137 diff -ur anaconda-11.2.0.24/command-stubs/raidstop-stub anaconda-11.2.0.24/command-stubs/raidstop-stub
 138 --- anaconda-11.2.0.24/command-stubs/raidstop-stub      2006-03-28 18:49:14.000000000 +0200
 139 +++ anaconda-11.2.0.24/command-stubs/raidstop-stub      2007-02-20 18:20:21.294623000 +0100
 140 @@ -12,7 +12,7 @@
 141      sys.path.append('gnome-map')
 142      sys.path.append('isys')
 143
 144 -sys.path.append('/usr/lib/anaconda')
 145 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 146
 147  import anaconda_log
 148  import fsset
 149 diff -ur anaconda-11.2.0.24/command-stubs/syslogd-stub anaconda-11.2.0.24/command-stubs/syslogd-stub
 150 --- anaconda-11.2.0.24/command-stubs/syslogd-stub       2006-05-01 18:39:15.000000000 +0200
 151 +++ anaconda-11.2.0.24/command-stubs/syslogd-stub       2007-02-20 18:20:40.322623000 +0100
 152 @@ -1,7 +1,7 @@
 153  #!/usr/bin/python
 154
 155  import sys
 156 -sys.path.append('/usr/lib/anaconda')
 157 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 158
 159  def usage():
 160      sys.stderr.write("syslogd [root] [output file]")
 161 diff -ur anaconda-11.2.0.24/installclass.py anaconda-11.2.0.24/installclass.py
 162 --- anaconda-11.2.0.24/installclass.py  2007-02-06 17:14:43.000000000 +0100
 163 +++ anaconda-11.2.0.24/installclass.py  2007-02-20 18:09:46.158623000 +0100
 164 @@ -485,7 +485,7 @@
 165      elif os.access("/tmp/product/installclasses", os.R_OK):
 166          path = "/tmp/product/installclasses"
 167      else:
 168 -       path = "/usr/lib/anaconda/installclasses"
 169 +       path = "/usr/%s/anaconda/installclasses" % sys.lib
 170
 171      # append the location of installclasses to the python path so we
 172      # can import them
 173 diff -ur anaconda-11.2.0.24/language.py anaconda-11.2.0.24/language.py
 174 --- anaconda-11.2.0.24/language.py      2006-10-10 19:18:09.000000000 +0200
 175 +++ anaconda-11.2.0.24/language.py      2007-02-20 18:09:46.158623000 +0100
 176 @@ -21,6 +21,7 @@
 177  from rhpl.simpleconfig import SimpleConfigFile
 178
 179  import logging
 180 +import sys
 181  log = logging.getLogger("anaconda")
 182
 183  # Converts a single language into a "language search path". For example,
 184 @@ -57,7 +58,7 @@
 185              self.current = "en_US.UTF-8"
 186
 187          # English name -> native name mapping
 188 -        search = ('lang-names', '/usr/lib/anaconda/lang-names')
 189 +        search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib))
 190          for path in search:
 191              if os.access(path, os.R_OK):
 192                  f = open(path, 'r')
 193 @@ -72,7 +73,7 @@
 194          # nick -> (name, short name, font, keyboard, timezone) mapping
 195          search = ('lang-table', '/tmp/updates/lang-table',
 196                    '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
 197 -                  '/usr/lib/anaconda/lang-table')
 198 +                  '/usr/%s/anaconda/lang-table' % sys.lib)
 199          for path in search:
 200              if os.access(path, os.R_OK):
 201                  f = open(path, "r")
 202 diff -ur anaconda-11.2.0.24/loader2/loader.c anaconda-11.2.0.24/loader2/loader.c
 203 --- anaconda-11.2.0.24/loader2/loader.c 2007-02-13 17:52:22.000000000 +0100
 204 +++ anaconda-11.2.0.24/loader2/loader.c 2007-02-20 18:17:47.146623000 +0100
 205 @@ -300,6 +300,8 @@
 206              setenv("PYTHONSTARTUP", "/tmp/updates/pyrc.py", 1);
 207          else if (!access("/usr/lib/anaconda-runtime/pyrc.py", R_OK|X_OK))
 208              setenv("PYTHONSTARTUP", "/usr/lib/anaconda-runtime/pyrc.py", 1);
 209 +       else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK))
 210 +           setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1);
 211          setenv("LD_LIBRARY_PATH", LIBPATH, 1);
 212          setenv("LANG", "C", 1);
 213
 214 diff -ur anaconda-11.2.0.24/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder
 215 --- anaconda-11.2.0.24/scripts/pkgorder 2007-01-30 23:26:15.000000000 +0100
 216 +++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:17:08.462623000 +0100
 217 @@ -18,8 +18,8 @@
 218  import sys
 219  import yum
 220
 221 -sys.path.append("/usr/lib/anaconda")
 222 -sys.path.append("/usr/lib/booty")
 223 +sys.path.append("/usr/%s/anaconda" % sys.lib)
 224 +sys.path.append("/usr/%s/booty" % sys.lib)
 225
 226  import anaconda_log
 227  import logging
 228