Hello, I'd like to announce a release of a CentOS 5 DVD image, with i386 and x86_64 installations. This is an independent work, so please don't bother CentOS lists with bugs related to the installer only. Summary of changes: * i686 and x86_64 install from a single dvd (automatic detection on boot) * updates as of 2007-04-26 * no kdelibs-api-docs, openoffice.org, tetex-doc and most *-javadoc sha1sum: 63885249695c60a87443e304212d6cf9af678165 centos5_32and64.iso md5sum: 0db291c3e4f7dc4fb4e6ea052b77e95d centos5_32and64.iso torrent: ftp://ftp.gil.di.uminho.pt/pub/users/strange/centos/c5_32+64.torrent iso: ftp://ftp.gil.di.uminho.pt/pub/users/strange/centos/centos5_32and64.iso Detailed changes: * All rpms are the originals from CentOS 5. However, the *.i386.rpm and *.noarch.rpm for the x86_64 are the ones from the i386 DVD, not from the x86_64, as the contents are the same and the rpm headers differ only on the Build Date and/or Signature. * each install (x86_64 or i386) only has knowledge of rpms originally in their DVDs, so x86_64 installs won't be bloated with more i386 packages than the originals. * Some packages are missing. It's a pity some subpackages that don't depend on %arch are still built as .%arch.rpm, but there's nothing I'm willing to do about that. The missing packages are: - openoffice.org - tetex-doc - kdelibs-apidocs - Deployment_Guide, except for en_US and pt-BR - *-javadoc, except for: - java-1.4.2-gcj-compat-javadoc (required by eclipse) - bsh-javadoc and xmlrpc-javadoc (part of java-devel group) Note that both Deployment_Guide and openoffice.org have updates, so if you don't care about kdelibs-apidocs, tetex-doc and *-javadoc, you can still use this image as a local base. * The updates as of 2007-04-26 from CentOS replace their originals: - autofs-5.0.1-0.rc2.43.0.2 - bind-9.3.3-8 - cups-1.2.4-11.5.1 - Deployment_Guide-(en-US and pt_BR)-5.0.0-21 - dhcp-3.0.5-5 - ekiga-2.0.2-7.0.2 - emacs-21.4-18.1 - evolution-data-server-1.8.0-15.0.2 - file-4.17-9 - firefox-1.5.0.10-2.el5 - freetype-2.2.1-17 - gcc-4.1.1-52.el5.2 - gnupg-1.4.5-13 - kernel-2.6.18-8.1.1 - krb5-1.5-23 - libwpd-0.8.7-3 - libX11-1.0.3-8.0.1 - libXfont-1.2.2-1.0.2 - module-init-tools-3.3-0.pre3.1.16.0.1 - net-snmp-5.3.1-14.0.1 - nss-3.11.5-3.el5 - php-5.1.6-11 - postgresql-8.1.8-1 - samba-3.0.23c-2.el5.2 - spamassassin-3.1.8-2 - squid-2.6.STABLE6-4 - thunderbird-1.5.0.10-1.el5 - tzdata-2007d-1 - virt-manager-0.2.6-7.0.2 - wireshark-0.99.5-1 - xen-3.0.3-25.0.3 - xorg-x11-apps-7.1-4.0.1 - xorg-x11-server-1.1.1-48.13.0.1 - yelp-2.16.0-14.0.1 * automatic detection on boot for i386 or x86_64 install - default label linux now calls com32 module l32or64 (attachment l32or64.c) that selects 32 or 64 bits kernel according to long_mode flag in cpuid - new boot targets linux32 and linux64 that force 32 bit or 64 kernel * single 32 bits initrd for i386 and x86_64 - new /init (attachment renmod.c), that symlinks /modules to the correct version - /modules.i386 with the original modules from the i386 initrd - /modules.x86_64 with the original modules from the x86_64, but with the paths in modules.cgz changed to $kver/i686/ instead of the original $kver/x86_64/, as the anaconda loader was looking there for the modules (it's probably ignoring the run-time arch and relying on the compile time one) - the space savings from using a single initrd aren't that much (1.5), so using the two separated initrds is still feasible (and l32or64 supports it), but the x86_64 initrd needs it's .buildstamp replaced with the one from i386. * single 32 bits minstage2 and stage2 - anaconda support for space separated list of available archs in .discinfo (attachment discinfo.patch) (anaconda has at least 4 different places where it parses the .discinfo file. something should be done about that!) - yum support for repodata.%arch location (attachment repodata.arch.patch): -> repodata.i386 and repodata.x86_64 (there was a supposed fallback to repodata if no repodata.%arch existed, but it didn't work in my tests, so you won't be able to use these stages with original repositories for network installs (ln -s repodata repodata.x86_64 or repodata.i386 should be enough, though)) - runtime replacing of usr/lib/rpm/macros with the correct one for the arch (attachment rpm_macros.patch) usr/lib/rpm/macros.i386 from i386/images/stage2/usr/lib/rpm/macros usr/lib/rpm/macros.x86_64 from x86_64/images/stage2/usr/lib/rpm/macros ln -fs /tmp/rpmmacros usr/lib/rpm/macros - symlinks for directories or files with i386/i686 in their name, with i386/i686 replaced with x86_64 (not sure if this was needed, but I didn't feel like making more tests): ln -s i686-redhat-linux-gnu etc/gtk-2.0/x86_64-redhat-linux-gnu ln -s i386-redhat-linux-gnu etc/pango/x86_64-redhat-linux-gnu ln -s keymaps-override-i386 usr/lib/anaconda-runtime/keymaps-override-x86_64 ln -s screenfont-i386.gz usr/lib/anaconda-runtime/screenfont-x86_64.gz ln -s i386-redhat usr/share/grub/x86_64-redhat To recreate the image with your own packages or comps.xml: 1. populate the CentOS rpm directory with the rpms of your choosing; 2. call createrepo in the iso root dir: createrepo -g path_to_comps.xml . 3. rename repodata to repodata.i386 or repodata.x86_64 and fix the relative paths in repodata.%arch/repomd.xml: perl -pi -e 's/repodata/repodata.i386/g' repodata.i386/repomd.xml 4. repeate for the other arch. 5. create the iso: mkisofs -o ../centos5_32and64.iso -b isolinux/isolinux.bin \ -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \ -r -pad -J -joliet-long -V "CentOS" . 6. add checksum to iso: implantisomd5 ../centos5_32and64.iso 7. record it: growisofs -Z /dev/cdrom=../centos5_32and64.iso -- lfr 0/0 -------------- next part -------------- --- stage2.orig/usr/lib/anaconda/image.py 2006-09-28 17:45:21.000000000 +0100 +++ stage2/usr/lib/anaconda/image.py 2007-04-26 22:07:55.000000000 +0100 @@ -58,7 +58,12 @@ f = open("/mnt/source/.discinfo") stamp = f.readline().strip() descr = f.readline().strip() - arch = f.readline().strip() + arch = f.readline().strip().split() + # support for space separated list of archs + if _arch in arch: + arch = _arch + else: + arch = arch[0] discNums = getDiscNums(f.readline().strip()) f.close() except Exception, e: @@ -234,7 +239,12 @@ except: descr = None try: - arch = f.readline().strip() + arch = f.readline().strip().split() + # support for space separated list of archs + if _arch in arch: + arch = _arch + else: + arch = arch[0] except: arch = None try: @@ -282,7 +292,12 @@ except: descr = None try: - arch = f.readline().strip() + arch = f.readline().strip().split() + # support for space separated list of archs + if _arch in arch: + arch = _arch + else: + arch = arch[0] except: arch = None try: @@ -407,7 +422,11 @@ try: f.readline() # skip timestamp f.readline() # skip release description - discArch = string.strip(f.readline()) # read architecture + discArch = f.readline().strip().split() # read architecture + if _arch in discArch: + discArch = _arch + else: + discArch = discArch[0] discNum = getDiscNums(f.readline().strip()) except: discArch = None -------------- next part -------------- --- orig/stage2/usr/lib/python2.4/site-packages/yum/yumRepo.py 2007-04-04 02:17:28.000000000 +0100 +++ minstage2/usr/lib/python2.4/site-packages/yum/yumRepo.py 2007-04-27 16:13:32.000000000 +0100 @@ -16,6 +16,8 @@ from yum import config from yum import misc +import rhpl + class YumPackageSack(packageSack.PackageSack): """imports/handles package objects from an mdcache dict object""" def __init__(self, packageClass): @@ -133,7 +135,8 @@ self.enablegroups = 0 self.groupsfilename = 'yumgroups.xml' # something some freaks might # eventually want - self.repoMDFile = 'repodata/repomd.xml' + self.repoMDFile = 'repodata.%s/repomd.xml' % rhpl.getArch() + self.repoMDFileDfl = 'repodata/repomd.xml' self.repoXML = None self.cache = 0 self.mirrorlistparsed = 0 @@ -502,6 +505,7 @@ """retrieve/check/read in repomd.xml from the repository""" remote = self.repoMDFile + remoteDfl = self.repoMDFileDfl local = self.cachedir + '/repomd.xml' if self.repoXML is not None: return @@ -524,7 +528,18 @@ except URLGrabError, e: - raise Errors.RepoError, 'Error downloading file %s: %s' % (local, e) + try: + result = self.__get(relative=remoteDfl, + local=local, + copy_local=1, + text=text, + reget=None, + checkfunc=checkfunc, + cache=self.http_caching == 'all') + except URLGrabError, e2: + raise Errors.RepoError, 'Error downloading file %s: %s' % (local, e) + self.repoMDFile = remoteDfl + remote = remoteDfl # if we have a 'fresh' repomd.xml then update the cookie self.setMetadataCookie() -------------- next part -------------- --- /tmp/anaconda.orig 2007-04-25 20:22:47.000000000 +0100 +++ usr/bin/anaconda 2007-04-25 21:17:07.000000000 +0100 @@ -30,6 +30,13 @@ import sys, os, re from optparse import OptionParser +arch = os.uname ()[4] +if (len (arch) == 4 and arch[0] == 'i' and + arch[2:4] == "86"): + arch = "i386" + +os.system("cp /usr/lib/rpm/macros.%s /usr/lib/rpm/macros" % arch) + # keep up with process ID of miniwm if we start it miniwm_pid = None -------------- next part -------------- --- comps.xml.orig 2007-04-10 20:45:20.000000000 +0100 +++ comps.xml 2007-04-27 15:58:11.000000000 +0100 @@ -215,7 +215,6 @@ <langonly>af</langonly> <packagelist> <packagereq type="conditional" requires="aspell">aspell-af</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-af_ZA</packagereq> </packagelist> </group> @@ -230,7 +229,6 @@ <packagereq type="mandatory">fonts-arabic</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Arabic</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-arabic</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq> </packagelist> </group> @@ -301,7 +299,6 @@ <packagelist> <packagereq type="mandatory">fonts-bengali</packagereq> <packagereq type="mandatory">m17n-db-assamese</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -792,7 +789,6 @@ <uservisible>false</uservisible> <langonly>eu</langonly> <packagelist> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-eu_ES</packagereq> </packagelist> </group> @@ -866,8 +862,6 @@ <packagereq type="conditional" requires="kdelibs">kde-i18n-Bengali</packagereq> <packagereq type="mandatory">fonts-bengali</packagereq> <packagereq type="mandatory">m17n-db-bengali</packagereq> - <packagereq type="default">Deployment_Guide-bn-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -938,7 +932,6 @@ <packagelist> <packagereq type="conditional" requires="aspell">aspell-pt</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Brazil</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pt_BR</packagereq> </packagelist> </group> @@ -1148,7 +1141,6 @@ <packagereq type="mandatory">fonts-ISO8859-2</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bg_BG</packagereq> </packagelist> </group> @@ -1222,7 +1214,6 @@ <packagelist> <packagereq type="conditional" requires="aspell">aspell-ca</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Catalan</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ca_ES</packagereq> </packagelist> </group> @@ -1300,10 +1291,6 @@ <packagereq type="conditional" requires="kdelibs">kde-i18n-Chinese-Big5</packagereq> <packagereq type="default">lv</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-chinese</packagereq> - <packagereq type="default">Deployment_Guide-zh-CN</packagereq> - <packagereq type="default">Deployment_Guide-zh-TW</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-chewing</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-chinese-standard</packagereq> @@ -1799,7 +1786,6 @@ <packagereq type="mandatory">fonts-ISO8859-2</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hr_HR</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-croatian</packagereq> </packagelist> </group> @@ -1879,7 +1865,6 @@ <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Czech</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-cs</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cs_CZ</packagereq> </packagelist> </group> @@ -2087,7 +2072,6 @@ <packagereq type="conditional" requires="aspell">aspell-da</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Danish</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-da</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-da_DK</packagereq> </packagelist> </group> @@ -2607,7 +2591,6 @@ <packagelist> <packagereq type="conditional" requires="aspell">aspell-nl</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Dutch</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-nl</packagereq> </packagelist> </group> @@ -3093,7 +3076,6 @@ <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Estonian</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-et_EE</packagereq> </packagelist> </group> @@ -3314,7 +3296,6 @@ <langonly>fi</langonly> <packagelist> <packagereq type="conditional" requires="kdelibs">kde-i18n-Finnish</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-fi_FI</packagereq> </packagelist> </group> @@ -3402,8 +3383,6 @@ <packagereq type="conditional" requires="aspell">aspell-fr</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-French</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-fr</packagereq> - <packagereq type="default">Deployment_Guide-fr-FR</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-fr</packagereq> </packagelist> </group> @@ -3831,7 +3810,6 @@ <langonly>gl</langonly> <packagelist> <packagereq type="conditional" requires="aspell">aspell-gl</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-gl_ES</packagereq> </packagelist> </group> @@ -4042,8 +4020,6 @@ <packagereq type="conditional" requires="aspell">aspell-de</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-German</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-de</packagereq> - <packagereq type="default">Deployment_Guide-de-DE</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-de</packagereq> </packagelist> </group> @@ -4401,7 +4377,6 @@ <packagereq type="conditional" requires="aspell">aspell-el</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Greek</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-greek</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-el_GR</packagereq> </packagelist> </group> @@ -4415,8 +4390,6 @@ <packagelist> <packagereq type="mandatory">fonts-gujarati</packagereq> <packagereq type="mandatory">m17n-db-gujarati</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-gu_IN</packagereq> - <packagereq type="default">Deployment_Guide-gu-IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -4495,7 +4468,6 @@ <packagereq type="mandatory">fonts-hebrew</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Hebrew</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-hebrew</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-he_IL</packagereq> </packagelist> </group> @@ -4510,8 +4482,6 @@ <packagereq type="conditional" requires="kdelibs">kde-i18n-Hindi</packagereq> <packagereq type="mandatory">fonts-hindi</packagereq> <packagereq type="mandatory">m17n-db-hindi</packagereq> - <packagereq type="default">Deployment_Guide-hi-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hi_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -4591,7 +4561,6 @@ <packagereq type="mandatory">fonts-ISO8859-2</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hu_HU</packagereq> </packagelist> </group> @@ -4744,7 +4713,6 @@ <langonly>ga</langonly> <packagelist> <packagereq type="conditional" requires="aspell">aspell-ga</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ga_IE</packagereq> </packagelist> </group> @@ -4820,8 +4788,6 @@ <packagereq type="conditional" requires="aspell">aspell-it</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Italian</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-it</packagereq> - <packagereq type="default">Deployment_Guide-it-IT</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-it</packagereq> </packagelist> </group> @@ -4901,8 +4867,6 @@ <packagereq type="default">lv</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq> <packagereq type="default">nkf</packagereq> - <packagereq type="default">Deployment_Guide-ja-JP</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq> <packagereq type="default">perl-NKF</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> @@ -5224,7 +5188,6 @@ <packagelist> <packagereq type="mandatory">fonts-kannada</packagereq> <packagereq type="mandatory">m17n-db-kannada</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -5593,8 +5556,6 @@ <packagereq type="conditional" requires="kdelibs">kde-i18n-Korean</packagereq> <packagereq type="default">lv</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq> - <packagereq type="default">Deployment_Guide-ko-KR</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ko_KR</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-hangul</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -5963,7 +5924,6 @@ <langonly>lt</langonly> <packagelist> <packagereq type="conditional" requires="kdelibs">kde-i18n-Lithuanian</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-lt_LT</packagereq> </packagelist> </group> @@ -6156,8 +6116,6 @@ <packagelist> <packagereq type="mandatory">fonts-malayalam</packagereq> <packagereq type="mandatory">m17n-db-malayalam</packagereq> - <packagereq type="default">Deployment_Guide-ml-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -6216,8 +6174,6 @@ <packagelist> <packagereq type="mandatory">fonts-hindi</packagereq> <packagereq type="mandatory">m17n-db-marathi</packagereq> - <packagereq type="default">Deployment_Guide-mr-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -6808,8 +6764,6 @@ <packagereq type="conditional" requires="aspell">aspell-no</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Norwegian</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Norwegian-Nynorsk</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-nb_NO</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-nn_NO</packagereq> </packagelist> </group> @@ -6948,18 +6902,6 @@ <packagereq type="optional">inkscape</packagereq> <packagereq type="optional">jpilot</packagereq> <packagereq type="optional">kdepim</packagereq> - <packagereq type="optional">openoffice.org-base</packagereq> - <packagereq type="default">openoffice.org-calc</packagereq> - <packagereq type="default">openoffice.org-draw</packagereq> - <packagereq type="optional">openoffice.org-emailmerge</packagereq> - <packagereq type="default">openoffice.org-graphicfilter</packagereq> - <packagereq type="default">openoffice.org-math</packagereq> - <packagereq type="default">openoffice.org-impress</packagereq> - <packagereq type="default">openoffice.org-writer</packagereq> - <packagereq type="default">openoffice.org-xsltfilter</packagereq> - <packagereq type="optional">openoffice.org-javafilter</packagereq> - <packagereq type="optional">openoffice.org-pyuno</packagereq> - <packagereq type="optional">openoffice.org-testtools</packagereq> <packagereq type="default">planner</packagereq> <packagereq type="optional">taskjuggler</packagereq> <packagereq type="optional">tetex-xdvi</packagereq> @@ -7019,8 +6961,6 @@ <packagelist> <packagereq type="mandatory">fonts-oriya</packagereq> <packagereq type="mandatory">m17n-db-oriya</packagereq> - <packagereq type="default">Deployment_Guide-or-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -7102,7 +7042,6 @@ <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Polish</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-pl</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pl_PL</packagereq> </packagelist> </group> @@ -7178,7 +7117,6 @@ <packagereq type="conditional" requires="aspell">aspell-pt</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Portuguese</packagereq> <packagereq type="default">Deployment_Guide-pt-BR</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pt_PT</packagereq> </packagelist> </group> @@ -7539,8 +7477,6 @@ <packagereq type="mandatory">fonts-punjabi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Punjabi</packagereq> <packagereq type="mandatory">m17n-db-punjabi</packagereq> - <packagereq type="default">Deployment_Guide-pa-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pa_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -7838,8 +7774,6 @@ <packagereq type="conditional" requires="kdelibs">kde-i18n-Russian</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-ru</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-russian</packagereq> - <packagereq type="default">Deployment_Guide-ru-RU</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq> </packagelist> </group> @@ -7919,7 +7853,6 @@ <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Serbian</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-serbian</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sr_CS</packagereq> </packagelist> </group> @@ -8120,7 +8053,6 @@ <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-sinhala</packagereq> - <packagereq type="default">Deployment_Guide-si-LK</packagereq> </packagelist> </group> @@ -8198,7 +8130,6 @@ <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Slovak</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-slovak</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sk_SK</packagereq> </packagelist> </group> @@ -8276,7 +8207,6 @@ <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Slovenian</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sl_SI</packagereq> </packagelist> </group> @@ -8501,8 +8431,6 @@ <packagereq type="conditional" requires="aspell">aspell-es</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Spanish</packagereq> <packagereq type="conditional" requires="man-pages">man-pages-es</packagereq> - <packagereq type="default">Deployment_Guide-es-ES</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-es</packagereq> </packagelist> </group> @@ -8578,7 +8506,6 @@ <packagereq type="conditional" requires="aspell">aspell-sv</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Swedish</packagereq> <packagereq type="conditional" requires="scim-m17n">m17n-db-swedish</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sv</packagereq> </packagelist> </group> @@ -8828,8 +8755,6 @@ <packagereq type="mandatory">fonts-tamil</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Tamil</packagereq> <packagereq type="mandatory">m17n-db-tamil</packagereq> - <packagereq type="default">Deployment_Guide-ta-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ta_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -8846,8 +8771,6 @@ <packagelist> <packagereq type="mandatory">fonts-telugu</packagereq> <packagereq type="mandatory">m17n-db-telugu</packagereq> - <packagereq type="default">Deployment_Guide-te-IN</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -9055,7 +8978,6 @@ <langonly>th</langonly> <packagelist> <packagereq type="mandatory">m17n-db-thai</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-th_TH</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -9133,7 +9055,6 @@ <packagelist> <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-9-75dpi</packagereq> <packagereq type="conditional" requires="kdelibs">kde-i18n-Turkish</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-tr_TR</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ISO8859-9-100dpi</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ISO8859-9-75dpi</packagereq> </packagelist> @@ -9227,7 +9148,6 @@ <packagelist> <packagereq type="mandatory">fonts-arabic</packagereq> <packagereq type="mandatory">m17n-db-urdu</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur_IN</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq> <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq> <packagereq type="conditional" requires="qt">scim-qtimm</packagereq> @@ -9458,7 +9378,6 @@ <langonly>cy</langonly> <packagelist> <packagereq type="conditional" requires="aspell">aspell-cy</packagereq> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cy_GB</packagereq> </packagelist> </group> @@ -10014,7 +9933,6 @@ <uservisible>false</uservisible> <langonly>zu</langonly> <packagelist> - <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zu_ZA</packagereq> </packagelist> </group> <group> -------------- next part -------------- /* ----------------------------------------------------------------------- * * * Copyright 2007 Luciano Rocha - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, Inc., 53 Temple Place Ste 330, * Boston MA 02111-1307, USA; either version 2 of the License, or * (at your option) any later version; incorporated herein by reference. * * ----------------------------------------------------------------------- */ /* * l32or64.c * * Load linux kernel depending on cpu support for long mode (64 bits) */ #include <string.h> #include <stdio.h> #include <ctype.h> #include <stdlib.h> #include <console.h> #include <cpuid.h> #include <syslinux/boot.h> int main(int argc, char *argv[]) { const char *kernel, *initrd; char cmdline[1024]; int i; unsigned p; s_cpu cpu; openconsole(&dev_stdcon_r, &dev_stdcon_w); if (argc < 5) { fprintf(stderr, "missing options, usage:\n" " l23or64 <32b kernel> <32b initrd> \\" " <64b kernel> <64b initrd> \\" " [kernel arguments]\n"); return 1; } detect_cpu(&cpu); if (cpu.flags.lm) { initrd = argv[4]; kernel = argv[3]; } else { initrd = argv[2]; kernel = argv[1]; } p = snprintf(cmdline, sizeof cmdline - 1, "%s initrd=%s ", kernel, initrd); for (i = 5; i < argc; i++) { unsigned l = strlen(argv[i]); if ((p + l + 1) >= sizeof cmdline) { fprintf(stderr, "command line exceeds internal " "buffers, trimmed.\n"); break; } memcpy(cmdline + p, argv[i], l); cmdline[p + l] = ' '; p += l + 1; } cmdline[p] = '\0'; syslinux_run_command(cmdline); return 1; } -------------- next part -------------- #include <stdio.h> #include <sys/utsname.h> #include <unistd.h> int main(int argc, char *argv[]) { struct utsname u; const char *target = "modules.i386"; if (!uname(&u)) { puts("machine: "); puts(u.machine); puts("\n"); if (!strcmp(u.machine, "x86_64")) target = "modules.x86_64"; } symlink(target, "modules"); execv("sbin/init", argv); return 1; } -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: <http://lists.centos.org/pipermail/centos/attachments/20070430/0a74294f/attachment-0004.sig>