/[gli]/branches/overhaul/src/GLIPortage.py
Gentoo

Diff of /branches/overhaul/src/GLIPortage.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/src/GLIPortage.py Revision 1339 branches/overhaul/src/GLIPortage.py Revision 1757
3# This source code is distributed under the terms of version 2 of the GNU 3# This source code is distributed under the terms of version 2 of the GNU
4# General Public License as published by the Free Software Foundation, a copy 4# General Public License as published by the Free Software Foundation, a copy
5# of which can be found in the main directory of this project. 5# of which can be found in the main directory of this project.
6Gentoo Linux Installer 6Gentoo Linux Installer
7 7
8$Id: GLIPortage.py,v 1.50 2006/03/05 04:16:04 agaffney Exp $ 8$Id: GLIPortage.py,v 1.57 2006/09/13 18:29:13 agaffney Exp $
9""" 9"""
10 10
11import re 11import re
12import os 12import os
13import sys 13import sys
14import GLIUtility 14import GLIUtility
15from GLIException import GLIException 15from GLIException import GLIException
16 16
17class GLIPortage(object): 17class GLIPortage(object):
18 18
19 def __init__(self, chroot_dir, grp_install, logger, debug, cc, compile_logfile): 19 def __init__(self, chroot_dir, logger, debug, cc, compile_logfile):
20 self._chroot_dir = chroot_dir 20 self._chroot_dir = chroot_dir
21 self._grp_install = grp_install
22 self._logger = logger 21 self._logger = logger
23 self._debug = debug 22 self._debug = debug
24 self._cc = cc 23 self._cc = cc
25 self._compile_logfile = compile_logfile 24 self._compile_logfile = compile_logfile
26 25
27 def get_deps(self, pkgs): 26 def get_deps(self, pkgs, grp_install=False):
28 pkglist = [] 27 pkglist = []
29 if isinstance(pkgs, str): 28 if isinstance(pkgs, str):
30 pkgs = pkgs.split() 29 pkgs = pkgs.split()
31 for pkg in pkgs: 30 for pkg in pkgs:
32 if not pkg: continue 31 if not pkg: continue
33 if self._debug: self._logger.log("get_deps(): pkg is " + pkg) 32 if self._debug: self._logger.log("get_deps(): pkg is " + pkg)
34 if not self._grp_install or not self.get_best_version_vdb(pkg): 33 if not grp_install or not self.get_best_version_vdb(pkg):
35 if self._debug: self._logger.log("get_deps(): grabbing compile deps") 34 if self._debug: self._logger.log("get_deps(): grabbing compile deps")
36 tmppkglist = GLIUtility.spawn("emerge -p " + pkg + r" 2>/dev/null | grep -e '^\[[a-z]' | cut -d ']' -f2 | sed -e 's:^ ::' -e 's: .\+$::'", chroot=self._chroot_dir, return_output=True)[1].strip().split("\n") 35 tmppkglist = GLIUtility.spawn("emerge -p " + pkg + r" 2>/dev/null | grep -e '^\[[a-z]' | cut -d ']' -f2 | sed -e 's:^ ::' -e 's: .\+$::'", chroot=self._chroot_dir, return_output=True)[1].strip().split("\n")
37 else: 36 else:
38 if self._debug: self._logger.log("get_deps(): grabbing binary deps") 37 if self._debug: self._logger.log("get_deps(): grabbing binary deps")
39 # The runtimedeps.py script generates a package install order that is *very* different from emerge itself 38 # The runtimedeps.py script generates a package install order that is *very* different from emerge itself
49 if self._debug: self._logger.log("get_deps(): checking to see if " + tmppkg + " is already in pkglist") 48 if self._debug: self._logger.log("get_deps(): checking to see if " + tmppkg + " is already in pkglist")
50 if not tmppkg in pkglist and not self.get_best_version_vdb_chroot("=" + tmppkg): 49 if not tmppkg in pkglist and not self.get_best_version_vdb_chroot("=" + tmppkg):
51 if self._debug: self._logger.log("get_deps(): adding " + tmppkg + " to pkglist") 50 if self._debug: self._logger.log("get_deps(): adding " + tmppkg + " to pkglist")
52 pkglist.append(tmppkg) 51 pkglist.append(tmppkg)
53 if self._debug: self._logger.log("get_deps(): pkglist is " + str(pkglist)) 52 if self._debug: self._logger.log("get_deps(): pkglist is " + str(pkglist))
53 if not pkglist:
54 raise GLIException("GetDepListError", 'fatal', 'get_deps', "Dep list is empty. This usually means there is no portage tree in the chroot")
54 return pkglist 55 return pkglist
55 56
56 def parse_vdb_contents(self, file): 57 def parse_vdb_contents(self, file):
57 entries = [] 58 entries = []
58 try: 59 try:
68 elif parts[0] == "sym": 69 elif parts[0] == "sym":
69 entries.append(" ".join(parts[1:4])) 70 entries.append(" ".join(parts[1:4]))
70 entries.sort() 71 entries.sort()
71 return entries 72 return entries
72 73
74 def update_counter(self):
75 try:
76 counter_f = open(self._chroot_dir + "/var/cache/edb/counter", "r")
77 counter = int(counter_f.readline().strip())
78 counter_f.close()
79 except:
80 counter = 0
81 counter += 1
82 counter_f = open(self._chroot_dir + "/var/cache/edb/counter", "w")
83 counter_f.write(str(counter))
84 counter_f.close()
85 return counter
86
73 def copy_pkg_to_chroot(self, package, use_root=False, ignore_missing=False): 87 def copy_pkg_to_chroot(self, package, use_root=False, ignore_missing=False):
74 symlinks = { '/bin': '/mnt/livecd/bin/', '/boot': '/mnt/livecd/boot/', '/lib': '/mnt/livecd/lib/', 88 symlinks = { '/bin': '/mnt/livecd/bin/', '/boot': '/mnt/livecd/boot/', '/lib': '/mnt/livecd/lib/',
75 '/opt': '/mnt/livecd/opt/', '/sbin': '/mnt/livecd/sbin/', '/usr': '/mnt/livecd/usr/', 89 '/opt': '/mnt/livecd/opt/', '/sbin': '/mnt/livecd/sbin/', '/usr': '/mnt/livecd/usr/',
76 '/etc/gconf': '/usr/livecd/gconf/' } 90 '/etc/gconf': '/usr/livecd/gconf/' }
77 91
78 tmpdir = "/var/tmp/portage" 92 tmpdir = "/var/tmp"
79 image_dir = tmpdir + "/" + package.split("/")[1] + "/image" 93 image_dir = tmpdir + "/portage/" + package.split("/")[1] + "/image"
80 root_cmd = "" 94 root_cmd = ""
81 tmp_chroot_dir = self._chroot_dir 95 tmp_chroot_dir = self._chroot_dir
82 portage_tmpdir = "/var/tmp/portage" 96 portage_tmpdir = "/var/tmp"
83 vdb_dir = "/var/db/pkg/" 97 vdb_dir = "/var/db/pkg/"
84 if use_root: 98 if use_root:
85 root_cmd = "ROOT=" + self._chroot_dir 99 root_cmd = "ROOT=" + self._chroot_dir
86 tmp_chroot_dir = "" 100 tmp_chroot_dir = ""
87 portage_tmpdir = self._chroot_dir + "/var/tmp/portage" 101 portage_tmpdir = self._chroot_dir + "/var/tmp"
88 vdb_dir = self._chroot_dir + "/var/db/pkg/" 102 vdb_dir = self._chroot_dir + "/var/db/pkg/"
89 103
90 # Create /tmp, /var/tmp, and /var/lib/portage with proper permissions 104 # Create /tmp, /var/tmp, and /var/lib/portage with proper permissions
91 oldumask = os.umask(0) 105 oldumask = os.umask(0)
92 if not os.path.exists(self._chroot_dir + "/tmp"): 106 if not os.path.exists(self._chroot_dir + "/tmp"):
129 # Copy the vdb entry for the package from the LiveCD to the chroot 143 # Copy the vdb entry for the package from the LiveCD to the chroot
130 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): copying vdb entry for " + package) 144 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): copying vdb entry for " + package)
131 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + "/var/db/pkg/" + package + " && cp -a /var/db/pkg/" + package + "/* " + self._chroot_dir + "/var/db/pkg/" + package, logfile=self._compile_logfile, append_log=True)): 145 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + "/var/db/pkg/" + package + " && cp -a /var/db/pkg/" + package + "/* " + self._chroot_dir + "/var/db/pkg/" + package, logfile=self._compile_logfile, append_log=True)):
132 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy vdb entry for " + package) 146 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy vdb entry for " + package)
133 147
148 # Update COUNTER
149 try:
150 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): calling update_counter() to get updated COUNTER value for " + package)
151 counter = self.update_counter()
152 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): updating COUNTER value in vdb entry for " + package)
153 counter_f = open(self._chroot_dir + "/var/db/pkg/" + package + "/COUNTER", "w")
154 counter_f.write(str(counter))
155 counter_f.close()
156 except:
157 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not update COUNTER for " + package)
158
134 # Create the image dir in the chroot 159 # Create the image dir in the chroot
135 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running 'mkdir -p " + self._chroot_dir + image_dir + "'") 160 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running 'mkdir -p " + self._chroot_dir + image_dir + "'")
136 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + image_dir, logfile=self._compile_logfile, append_log=True)): 161 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + image_dir, logfile=self._compile_logfile, append_log=True)):
137 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not create image dir for " + package) 162 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not create image dir for " + package)
138 163
139 # Create list of files for tar to work with from CONTENTS file in vdb entry 164 # Create list of files for tar to work with from CONTENTS file in vdb entry
140 entries = self.parse_vdb_contents("/var/db/pkg/" + package + "/CONTENTS") 165 entries = self.parse_vdb_contents("/var/db/pkg/" + package + "/CONTENTS")
141 if not entries: 166 if not entries:
142 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): no files for " + package + "...skipping tar and symlink fixup") 167 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): no files for " + package + "...skipping tar and symlink fixup")
143 else: 168 else:
144 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot: files for " + package + ": " + str(entries)) 169# if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot: files for " + package + ": " + str(entries))
145 try: 170 try:
146 tarfiles = open("/tmp/tarfilelist", "w") 171 tarfiles = open("/tmp/tarfilelist", "w")
147 for entry in entries: 172 for entry in entries:
148 parts = entry.split(" ") 173 parts = entry.split(" ")
149# # Hack for symlink crappiness 174# # Hack for symlink crappiness
159 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running 'tar -cp --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -xp'") 184 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running 'tar -cp --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -xp'")
160 if not GLIUtility.exitsuccess(GLIUtility.spawn("tar -cp --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -xp", logfile=self._compile_logfile, append_log=True)): 185 if not GLIUtility.exitsuccess(GLIUtility.spawn("tar -cp --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -xp", logfile=self._compile_logfile, append_log=True)):
161 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute tar for " + package) 186 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute tar for " + package)
162 187
163 # Fix mode, uid, and gid of directories 188 # Fix mode, uid, and gid of directories
164 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running find " + self._chroot_dir + image_dir + " -type d 2>/dev/null | sed -e 's:^" + self._chroot_dir + image_dir + "::' | grep -v '^$'") 189 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running find " + self._chroot_dir + image_dir + " -mindepth 1 -type d 2>/dev/null | sed -e 's:^" + self._chroot_dir + image_dir + "::' | grep -v '^$'")
165 dirlist = GLIUtility.spawn("find " + self._chroot_dir + image_dir + " -type d 2>/dev/null | sed -e 's:^" + self._chroot_dir + image_dir + "::' | grep -v '^$'", return_output=True)[1].strip().split("\n") 190 dirlist = GLIUtility.spawn("find " + self._chroot_dir + image_dir + " -mindepth 1 -type d 2>/dev/null | sed -e 's:^" + self._chroot_dir + image_dir + "::' | grep -v '^$'", return_output=True)[1].strip().split("\n")
166 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): found the following directories: " + str(dirlist)) 191 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): found the following directories: " + str(dirlist))
167 if not dirlist or dirlist[0] == "": 192 if not dirlist or dirlist[0] == "":
168 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "directory list entry for " + package + "...this shouldn't happen!") 193 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "directory list entry for " + package + "...this shouldn't happen!")
169 for dir in dirlist: 194 for dir in dirlist:
170 dirstat = os.stat(dir) 195 dirstat = os.stat(dir)
181# if not GLIUtility.exitsuccess(GLIUtility.spawn("mv " + self._chroot_dir + image_dir + symlinks[symlink] + " " + self._chroot_dir + image_dir + symlink)): 206# if not GLIUtility.exitsuccess(GLIUtility.spawn("mv " + self._chroot_dir + image_dir + symlinks[symlink] + " " + self._chroot_dir + image_dir + symlink)):
182# raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not fix " + symlink + " symlink ickiness for " + package) 207# raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not fix " + symlink + " symlink ickiness for " + package)
183 208
184 # Run pkg_setup 209 # Run pkg_setup
185 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running pkg_setup for " + package) 210 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running pkg_setup for " + package)
186 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild " + vdb_dir + package + "/*.ebuild setup", chroot=tmp_chroot_dir, logfile=self._compile_logfile, append_log=True)): 211 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " FEATURES=noauto ebuild " + vdb_dir + package + "/*.ebuild setup", chroot=tmp_chroot_dir, logfile=self._compile_logfile, append_log=True)):
187 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute pkg_setup for " + package) 212 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute pkg_setup for " + package)
188 213
189 # Run pkg_preinst 214 # Run pkg_preinst
190 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running preinst for " + package) 215 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running preinst for " + package)
191 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild " + vdb_dir + package + "/*.ebuild preinst", chroot=tmp_chroot_dir, logfile=self._compile_logfile, append_log=True)): 216 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " FEATURES=noauto ebuild " + vdb_dir + package + "/*.ebuild preinst", chroot=tmp_chroot_dir, logfile=self._compile_logfile, append_log=True)):
192 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute preinst for " + package) 217 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute preinst for " + package)
193 218
194 # Copy files from image_dir to chroot 219 # Copy files from image_dir to chroot
195 if not entries: 220 if not entries:
196 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): no files for " + package + "...skipping copy from image dir to /") 221 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): no files for " + package + "...skipping copy from image dir to /")
200 if not GLIUtility.exitsuccess(GLIUtility.spawn("tar -C " + self._chroot_dir + image_dir + "/ -cp . | tar -C " + self._chroot_dir + "/ -xp", logfile=self._compile_logfile, append_log=True)): 225 if not GLIUtility.exitsuccess(GLIUtility.spawn("tar -C " + self._chroot_dir + image_dir + "/ -cp . | tar -C " + self._chroot_dir + "/ -xp", logfile=self._compile_logfile, append_log=True)):
201 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy files from " + image_dir + " to / for " + package) 226 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy files from " + image_dir + " to / for " + package)
202 227
203 # Run pkg_postinst 228 # Run pkg_postinst
204 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running postinst for " + package) 229 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running postinst for " + package)
205 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild " + vdb_dir + package + "/*.ebuild postinst", chroot=tmp_chroot_dir, logfile=self._compile_logfile, append_log=True)): 230 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " FEATURES=noauto ebuild " + vdb_dir + package + "/*.ebuild postinst", chroot=tmp_chroot_dir, logfile=self._compile_logfile, append_log=True)):
206 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute postinst for " + package) 231 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute postinst for " + package)
207 232
208 # Remove image_dir 233 # Remove image_dir
209 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): removing " + image_dir + " for " + package) 234 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): removing " + image_dir + " for " + package)
210 if not GLIUtility.exitsuccess(GLIUtility.spawn("rm -rf " + self._chroot_dir + image_dir, logfile=self._compile_logfile, append_log=True)): 235 if not GLIUtility.exitsuccess(GLIUtility.spawn("rm -rf " + self._chroot_dir + image_dir, logfile=self._compile_logfile, append_log=True)):
246 return GLIUtility.spawn("portageq best_version / " + package, chroot=self._chroot_dir, return_output=True)[1].strip() 271 return GLIUtility.spawn("portageq best_version / " + package, chroot=self._chroot_dir, return_output=True)[1].strip()
247 272
248# def get_best_version_tree(self, package): 273# def get_best_version_tree(self, package):
249# return portage.best(tree.match(package)) 274# return portage.best(tree.match(package))
250 275
251 def emerge(self, packages, add_to_world=True): 276 def emerge(self, packages, grp_install=False, add_to_world=True):
252 if isinstance(packages, str): 277 if isinstance(packages, str):
253 packages = packages.split() 278 packages = packages.split()
254 self._cc.addNotification("progress", (0, "Calculating dependencies for " + " ".join(packages))) 279 self._cc.addNotification("progress", (0, "Calculating dependencies for " + " ".join(packages)))
255 pkglist = self.get_deps(packages) 280 pkglist = self.get_deps(packages, grp_install)
256 if self._debug: self._logger.log("install_packages(): pkglist is " + str(pkglist)) 281 if self._debug: self._logger.log("install_packages(): pkglist is " + str(pkglist))
257 for i, pkg in enumerate(pkglist): 282 for i, pkg in enumerate(pkglist):
258 if not pkg: continue 283 if not pkg: continue
259 if self._debug: self._logger.log("install_packages(): processing package " + pkg) 284 if self._debug: self._logger.log("install_packages(): processing package " + pkg)
260 self._cc.addNotification("progress", (float(i) / len(pkglist), "Emerging " + pkg + " (" + str(i+1) + "/" + str(len(pkglist)) + ")")) 285 self._cc.addNotification("progress", (float(i) / len(pkglist), "Emerging " + pkg + " (" + str(i+1) + "/" + str(len(pkglist)) + ")"))
261 if not self._grp_install or not self.get_best_version_vdb("=" + pkg): 286 if not grp_install or not self.get_best_version_vdb("=" + pkg):
262 status = GLIUtility.spawn("emerge -1 =" + pkg, display_on_tty8=True, chroot=self._chroot_dir, logfile=self._compile_logfile, append_log=True) 287 status = GLIUtility.spawn("emerge -1 =" + pkg, display_on_tty8=True, chroot=self._chroot_dir, logfile=self._compile_logfile, append_log=True)
263# status = self._emerge("=" + pkg) 288# status = self._emerge("=" + pkg)
264 if not GLIUtility.exitsuccess(status): 289 if not GLIUtility.exitsuccess(status):
265 raise GLIException("EmergePackageError", "fatal", "emerge", "Could not emerge " + pkg + "!") 290 raise GLIException("EmergePackageError", "fatal", "emerge", "Could not emerge " + pkg + "!")
266 else: 291 else:
287 by using files from the LiveCD. 312 by using files from the LiveCD.
288 313
289 -s|--stage3 Create a stage3 equivelant in the chroot directory by using 314 -s|--stage3 Create a stage3 equivelant in the chroot directory by using
290 files from the LiveCD. 315 files from the LiveCD.
291 316
317 -k|--kernel Install kernel and modules from LiveCD into the chroot
318
292 -h|--help Display this help 319 -h|--help Display this help
293""" % (progname) 320""" % (progname)
294 321
295if __name__ == "__main__": 322if __name__ == "__main__":
296 chroot_dir = "/mnt/gentoo" 323 chroot_dir = "/mnt/gentoo"
303 chroot_dir = sys.argv.pop(0) 330 chroot_dir = sys.argv.pop(0)
304 elif arg == "-g" or arg == "--grp": 331 elif arg == "-g" or arg == "--grp":
305 mode = "grp" 332 mode = "grp"
306 elif arg == "-s" or arg == "--stage3": 333 elif arg == "-s" or arg == "--stage3":
307 mode = "stage3" 334 mode = "stage3"
335 elif arg == "-k" or arg == "--kernel":
336 mode = "kernel"
308 elif arg == "-h" or arg == "--help": 337 elif arg == "-h" or arg == "--help":
309 usage(progname) 338 usage(progname)
310 sys.exit(0) 339 sys.exit(0)
311 elif arg[0] == "-": 340 elif arg[0] == "-":
312 usage(progname) 341 usage(progname)
374 elif mode == "grp": 403 elif mode == "grp":
375 for pkg in grp_packages: 404 for pkg in grp_packages:
376 if not gliportage.get_best_version_vdb(pkg): 405 if not gliportage.get_best_version_vdb(pkg):
377 print "Package " + pkg + " is not available for install from the LiveCD" 406 print "Package " + pkg + " is not available for install from the LiveCD"
378 continue 407 continue
379 pkglist = gliportage.get_deps(pkg) 408 pkglist = gliportage.get_deps(pkg, True)
380 for i, tmppkg in enumerate(pkglist): 409 for i, tmppkg in enumerate(pkglist):
381 print "Copying " + tmppkg + " (" + str(i+1) + "/" + str(len(pkglist)) + ")" 410 print "Copying " + tmppkg + " (" + str(i+1) + "/" + str(len(pkglist)) + ")"
382 gliportage.copy_pkg_to_chroot(tmppkg) 411 gliportage.copy_pkg_to_chroot(tmppkg)
383 gliportage.add_pkg_to_world(pkg) 412 gliportage.add_pkg_to_world(pkg)
384 print "GRP install complete!" 413 print "GRP install complete!"
414 elif mode == "kernel":
415 kernelpkg = gliportage.get_best_version_vdb("sys-kernel/livecd-kernel")
416 gliportage.copy_pkg_to_chroot(kernelpkg)
417 print "LiveCD kernel installed!"
385 else: 418 else:
386 print "You must specify an operating mode (-g or -s)!" 419 print "You must specify an operating mode (-g or -s)!"
387 usage(progname) 420 usage(progname)
388 sys.exit(1) 421 sys.exit(1)

Legend:
Removed from v.1339  
changed lines
  Added in v.1757

  ViewVC Help
Powered by ViewVC 1.1.20