rpms/mock/EL-5 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch, NONE, 1.1 mock.spec, 1.42, 1.43
Dennis Gilmore
ausil at fedoraproject.org
Fri Dec 18 16:43:26 UTC 2009
Author: ausil
Update of /cvs/extras/rpms/mock/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31257
Modified Files:
mock.spec
Added Files:
0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch
Log Message:
make the /dev/ptmx node rather than symlink as ther symlink is broken on EL-5 resulting in unbuildable gcc gdb and freinds
0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch:
backend.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch ---
>From 8e42cf66e3350adf829687ea284b74116931aab9 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 18 Dec 2009 10:32:51 -0600
Subject: [PATCH] EL-5 doesnt have a /dev/pts/ptmx node it only has the actual /dev/ptmx one
So lets make the node in the chroot. as gcc, gdb and freinds are unbuildibale without it
---
py/mock/backend.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/py/mock/backend.py b/py/mock/backend.py
index ef4d90b..97cd8e9 100644
--- a/py/mock/backend.py
+++ b/py/mock/backend.py
@@ -311,6 +311,7 @@ class Root(object):
(stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"),
(stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"),
(stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console"),
+ (stat.S_IFCHR | 0600, os.makedev(5, 2), "dev/ptmx"),
)
for i in devFiles:
# create node
@@ -324,7 +325,6 @@ class Root(object):
os.symlink("/proc/self/fd/0", self.makeChrootPath("dev/stdin"))
os.symlink("/proc/self/fd/1", self.makeChrootPath("dev/stdout"))
os.symlink("/proc/self/fd/2", self.makeChrootPath("dev/stderr"))
- os.symlink("/dev/pts/ptmx", self.makeChrootPath("dev/ptmx"))
os.umask(prevMask)
# mount/umount
--
1.6.5.2
Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- mock.spec 26 Nov 2009 05:20:52 -0000 1.42
+++ mock.spec 18 Dec 2009 16:43:26 -0000 1.43
@@ -11,10 +11,11 @@
Summary: Builds packages inside chroots
Name: mock
Version: %{release_version}
-Release: 1%{?dist}
+Release: 1%{?dist}.1
License: GPLv2+
Group: Development/Tools
Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
+Patch0: 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch
URL: http://fedoraproject.org/wiki/Projects/Mock
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -27,6 +28,7 @@ Mock takes a srpm and builds it in a chr
%prep
%setup -q
+%patch0 -p1
%if "%{?dist}" == ".fc8"
pushd etc/mock
sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -97,6 +99,10 @@ fi
%attr(02775, root, mock) %dir /var/cache/mock
%changelog
+* Fri Dec 18 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1.1
+- patch to create /dev/ptmx rather than symlink it the symlink
+- is broken on EL-5
+
* Wed Nov 25 2009 Clark Williams <williams at redhat.com>- 1.0.1-1
- Patch from Paul Howarth to fix intermittent problems generating
root cache tarball (BZ# 540997)
More information about the scm-commits
mailing list