SOURCES: anaconda-branding.patch, anaconda-libdir.patch, anaconda-pld-relea...
patrys
patrys at pld-linux.org
Wed Aug 27 02:06:15 CEST 2008
Author: patrys Date: Wed Aug 27 00:06:15 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- 11.4.1.27
- not tested at all (yet)
---- Files affected:
SOURCES:
anaconda-branding.patch (1.6 -> 1.7) , anaconda-libdir.patch (1.6 -> 1.7) , anaconda-pld-release.patch (1.5 -> 1.6) , anaconda-timezone.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/anaconda-branding.patch
diff -u SOURCES/anaconda-branding.patch:1.6 SOURCES/anaconda-branding.patch:1.7
--- SOURCES/anaconda-branding.patch:1.6 Tue Dec 18 17:34:48 2007
+++ SOURCES/anaconda-branding.patch Wed Aug 27 02:06:08 2008
@@ -1,12 +1,13 @@
--- anaconda-11.2.0.24.org/product.py 2006-05-08 22:22:44.000000000 +0200
+++ anaconda-11.2.0.24/product.py 2007-02-20 19:14:33.134623000 +0100
-@@ -23,11 +23,11 @@
+@@ -29,11 +29,11 @@
+ else:
path = None
-
+
-productStamp = ""
-productName = "anaconda"
-productVersion = "bluesky"
--productPath = "anaconda"
+-productPath = "Packages"
+productStamp = "pld"
+productName = "PLD Linux Distribution"
+productVersion = "3.0 (Th)"
@@ -17,14 +18,3 @@
if path is not None:
f = open(path, "r")
---- anaconda-11.2.0.24.org/iutil.py 2007-01-15 20:42:54.000000000 +0100
-+++ anaconda-11.2.0.24/iutil.py 2007-02-20 19:14:46.322623000 +0100
-@@ -421,7 +421,7 @@
- rhpl.arch.canonArch = myarch
-
- f = open("%s/etc/rpm/platform" %(root,), 'w+')
-- f.write("%s-redhat-linux\n" %(myarch,))
-+ f.write("%s-pld-linux\n" %(myarch,))
- f.close()
-
- # FIXME: writing /etc/rpm/macros feels wrong somehow
================================================================
Index: SOURCES/anaconda-libdir.patch
diff -u SOURCES/anaconda-libdir.patch:1.6 SOURCES/anaconda-libdir.patch:1.7
--- SOURCES/anaconda-libdir.patch:1.6 Thu Dec 13 22:36:08 2007
+++ SOURCES/anaconda-libdir.patch Wed Aug 27 02:06:09 2008
@@ -14,35 +14,23 @@
diff -ur anaconda-11.2.0.24/anaconda anaconda-11.2.0.24/anaconda
--- anaconda-11.2.0.24/anaconda 2007-02-01 23:55:38.000000000 +0100
+++ anaconda-11.2.0.24/anaconda 2007-02-20 18:15:06.726623000 +0100
-@@ -147,17 +142,7 @@
- "/tmp/updates/%s/%s" %(pypkg, f))
+@@ -358,19 +358,19 @@
+ break
- # get the libdir. *sigh*
-- if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
-- os.X_OK):
-- libdir = "lib64"
-- elif os.access("/usr/lib/python%s/site-packages/%s" %(pyver, pypkg),
-- os.X_OK):
-- libdir = "lib"
-- else:
-- # If the directory doesn't exist, there's nothing to link over.
-- # This happens if we forgot to include one of the above packages
-- # in the image, for instance.
-- continue
-+ libdir = sys.lib
-
- if os.access("/tmp/updates/%s" %(pypkg,), os.X_OK):
- for f in os.listdir("/usr/%s/python%s/site-packages/%s" %(libdir,
-@@ -303,15 +288,15 @@
- sys.path.append('textw')
- sys.path.append('iw')
- else:
-- sys.path.append('/usr/lib/anaconda')
-- sys.path.append('/usr/lib/anaconda/textw')
-- sys.path.append('/usr/lib/anaconda/iw')
-+ sys.path.append('/usr/%s/anaconda' % sys.lib)
-+ sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
-+ sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
+ if haveUpdates:
+- sys.path.insert(ndx+1, '/usr/lib/anaconda')
+- sys.path.insert(ndx+2, '/usr/lib/anaconda/textw')
+- sys.path.insert(ndx+3, '/usr/lib/anaconda/iw')
++ sys.path.insert(ndx+1, '/usr/%s/anaconda' % sys.lib)
++ sys.path.insert(ndx+2, '/usr/%s/anaconda/textw' % sys.lib)
++ sys.path.insert(ndx+3, '/usr/%s/anaconda/iw' % sys.lib)
+ else:
+- sys.path.insert(0, '/usr/lib/anaconda')
+- sys.path.insert(1, '/usr/lib/anaconda/textw')
+- sys.path.insert(2, '/usr/lib/anaconda/iw')
++ sys.path.insert(0, '/usr/%s/anaconda' % sys.lib)
++ sys.path.insert(1, '/usr/%s/anaconda/textw' % sys.lib)
++ sys.path.insert(2, '/usr/%s/anaconda/iw' % sys.lib)
if (os.path.exists('booty')):
sys.path.append('booty')
@@ -53,10 +41,10 @@
sys.path.append('/usr/share/system-config-date')
-@@ -390,7 +375,7 @@
+@@ -446,7 +446,7 @@
+ child = os.fork()
if child == 0:
- for p in ('/mnt/source/RHupdates/pyrc.py', \
- '/tmp/updates/pyrc.py', \
+ for p in ('/tmp/updates/pyrc.py', \
- '/usr/lib/anaconda-runtime/pyrc.py'):
+ '/usr/%s/anaconda-runtime/pyrc.py' % sys.lib):
if os.access(p, os.R_OK|os.X_OK):
@@ -179,9 +167,9 @@
if os.access(path, os.R_OK):
f = open(path, 'r')
@@ -72,7 +73,7 @@
+
# nick -> (name, short name, font, keyboard, timezone) mapping
- search = ('lang-table', '/tmp/updates/lang-table',
- '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
+ search = ('lang-table', '/tmp/updates/lang-table', '/etc/lang-table',
- '/usr/lib/anaconda/lang-table')
+ '/usr/%s/anaconda/lang-table' % sys.lib)
for path in search:
@@ -199,18 +187,3 @@
setenv("LD_LIBRARY_PATH", LIBPATH, 1);
setenv("LANG", "C", 1);
-diff -ur anaconda-11.2.0.24/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder
---- anaconda-11.2.0.24/scripts/pkgorder 2007-01-30 23:26:15.000000000 +0100
-+++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:17:08.462623000 +0100
-@@ -18,8 +18,8 @@
- import sys
- import yum
-
--sys.path.append("/usr/lib/anaconda")
--sys.path.append("/usr/lib/booty")
-+sys.path.append("/usr/%s/anaconda" % sys.lib)
-+sys.path.append("/usr/%s/booty" % sys.lib)
-
- import anaconda_log
- import logging
-
================================================================
Index: SOURCES/anaconda-pld-release.patch
diff -u SOURCES/anaconda-pld-release.patch:1.5 SOURCES/anaconda-pld-release.patch:1.6
--- SOURCES/anaconda-pld-release.patch:1.5 Tue Dec 18 17:34:48 2007
+++ SOURCES/anaconda-pld-release.patch Wed Aug 27 02:06:09 2008
@@ -41,46 +41,6 @@
return relstr
return ""
-diff -ur anaconda-11.2.0.24.org/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder
---- anaconda-11.2.0.24.org/scripts/pkgorder 2007-02-20 18:23:45.538623000 +0100
-+++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:28:05.766623000 +0100
-@@ -107,10 +107,10 @@
- def createConfig(toppath):
- yumconfstr = """
- [main]
--distroverpkg=redhat-release
-+distroverpkg=issue
- gpgcheck=0
- reposdir=/dev/null
--exclude=*debuginfo*
-+exclude=vserver-packages *debuginfo*
-
- [anaconda]
- name=Anaconda
-diff -ur anaconda-11.2.0.24.org/scripts/splittree.py anaconda-11.2.0.24/scripts/splittree.py
---- anaconda-11.2.0.24.org/scripts/splittree.py 2006-12-13 16:55:23.000000000 +0100
-+++ anaconda-11.2.0.24/scripts/splittree.py 2007-02-20 18:27:17.982623000 +0100
-@@ -99,7 +99,7 @@
- self.src_list = []
- self.shared_list = []
- self.reverse_sort_srpms=None
-- self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora']
-+ self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-PLD']
- self.logfile = []
-
-
-diff -ur anaconda-11.2.0.24.org/scripts/yumcache anaconda-11.2.0.24/scripts/yumcache
---- anaconda-11.2.0.24.org/scripts/yumcache 2007-01-30 22:55:56.000000000 +0100
-+++ anaconda-11.2.0.24/scripts/yumcache 2007-02-20 18:24:43.130623000 +0100
-@@ -24,7 +24,7 @@
-
- self.yumconfstr = """
- [main]
--distroverpkg=redhat-release
-+distroverpkg=issue
- cachedir=%s
- gpgcheck=0
-
diff -ur anaconda-11.2.0.24.org/yuminstall.py anaconda-11.2.0.24/yuminstall.py
--- anaconda-11.2.0.24.org/yuminstall.py 2007-02-13 14:56:08.000000000 +0100
+++ anaconda-11.2.0.24/yuminstall.py 2007-02-20 18:26:50.814623000 +0100
================================================================
Index: SOURCES/anaconda-timezone.patch
diff -u SOURCES/anaconda-timezone.patch:1.5 SOURCES/anaconda-timezone.patch:1.6
--- SOURCES/anaconda-timezone.patch:1.5 Thu Dec 13 22:36:08 2007
+++ SOURCES/anaconda-timezone.patch Wed Aug 27 02:06:09 2008
@@ -31,28 +31,24 @@
diff -ur anaconda-11.2.0.24.org/timezone.py anaconda-11.2.0.24/timezone.py
--- anaconda-11.2.0.24.org/timezone.py 2007-01-17 23:49:50.000000000 +0100
+++ anaconda-11.2.0.24/timezone.py 2007-02-20 19:07:07.498623000 +0100
-@@ -13,6 +13,7 @@
+@@ -19,6 +19,7 @@
import shutil
import iutil
+import string
+ import os
from flags import flags
- import logging
-@@ -44,12 +45,32 @@
+@@ -44,8 +45,29 @@
f = open(instPath + "/etc/sysconfig/clock", "w")
- f.write('ZONE="%s"\n' % self.tz)
+ f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).\n')
- f.write("UTC=%s\n" % bool(self.utc))
+ f.write('# true means your machine uses epoch 1980 in its hardware clock\n')
- f.write("ARC=%s\n" % bool(self.arc))
--
+ f.write('# true means your machine uses epoch 1900 in its hardware clock\n')
+ f.write("SRM=false\n")
f.close()
-
+ # FIXME: solution for timezones like EET
+ (area, zone) = string.split(self.tz, "/")
+
@@ -70,7 +66,8 @@
+ f.write('# Name of the time zone for your system.\n')
+ f.write('TIME_ZONE="%s"\n' % zone)
+ f.write("\n");
-+
++ f.close()
+
def getTimezoneInfo(self):
return (self.tz, self.utc, self.arc)
-
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-branding.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-libdir.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-pld-release.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/anaconda-timezone.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list