Dennis Gilmore
12 years ago
parent
9e57c29d6e
commit
02a1c68e95
@ -1,51 +0,0 @@
|
||||
From d7311cbd83546a168337df6d267d0f76b1e10fba Mon Sep 17 00:00:00 2001
|
||||
From: Jay Greguske <jgregusk@redhat.com>
|
||||
Date: Thu, 17 Feb 2011 15:13:30 -0500
|
||||
Subject: [PATCH] mount all of /dev
|
||||
|
||||
---
|
||||
builder/kojid | 21 +--------------------
|
||||
1 file changed, 1 insertion(+), 20 deletions(-)
|
||||
|
||||
diff --git a/builder/kojid b/builder/kojid
|
||||
index 92d40f1..a80ca9d 100755
|
||||
--- a/builder/kojid
|
||||
+++ b/builder/kojid
|
||||
@@ -1753,9 +1753,7 @@ class ImageTask(BaseTaskHandler):
|
||||
|
||||
# Here we configure mock to bind mount a set of /dev directories
|
||||
bind_opts = {'dirs' : {
|
||||
- '/dev/pts' : '/dev/pts',
|
||||
- '/dev/shm' : '/dev/shm',
|
||||
- '/dev/mapper' : '/dev/mapper',
|
||||
+ '/dev' : '/dev',
|
||||
'/selinux' : '/selinux'}
|
||||
}
|
||||
rootopts = {'install_group': inst_group,
|
||||
@@ -1769,23 +1767,6 @@ class ImageTask(BaseTaskHandler):
|
||||
# create the mock chroot
|
||||
self.logger.debug("Initializing image buildroot")
|
||||
broot.init()
|
||||
-
|
||||
- # Create the loopback devices we need
|
||||
- cmd = 'for i in $(seq 0 7); do mknod /dev/loop$i b 7 $i; done'
|
||||
- rv = broot.mock(['--chroot', cmd])
|
||||
- if rv:
|
||||
- broot.expire()
|
||||
- raise koji.LiveCDError, \
|
||||
- "Could not create loopback device files: %s" % parseStatus(rv, '"%s"' % cmd)
|
||||
-
|
||||
- # Create /dev/urandom
|
||||
- cmd = 'mknod /dev/urandom c 1 9'
|
||||
- rv = broot.mock(['--chroot', cmd])
|
||||
- if rv:
|
||||
- broot.expire()
|
||||
- raise koji.LiveCDError, \
|
||||
- "Could not create /dev/urandom: %s" % parseStatus(rv, '"%s"' % cmd)
|
||||
-
|
||||
self.logger.debug("Image buildroot ready: " + broot.rootdir())
|
||||
return broot
|
||||
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
From 19de74773d1e946c73161ac0d819812613463e47 Mon Sep 17 00:00:00 2001
|
||||
From: Mike McLean <mikem@redhat.com>
|
||||
Date: Wed, 6 Jun 2012 18:47:53 -0400
|
||||
Subject: [PATCH 03/22] in taginfo command, avoid passing (recently added)
|
||||
event opts unless needed (otherwise we get an error
|
||||
from older servers on plain taginfo commands)
|
||||
|
||||
---
|
||||
cli/koji | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/cli/koji b/cli/koji
|
||||
index c292f0f..01ca322 100755
|
||||
--- a/cli/koji
|
||||
+++ b/cli/koji
|
||||
@@ -4104,13 +4104,15 @@ def anon_handle_taginfo(options, session, args):
|
||||
parser.error(_("Please specify a tag"))
|
||||
assert False
|
||||
activate_session(session)
|
||||
- event = koji.util.eventFromOpts(session, options) or {}
|
||||
+ event = koji.util.eventFromOpts(session, options)
|
||||
+ event_opts = {}
|
||||
if event:
|
||||
event['timestr'] = time.asctime(time.localtime(event['ts']))
|
||||
print "Querying at event %(id)i (%(timestr)s)" % event
|
||||
+ event_opts['event'] = event['id']
|
||||
perms = dict([(p['id'], p['name']) for p in session.getAllPerms()])
|
||||
for tag in args:
|
||||
- info = session.getTag(tag, event=event.get('id'))
|
||||
+ info = session.getTag(tag, **event_opts)
|
||||
if info is None:
|
||||
print "No such tag: %s\n" % tag
|
||||
continue
|
||||
@@ -4124,8 +4126,8 @@ def anon_handle_taginfo(options, session, args):
|
||||
if session.mavenEnabled():
|
||||
print "Maven support?: %s" % (info['maven_support'] and 'yes' or 'no')
|
||||
print "Include all Maven archives?: %s" % (info['maven_include_all'] and 'yes' or 'no')
|
||||
- dest_targets = session.getBuildTargets(destTagID=info['id'], event=event.get('id'))
|
||||
- build_targets = session.getBuildTargets(buildTagID=info['id'], event=event.get('id'))
|
||||
+ dest_targets = session.getBuildTargets(destTagID=info['id'], **event_opts)
|
||||
+ build_targets = session.getBuildTargets(buildTagID=info['id'], **event_opts)
|
||||
repos = {}
|
||||
if not event:
|
||||
for target in dest_targets + build_targets:
|
||||
@@ -4149,13 +4151,13 @@ def anon_handle_taginfo(options, session, args):
|
||||
print "Targets that build from this tag:"
|
||||
for target in build_targets:
|
||||
print " %s" % target['name']
|
||||
- external_repos = session.getTagExternalRepos(tag_info=info['id'], event=event.get('id'))
|
||||
+ external_repos = session.getTagExternalRepos(tag_info=info['id'], **event_opts)
|
||||
if external_repos:
|
||||
print "External repos:"
|
||||
for rinfo in external_repos:
|
||||
print " %(priority)3i %(external_repo_name)s (%(url)s)" % rinfo
|
||||
print "Inheritance:"
|
||||
- for parent in session.getInheritanceData(tag, event=event.get('id')):
|
||||
+ for parent in session.getInheritanceData(tag, **event_opts):
|
||||
flags = ''
|
||||
for code,expr in (
|
||||
('M',parent['maxdepth'] is not None),
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
Loading…
Reference in new issue