commit 8aa7f6d84ab5ea9e99e5d2d0ac723d925eb32c29
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Aug 31 19:03:52 2012 -0500
add the patch that we had previously had hotapplied in fedora infra
...t-for-live.patch => 0001-mount-all-of-dev.patch | 29 +++++++++++++++-----
koji.spec | 7 +++-
2 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/0001-remove-the-code-to-create-devices-in-chroot-for-live.patch
b/0001-mount-all-of-dev.patch
similarity index 50%
rename from 0001-remove-the-code-to-create-devices-in-chroot-for-live.patch
rename to 0001-mount-all-of-dev.patch
index b93a301..cf64bbf 100644
--- a/0001-remove-the-code-to-create-devices-in-chroot-for-live.patch
+++ b/0001-mount-all-of-dev.patch
@@ -1,17 +1,32 @@
-From 39dd9916d61a156c98ced30c070dc64d27d1eb19 Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis(a)ausil.us>
-Date: Fri, 31 Aug 2012 17:17:11 -0500
-Subject: [PATCH] remove the code to create devices in chroot for livecds
+From d7311cbd83546a168337df6d267d0f76b1e10fba Mon Sep 17 00:00:00 2001
+From: Jay Greguske <jgregusk(a)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..7114643 100755
+index 92d40f1..a80ca9d 100755
--- a/builder/kojid
+++ b/builder/kojid
-@@ -1770,22 +1770,6 @@ class ImageTask(BaseTaskHandler):
+@@ -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])
diff --git a/koji.spec b/koji.spec
index 0bfab26..3c6aa36 100644
--- a/koji.spec
+++ b/koji.spec
@@ -2,7 +2,7 @@
Name: koji
Version: 1.7.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: LGPLv2 and GPLv2+
# koji.ssl libs (from plague) are GPLv2+
Summary: Build system tools
@@ -12,7 +12,7 @@ Patch0: fedora-config.patch
Source0:
https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2
Source1: README.epel
Patch1: 0003-in-taginfo-command-avoid-passing-recently-added-even.patch
-Patch2: 0001-remove-the-code-to-create-devices-in-chroot-for-live.patch
+Patch2: 0001-mount-all-of-dev.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -235,6 +235,9 @@ if [ $1 = 0 ]; then
fi
%changelog
+* Sat Sep 01 2012 Dennis Gilmore <dennis(a)ausil.us> - 1.7.0-7
+- add the patch that we had previously had hotapplied in fedora infra
+
* Sat Sep 01 2012 Dennis Gilmore <dennis(a)ausil.us> - 1.7.0-6
- remove even trying to make devices i the chroots