diff --git a/setup.py b/setup.py
index 05fa4118..00d0d771 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ setup(name='pungi',
license='GPLv2',
package_dir = {'': 'src'},
packages = ['pypungi'],
- scripts = ['src/bin/pungi.py', 'src/bin/pkgorder'],
+ scripts = ['src/bin/pungi.py'],
data_files=[('/usr/share/pungi', glob.glob('share/*'))]
)
diff --git a/src/bin/pkgorder b/src/bin/pkgorder
deleted file mode 100755
index c16ba731..00000000
--- a/src/bin/pkgorder
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/usr/bin/python
-#
-# pkgorder
-#
-# Copyright (C) 2005,2006,2007,2008,2009 Red Hat, Inc. 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-#
-# Author(s): Paul Nasrat
-# Jesse Keating
-#
-
-import os.path
-import glob
-import rpm
-import rpmUtils
-import shutil
-import string
-import sys
-import yum
-
-import logging
-logger = logging.getLogger("anaconda")
-handler = logging.StreamHandler()
-handler.setLevel(logging.ERROR)
-logger.addHandler(handler)
-
-from optparse import OptionParser
-import yum
-
-class PackageOrderer(yum.YumBase):
- def __init__(self, arch=None):
- yum.YumBase.__init__(self)
- self._arch = arch
-
- def _transactionDataFactory(self):
- return yum.transactioninfo.SortableTransactionData()
-
- def doFileLogSetup(self, uid, logfile):
- pass
-
- def doLoggingSetup(self, *args, **kwargs):
- pass
-
- def setup(self, fn="/etc/yum.conf", root="/", excludes=[]):
- self.doConfigSetup(fn, root, init_plugins = False)
- self.conf.cache = 0
-# if hasattr(self.repos, 'sqlite'):
-# self.repos.sqlite = False
-# self.repos._selectSackType()
- exclude = self.conf.exclude
- exclude.extend(excludes)
- self.conf.exclude = exclude
- cachedir = yum.misc.getCacheDir()
- self.repos.setCacheDir(cachedir)
- self.repos.setCache(0)
- self.doRepoSetup()
-
- self.doSackSetup(rpmUtils.arch.getArchList(self._arch))
- self.doTsSetup()
- self.doGroupSetup()
- self.repos.populateSack('enabled', 'filelists')
-
- def getDownloadPkgs(self):
- pass
-
-#XXX: sigh
-processed = {}
-def processTransaction(ds):
- del ds.ts
- ds.initActionTs()
- ds.populateTs(keepold=0)
- ds.ts.check()
- ds.ts.order()
- for (hdr, path) in ds.ts.ts.getKeys():
- fname = os.path.basename(path)
- fpattern = "%s*" % fname.rsplit('.', 2)[0]
- printMatchingPkgs(fpattern)
-
-def printMatchingPkgs(fpattern):
- global processed
-
- if os.path.isdir("%s/%s/RPMS" % (toppath, product)):
- matches = glob.glob("%s/%s/RPMS/%s" % (toppath, product, fpattern))
- elif os.path.isdir("%s/%s" %(toppath, product)):
- matches = glob.glob("%s/%s/%s" % (toppath, product, fpattern))
- else:
- matches = glob.glob("%s/%s" % (toppath, fpattern))
-
- for match in matches:
- mname = os.path.basename(match)
- if processed.has_key(mname): continue
- processed[mname] = True
- print mname
-
-def addPackages(ds, pkgLst):
- ds.initActionTs()
- for pkg in pkgLst:
- try:
- ds.install(pattern=pkg)
- except yum.Errors.InstallError, e:
- print >> sys.stderr, "Error adding %s: %s" % (pkg, e)
- ds.resolveDeps()
- processTransaction(ds)
-
-def addGroups(ds, groupLst):
- ds.initActionTs()
- map(ds.selectGroup, filter(lambda x: ds.comps.has_group(x), groupLst))
- ds.resolveDeps()
- processTransaction(ds)
-
-def createConfig(toppath):
- yumconfstr = """
-[main]
-distroverpkg=redhat-release
-gpgcheck=0
-reposdir=/dev/null
-exclude=*debuginfo*
-
-[anaconda]
-name=Anaconda
-baseurl=file://%s
-enabled=1
-""" % (toppath)
-
- try:
- (fd, path) = tempfile.mkstemp("", "yum-conf-", toppath)
- except (OSError, IOError), e:
- print >> sys.stderr, "Error writing to %s" % (toppath,)
- sys.exit(1)
- os.write(fd, yumconfstr)
- os.close(fd)
- return path
-
-def usage():
- print >> sys.stderr, "pkgorder "
- print >> sys.stderr, ": use rpm architecture for tree, eg i686"
-
-if __name__ == "__main__":
- import tempfile
- parser = OptionParser()
- parser.add_option("--debug", action="store_true", dest="debug", default=False)
- parser.add_option("--file", action="store", dest="file")
- parser.add_option("--product", action="store", dest="productPath", )
- parser.add_option("--exclude", action="append", dest="excludeList",
- default=[])
-
- (options, args) = parser.parse_args()
-
- if len(args) != 3:
- usage()
- sys.exit(1)
-
- (toppath, arch, product) = args
- config = createConfig(toppath)
-
- # Boo.
- if arch == "i386":
- arch = "i686"
- if arch == "sparc":
- arch = "sparc64v"
-
- # print out kernel related packages first
- #printMatchingPkgs("kernel-*")
-
- if os.environ.has_key('TMPDIR'):
- testpath = "%s/pkgorder-%d" %(os.environ['TMPDIR'],os.getpid(),)
- else:
- testpath = "/tmp/pkgorder-%d" %(os.getpid(),)
-
- os.system("mkdir -p %s/var/lib/rpm" %(testpath,))
-
- ds = PackageOrderer(arch=arch)
- ds.setup(fn=config, excludes=options.excludeList, root = testpath)
-
- # hack, hack, hack... make sure initrd stuff ends up on disc1
- # bugs #208832 #642557
- addPackages(ds, ["kernel-*", "dracut", "mdadm", "lvm2", "device-mapper",
- "plymouth", "cryptsetup-luks", "dmraid", "kbd",
- "plymouth-scripts", "dracut-network"])
-
- # add the packages anaconda forces on us
- addPackages(ds, ["authconfig", "chkconfig", "dracut", "system-config-firewall-tui"])
-
- addGroups(ds, ["core", "base", "text-internet"])
-
- addGroups(ds, ["base-x", "dial-up",
- "graphical-internet", "editors",
- "gnome-desktop", "sound-and-video", "printing",
- "fonts", "hardware-support", "admin-tools", "online-docs",
- "java", "legacy-fonts", "input-methods"])
-
- addGroups(ds, ["office", "games", "graphics", "authoring-and-publishing"])
-
- addGroups(ds, ["web-server", "ftp-server", "sql-server",
- "mysql", "server-cfg", "dns-server",
- "smb-server"])
-
- addGroups(ds, ["kde-desktop", "development-tools", "development-libs",
- "gnome-software-development", "eclipse",
- "x-software-development",
- "java-development", "kde-software-development",
- "mail-server", "network-server", "legacy-network-server"])
-
- addGroups(ds, ["news-server", "legacy-software-development",
- "engineering-and-scientific"])
-
- #Everthing else but kernels
- for po in ds.pkgSack.returnPackages():
- if po.name.find("kernel-*") == -1:
- member = ds.tsInfo.addInstall(po)
-
- ds.resolveDeps()
- processTransaction(ds)
- os.unlink(config)
- shutil.rmtree(testpath)
diff --git a/src/pypungi/splittree.py b/src/pypungi/splittree.py
deleted file mode 100644
index f01ff942..00000000
--- a/src/pypungi/splittree.py
+++ /dev/null
@@ -1,476 +0,0 @@
-#!/usr/bin/env python
-#
-# splittree.py
-#
-# Copyright (C) 2003, 2004, 2005 Red Hat, Inc. 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-#
-
-import sys
-import os
-import os.path
-import string
-import getopt
-import rpm
-import subprocess
-
-global _ts
-_ts = None
-
-# returns n-v-r.a from file filename
-def nvra(pkgfile):
- global _ts
- if _ts is None:
- _ts = rpm.TransactionSet()
- _ts.setVSFlags(-1)
- fd = os.open(pkgfile, os.O_RDONLY)
- h = _ts.hdrFromFdno(fd)
- os.close(fd)
- return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'],
- h['arch'])
-
-
-class Timber:
- """Split trees like no other"""
- def __init__(self):
-
- """self.release_str : the name and version of the product"
-
-self.package_order_file : the location of the file which has
-the package ordering
-
-self.arch : the arch the tree is intended for
-
-self.real_arch : the arch found in the unified tree's
-.discinfo file
-
-self.dist_dir : the loaction of the unified tree
-
-self.src_dir : the location of the unified SRPM dir
-
-self.start_time : the timestamp that's in .discinfo files
-
-self.dir_info : The info other than start_time that goes
-into the .discinfo files. The info should already exist
-after running buildinstall in the unified tree
-
-self.total_discs : total number of discs
-
-self.total_bin_discs : total number of discs with RPMs
-
-self.total_srpm_discs : total number of discs with SRPMs
-
-self.reverse_sort_srpms : sort the srpms in reverse order to
-fit. Usually only needed if we share a disc between SRPMs
-and RPMs. Set to 1 to turn on.
-
-self.reserve_size : Additional size needed to be reserved on the first disc.
-"""
-
- self.reserve_size = 0
- self.disc_size = 640.0
- self.target_size = self.disc_size * 1024.0 * 1024
- self.fudge_factor = 1.2 * 1024.0 * 1024
- self.comps_size = 10.0 * 1024 * 1024
- self.release_str = None
- self.package_order_file = None
- self.arch = None
- self.real_arch = None
- self.dist_dir = None
- self.src_dir = None
- self.start_time = None
- self.dir_info = None
- self.total_discs = None
- self.bin_discs = None
- self.src_discs = None
- self.product_path = "anaconda"
- self.bin_list = []
- 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.logfile = []
-
-
-
- def getIsoSize(self, path):
- """Gets the size that a path would take in iso form"""
-
- call = ['/usr/bin/genisoimage', '-U', '-J', '-R', '-T', '-m',
- 'repoview', '-m', 'images/boot.iso', '-print-size',
- '-quiet', path]
-
- isosize = int(subprocess.Popen(call,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE).communicate()[0])
-
- return isosize * 2048
-
-
-
- def reportSizes(self, disc, firstpkg=None, lastpkg=None):
- """appends to self.logfile"""
-
- if firstpkg:
- self.logfile.append("First package on disc%d: %s" % (disc, firstpkg))
- if lastpkg:
- self.logfile.append("Last package on disc%d : %s" % (disc, lastpkg))
-
- discsize = self.getIsoSize("%s-disc%d" % (self.dist_dir, disc))
- self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
-
-
-
- def createDiscInfo(self, discnumber):
- """creates the .discinfo files in the split trees"""
-
- if not os.path.exists("%s/.discinfo" % self.dist_dir):
- raise RuntimeError, "CRITICAL ERROR : .discinfo doesn't exist in the unified tree, not splitting"
-
- # if start_time isn't set then we haven't got this info yet
- if not self.start_time:
- infofile = open("%s/.discinfo" % (self.dist_dir), 'r')
- self.start_time = infofile.readline()[:-1]
- self.release_str = infofile.readline()[:-1]
- self.real_arch = infofile.readline()[:-1]
-
- #if self.real_arch != self.arch:
- # raise RuntimeError, "CRITICAL ERROR : self.real_arch is not the same as self.arch"
-
- # skip the disc number line from the unified tree
- infofile.readline()
-
- # basedir, packagedir, and pixmapdir
- self.dir_info = [infofile.readline()[:-1], infofile.readline()[:-1], infofile.readline()[:-1]]
-
- infofile.close()
-
- discinfo_file = open("%s-disc%d/.discinfo" % (self.dist_dir, discnumber), 'w')
- discinfo_file.write("%s\n" % self.start_time)
- discinfo_file.write(self.release_str + '\n')
- discinfo_file.write(self.real_arch + '\n')
- discinfo_file.write("%s\n" % discnumber)
- for i in range(0, len(self.dir_info)):
- discinfo_file.write(self.dir_info[i] + '\n')
- discinfo_file.close()
-
-
-
- def linkFiles(self, src_dir, dest_dir, filelist):
- """Creates hardlinks from files in the unified dir to files in the split dirs. This is not for RPMs or SRPMs"""
-
- for srcfile in filelist:
- src = "%s/%s" % (src_dir, srcfile)
- dest = "%s/%s" % (dest_dir, srcfile)
- try:
- os.link(src, dest)
- except OSError, (errno, msg):
- pass
-
-
-
- def createFirstSplitDir(self):
- """Create a the first split dir to overflow into, linking common files
- as well as the files needed on the first disc"""
-
- # Set the bin_list to 1 to start with. We'll add more as needed.
- self.bin_list = [1]
- p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm" -not -name "*boot.iso"' % self.dist_dir, 'r')
- filelist = p.read()
- p.close()
- filelist = string.split(filelist)
-
- p = os.popen('find %s/ -type d -not -name SRPMS' % self.dist_dir, 'r')
- dirlist = p.read()
- p.close()
- dirlist = string.split(dirlist)
-
- # we need to clean up the dirlist first. We don't want everything yet
- for j in range(0, len(dirlist)):
- dirlist[j] = string.replace(dirlist[j], self.dist_dir, '')
-
-
- # now create the dirs for disc1
- for j in range(0, len(dirlist)):
- os.makedirs("%s-disc1/%s" % (self.dist_dir, dirlist[j]))
-
- for j in range(0, len(filelist)):
- filelist[j] = string.replace(filelist[j], self.dist_dir, '')
- try:
- os.link(os.path.normpath("%s/%s" % (self.dist_dir, filelist[j])),
- os.path.normpath("%s-disc1/%s" % (self.dist_dir, filelist[j])))
- except OSError, (errno, msg):
- pass
-
- self.createDiscInfo(1)
-
-
-
- def createSplitDir(self):
- """Create a new split dir to overflow into, linking common files"""
-
- i = self.bin_list[-1] + 1
- self.bin_list.append(i)
- os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, self.product_path))
- self.linkFiles(self.dist_dir, "%s-disc%d" %(self.dist_dir, i), self.common_files)
- self.createDiscInfo(i)
-
-
-
- def createSRPMSplitDir(self):
- """Create a new SRPM split dir to overflow into, linking common files"""
-
- i = self.src_list[-1]
- os.makedirs("%s-disc%d/SRPMS" % (self.dist_dir, i))
- self.linkFiles(self.dist_dir, "%s-disc%d" %(self.dist_dir, i), self.common_files)
-
-
-
- def splitRPMS(self, reportSize = 1):
- """Creates links in the split dirs for the RPMs"""
-
- packages = {}
-
- pkgdir = "%s" %(self.product_path,)
-
- rpmlist = os.listdir("%s/%s" %(self.dist_dir, pkgdir))
- rpmlist.sort()
-
- # create the packages dictionary in this format: n-v-r.a:['n-v-r.arch.rpm']
- for filename in rpmlist:
- filesize = os.path.getsize("%s/%s/%s" % (self.dist_dir, pkgdir, filename))
- try:
- pkg_nvr = nvra("%s/%s/%s" %(self.dist_dir, pkgdir, filename))
- except rpm.error:
- continue
-
- if packages.has_key(pkg_nvr):
- # append in case we have multiple packages with the
- # same n-v-r. Ex: the kernel has multiple n-v-r's for
- # different arches
- packages[pkg_nvr].append(filename)
- else:
- packages[pkg_nvr] = [filename]
-
- orderedlist = []
-
- # read the ordered pacakge list into orderedlist
- orderfile = open(self.package_order_file, 'r')
- for pkg_nvr in orderfile.readlines():
- pkg_nvr = string.rstrip(pkg_nvr)
- if pkg_nvr[0:8] != "warning:":
- orderedlist.append(pkg_nvr)
- orderfile.close()
-
- # last package is the last package placed on the disc
- firstpackage = ''
- lastpackage = ''
-
- # packagenum resets when we change discs. It's used to
- # determine the first package in the split tree and that's
- # about it
- packagenum = 0
-
- disc = self.bin_list[0]
-
- for rpm_nvr in orderedlist:
- if not packages.has_key(rpm_nvr):
- continue
- for file_name in packages[rpm_nvr]:
- curused = self.getIsoSize("%s-disc%s" % (self.dist_dir, disc))
- filesize = os.stat("%s/%s/%s" % (self.dist_dir, pkgdir, file_name)).st_size
- newsize = filesize + curused
-
- # compensate for the size of the comps package which has yet to be created
- if disc == 1:
- if self.arch == 'ppc' or self.arch == 'ppc64':
- # ppc has about 15 megs of overhead in the isofs.
- maxsize = self.target_size - self.comps_size - self.reserve_size - 15728640
- else:
- maxsize = self.target_size - self.comps_size - self.reserve_size
- else:
- maxsize = self.target_size
-
- packagenum = packagenum + 1
-
- if packagenum == 1:
- firstpackage = file_name
-
- # move to the next disc if true
- if newsize > maxsize:
- self.reportSizes(disc, firstpkg=firstpackage, lastpkg=lastpackage)
- # Create a new split dir to copy into
- self.createSplitDir()
- disc = self.bin_list[-1]
- os.link("%s/%s/%s" % (self.dist_dir, pkgdir, file_name),
- "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, file_name))
- packagenum = 1
- firstpackage = file_name
- else:
- os.link("%s/%s/%s" % (self.dist_dir, pkgdir, file_name),
- "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, file_name))
- lastpackage = file_name
-
- if reportSize == 1:
- if firstpackage == '':
- raise RuntimeError, "CRITICAL ERROR : Packages do not fit in given CD size"
-
- self.reportSizes(disc, firstpkg=firstpackage, lastpkg=lastpackage)
-
-
-
-
- def splitSRPMS(self):
- """Puts the srpms onto the SRPM split discs. The packages are
- ordered by size, and placed one by one on the disc with
- space available"""
-
- srpm_list = []
-
- # create a list of [[size, srpm]]
- for srpm in os.listdir("%s" % self.src_dir):
- if not srpm.endswith('.rpm'):
- continue
- srpm_size = os.stat("%s/%s" % (self.src_dir, srpm)).st_size
- srpm_list.append([srpm_size, srpm])
-
- srpm_list.sort()
- srpm_list.reverse()
-
- # Make the first src disc dir
- self.src_list = [1]
- self.createSRPMSplitDir()
- # Create a dict of src discs to current size.
- src_dict = {1: 0}
-
- for i in range(0, len(srpm_list)):
- # make sure that the src disc is within the size limits,
- # if it isn't, make a new one.
- srpmsize = srpm_list[i][0]
- fit = None
-
- for disc in src_dict.keys():
- if src_dict[disc] + srpmsize < self.target_size:
- fit = disc
- continue
-
- if not fit:
- # We couldn't find a disc to fit on, make a new one
- self.src_list.append(self.src_list[-1] + 1)
- self.createSRPMSplitDir()
- fit = self.src_list[-1]
-
- # now link the srpm to the disc we found (or created) that had room
- os.link("%s/%s" % (self.src_dir, srpm_list[i][1]),
- "%s-disc%d/SRPMS/%s" % (self.dist_dir, fit, srpm_list[i][1]))
- src_dict[fit] = src_dict.setdefault(fit, 0) + srpmsize
-
- for i in range(0, len(self.src_list)):
- self.reportSizes(self.src_list[i])
-
-
- def main(self):
- """Just runs everything"""
-
- # Recalculate this here in case the disc_size changed.
- self.target_size = self.disc_size * 1024.0 * 1024
-
- self.createFirstSplitDir()
- self.splitRPMS()
- if (self.src_discs != 0):
- self.splitSRPMS()
- return self.logfile
-
-
-
-def usage(theerror):
- print theerror
- print """Usage: %s --arch=i386 --total-discs=8 --bin-discs=4 --src-discs=4 --release-string="distro name" --pkgorderfile=/tmp/pkgorder.12345 --distdir=/usr/src/someunifiedtree --srcdir=/usr/src/someunifiedtree/SRPMS --productpath=product""" % sys.argv[0]
- sys.exit(1)
-
-
-if "__main__" == __name__:
- timber = Timber()
-
- theargs = ["arch=", "total-discs=", "bin-discs=", 'disc-size=',
- "src-discs=", "release-string=", "pkgorderfile=",
- "distdir=", "srcdir=", "productpath=", "reserve-size="]
-
- try:
- options, args = getopt.getopt(sys.argv[1:], '', theargs)
- except getopt.error, error:
- usage(error)
-
- myopts = {}
- for i in options:
- myopts[i[0]] = i[1]
-
- options = myopts
-
- if options.has_key("--arch"):
- timber.arch = options['--arch']
- else:
- usage("You forgot to specify --arch")
-
- if options.has_key("--total-discs"):
- timber.total_discs = int(options['--total-discs'])
- else:
- usage("You forgot to specify --total-discs")
-
- if options.has_key("--bin-discs"):
- timber.bin_discs = int(options['--bin-discs'])
- else:
- usage("You forgot to specify --bin-discs")
-
- if options.has_key("--src-discs"):
- timber.src_discs = int(options['--src-discs'])
- else:
- usage("You forgot to specify --src-discs")
-
- if options.has_key("--release-string"):
- timber.release_str = options["--release-string"]
- else:
- usage("You forgot to specify --release-string")
-
- if options.has_key("--pkgorderfile"):
- timber.package_order_file = options["--pkgorderfile"]
- else:
- usage("You forgot to specify --pkgorderfile")
-
- if options.has_key("--distdir"):
- timber.dist_dir = options["--distdir"]
- else:
- usage("You forgot to specify --distdir")
-
- if options.has_key("--srcdir"):
- timber.src_dir = options["--srcdir"]
- else:
- usage("You forgot to specify --srcdir")
-
- if options.has_key("--productpath"):
- timber.product_path = options["--productpath"]
-
- if options.has_key("--reserve-size"):
- timber.reserve_size = float(options["--reserve-size"])
-
- if options.has_key("--disc-size"):
- timber.disc_size = float(options["--disc-size"])
-
- logfile = timber.main()
-
- for logentry in range(0, len(logfile)):
- print logfile[logentry]
-
- sys.exit(0)