diff --git a/0001-mount-all-of-dev.patch b/0001-mount-all-of-dev.patch new file mode 100644 index 0000000..cf64bbf --- /dev/null +++ b/0001-mount-all-of-dev.patch @@ -0,0 +1,51 @@ +From d7311cbd83546a168337df6d267d0f76b1e10fba Mon Sep 17 00:00:00 2001 +From: Jay Greguske +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 + diff --git a/0022-only-try-to-make-dev-urandom-if-it-doesnt-already-ex.patch b/0022-only-try-to-make-dev-urandom-if-it-doesnt-already-ex.patch deleted file mode 100644 index 2323a52..0000000 --- a/0022-only-try-to-make-dev-urandom-if-it-doesnt-already-ex.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 79352bb36675888d765b2a1eef970ded459bcbc5 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Fri, 31 Aug 2012 00:13:16 -0500 -Subject: [PATCH 22/22] only try to make /dev/urandom if it doesnt already - exist - ---- - builder/kojid | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/builder/kojid b/builder/kojid -index 92d40f1..58720b4 100755 ---- a/builder/kojid -+++ b/builder/kojid -@@ -1779,7 +1779,7 @@ class ImageTask(BaseTaskHandler): - "Could not create loopback device files: %s" % parseStatus(rv, '"%s"' % cmd) - - # Create /dev/urandom -- cmd = 'mknod /dev/urandom c 1 9' -+ cmd = '[ ! -e /dev/urandom ] && (mknod /dev/urandom c 1 9)' - rv = broot.mock(['--chroot', cmd]) - if rv: - broot.expire() --- -1.7.11.4 - diff --git a/koji.spec b/koji.spec index 5cd546b..c896ae8 100644 --- a/koji.spec +++ b/koji.spec @@ -2,15 +2,15 @@ Name: koji Version: 1.7.0 -Release: 4%{?dist} +Release: 7%{?dist} License: LGPLv2 and GPLv2+ # koji.ssl libs (from plague) are GPLv2+ Summary: Build system tools Group: Applications/System URL: http://fedorahosted.org/koji Patch0: fedora-config.patch -Patch1: 0022-only-try-to-make-dev-urandom-if-it-doesnt-already-ex.patch -Patch2: 0003-in-taginfo-command-avoid-passing-recently-added-even.patch +Patch1: 0003-in-taginfo-command-avoid-passing-recently-added-even.patch +Patch2: 0001-mount-all-of-dev.patch Source: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -229,6 +229,9 @@ if [ $1 = 0 ]; then fi %changelog +* Sat Sep 01 2012 Dennis Gilmore - 1.7.0-7 +- add patch to mount all of /dev on appliances and lives + * Fri Aug 31 2012 Dennis Gilmore - 1.7.0-4 - add patch to only make /dev/urandom if it doesnt exist - add upstream patch for taginfo fixes with older servers