From 084fe7fb4f3e958768d105fb67084f946fcdeebd Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Nov 15 2007 17:46:35 +0000 Subject: - fix for BZ#250985. /dev/ is destroyed on next mock run if build fails. --- diff --git a/.cvsignore b/.cvsignore index f716c6e..ce2ff60 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mock-0.7.6.tar.gz +mock-0.7.7.tar.gz diff --git a/arch-specific-repo.patch b/arch-specific-repo.patch deleted file mode 100644 index 3227156..0000000 --- a/arch-specific-repo.patch +++ /dev/null @@ -1,333 +0,0 @@ ---- etc/fedora-4-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-4-ppc-core.cfg 2006-11-03 15:30:39.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc - - [local] - name=local ---- etc/fedora-5-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-5-i386-core.cfg 2006-11-03 15:43:12.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386 - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386 - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 - - [local] - name=local ---- etc/fedora-3-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-3-i386-core.cfg 2006-11-03 15:25:55.000000000 -0500 -@@ -19,11 +19,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386 - - - [groups] -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386 - - [local] - name=local ---- etc/fedora-5-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-5-x86_64-core.cfg 2006-11-03 15:46:11.000000000 -0500 -@@ -21,11 +21,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64 - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64 - - [groups] - name=groups -@@ -33,7 +33,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64 - - [local] - name=local ---- etc/fedora-5-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-5-ppc-core.cfg 2006-11-03 15:44:53.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc - - [local] - name=local ---- etc/fedora-6-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-6-x86_64-core.cfg 2006-11-03 15:50:34.000000000 -0500 -@@ -21,7 +21,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64 -+ -+[updates-released] -+name=updates -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64 - - [groups] - name=groups -@@ -29,7 +33,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64 - - [local] - name=local ---- etc/fedora-devel-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-devel-x86_64-core.cfg 2006-11-03 15:57:08.000000000 -0500 -@@ -21,7 +21,7 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 - - [groups] - name=groups -@@ -29,7 +29,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64 - - [local] - name=local ---- etc/fedora-4-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-4-x86_64-core.cfg 2006-11-03 15:31:21.000000000 -0500 -@@ -20,12 +20,12 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os - - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 - - [groups] - name=groups -@@ -33,6 +33,7 @@ - - [extras] - name=extras -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 - mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 - - [local] ---- etc/fedora-3-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-3-x86_64-core.cfg 2006-11-03 15:59:55.000000000 -0500 -@@ -19,12 +19,12 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os - - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64 - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64 - - [local] - name=local ---- etc/fedora-devel-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-devel-ppc-core.cfg 2006-11-03 15:56:39.000000000 -0500 -@@ -20,7 +20,7 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc - - [groups] - name=groups -@@ -28,7 +28,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc - - [local] - name=local ---- etc/fedora-devel-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-devel-i386-core.cfg 2006-11-03 15:55:54.000000000 -0500 -@@ -20,7 +20,7 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 - - [groups] - name=groups -@@ -28,7 +28,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386 - - [local] - name=local ---- etc/fedora-4-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-4-i386-core.cfg 2006-11-03 15:29:44.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386 - - - [groups] -@@ -33,7 +33,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386 - - [local] - name=local ---- etc/fedora-6-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-6-i386-core.cfg 2006-11-03 15:48:02.000000000 -0500 -@@ -20,7 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386 -+ -+[updates-released] -+name=updates -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386 - - [groups] - name=groups -@@ -28,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386 - - [local] - name=local ---- etc/fedora-6-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-6-ppc-core.cfg 2006-11-03 15:49:06.000000000 -0500 -@@ -20,7 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc -+ -+[updates-released] -+name=updates -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc - - [groups] - name=groups -@@ -28,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc - - [local] - name=local diff --git a/mock.spec b/mock.spec index f3282c0..715177d 100644 --- a/mock.spec +++ b/mock.spec @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.7.6 +Version: 0.7.7 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -68,6 +68,9 @@ fi %{_libdir}/libselinux-mock.so %changelog +* Mon Oct 22 2007 Michael Brown - 0.7.7-1 +- fix for BZ#250985. /dev/ is destroyed on next mock run if build fails. + * Mon Aug 27 2007 Michael Brown - 0.7.6-1 - ensure /etc/hosts is created in chroot properly diff --git a/sources b/sources index 3e828e8..1006140 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -35a5a771a32d93e8067ae3737456772b mock-0.7.6.tar.gz +459cdda4fe5b7bddd386554e32ebf83d mock-0.7.7.tar.gz