pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators Instead of creating links from ${EMULDIR}/de...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfca73e01934
branches:  trunk
changeset: 498202:dfca73e01934
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Aug 16 00:30:41 2005 +0000

description:
Instead of creating links from ${EMULDIR}/dev to /dev for things like
/dev/null, create them with MAKEDEV.  This avoids ugly problem with
realpath and readlink in linux binaries that try to fully resolve where
/dev/null lives.  Bump PKGREVISION to 7.

diffstat:

 emulators/suse91_base/Makefile |  10 +++++-----
 emulators/suse91_base/PLIST    |  12 +++++-------
 emulators/suse_base/Makefile   |  10 +++++-----
 emulators/suse_base/PLIST      |  13 ++++++-------
 4 files changed, 21 insertions(+), 24 deletions(-)

diffs (100 lines):

diff -r 3765e326442f -r dfca73e01934 emulators/suse91_base/Makefile
--- a/emulators/suse91_base/Makefile    Mon Aug 15 20:42:21 2005 +0000
+++ b/emulators/suse91_base/Makefile    Tue Aug 16 00:30:41 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/08/05 22:40:24 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/16 00:30:41 dmcmahill Exp $
 
 DISTNAME=              suse_base-${SUSE_VERSION}
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SUSE91}
 DISTFILES=             ${RPMFILES}
@@ -51,9 +51,9 @@
          ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \
        done
        ${INSTALL_DATA_DIR} ${EMULDIR}/dev
-       ${LN} -fs /dev/sound ${EMULDIR}/dev/dsp
-       ${LN} -fs /dev/null ${EMULDIR}/dev/null
-       ${LN} -fs /dev/tty ${EMULDIR}/dev/tty
+       ${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev
+       cd ${EMULDIR}/dev && ${SH} ./MAKEDEV  std audio
+       cd ${EMULDIR}/dev && ${LN} -fs sound dsp
        @${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
        ${RPM2PKG} ${RPM2PKGARGS}
        ${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC}
diff -r 3765e326442f -r dfca73e01934 emulators/suse91_base/PLIST
--- a/emulators/suse91_base/PLIST       Mon Aug 15 20:42:21 2005 +0000
+++ b/emulators/suse91_base/PLIST       Tue Aug 16 00:30:41 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/06/25 10:47:56 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/16 00:30:41 dmcmahill Exp $
 sbin/linux-mkpwd
 @unexec ${RM} -f %D/${EMULSUBDIR}/etc/ld.so.cache
 ${EMULSUBDIR}/etc/SuSE-release
@@ -8,10 +8,8 @@
 @dirrm ${EMULSUBDIR}/proc
 @unexec cd %D/${EMULSUBDIR}/etc && ${RM} -f group gshadow passwd shadow
 @exec ${MKDIR} %D/${EMULSUBDIR}/dev
-@exec ln -s /dev/sound %D/${EMULSUBDIR}/dev/dsp
-@unexec ${RM} -f %D/${EMULSUBDIR}/dev/dsp
-@exec ln -s /dev/null %D/${EMULSUBDIR}/dev/null
-@unexec ${RM} -f %D/${EMULSUBDIR}/dev/null
-@exec ln -s /dev/tty %D/${EMULSUBDIR}/dev/tty
-@unexec ${RM} -f %D/${EMULSUBDIR}/dev/tty
+@exec cp -p /dev/MAKEDEV  %D/${EMULSUBDIR}/dev
+@exec cd %D/${EMULSUBDIR}/dev && sh ./MAKEDEV std audio
+@exec cd %D/${EMULSUBDIR}/dev && ln -s sound dsp
+@unexec ${RM} -f %D/${EMULSUBDIR}/dev/*
 @dirrm ${EMULSUBDIR}/dev
diff -r 3765e326442f -r dfca73e01934 emulators/suse_base/Makefile
--- a/emulators/suse_base/Makefile      Mon Aug 15 20:42:21 2005 +0000
+++ b/emulators/suse_base/Makefile      Tue Aug 16 00:30:41 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2005/08/16 00:30:41 dmcmahill Exp $
 
 DISTNAME=              suse_base-${SUSE_VERSION}
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SUSE:=a1/} \
                        ${MASTER_SITE_SUSE_UPD:=a1/}
@@ -59,9 +59,9 @@
          ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \
        done
        ${INSTALL_DATA_DIR} ${EMULDIR}/dev
-       ${LN} -fs /dev/sound ${EMULDIR}/dev/dsp
-       ${LN} -fs /dev/null ${EMULDIR}/dev/null
-       ${LN} -fs /dev/tty ${EMULDIR}/dev/tty
+       ${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev
+       cd ${EMULDIR}/dev && ${SH} ./MAKEDEV  std audio
+       cd ${EMULDIR}/dev && ${LN} -fs sound dsp
        @${CP} ${WRKDIR}/PLIST ${PLIST_SRC}
        ${RPM2PKG} ${RPM2PKGARGS}
        ${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC}
diff -r 3765e326442f -r dfca73e01934 emulators/suse_base/PLIST
--- a/emulators/suse_base/PLIST Mon Aug 15 20:42:21 2005 +0000
+++ b/emulators/suse_base/PLIST Tue Aug 16 00:30:41 2005 +0000
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/19 11:37:11 cjs Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/08/16 00:30:41 dmcmahill Exp $
 sbin/linux-mkpwd
 @unexec ${RM} -f %D/@@EMULSUBDIR@@/etc/ld.so.cache
 @@EMULSUBDIR@@/etc/SuSE-release
 @@EMULSUBDIR@@/etc/ld.so.conf
 @unexec cd %D/@@EMULSUBDIR@@/etc && ${RM} -f group gshadow passwd shadow
 @exec ${MKDIR} %D/@@EMULSUBDIR@@/dev
-@exec ln -s /dev/sound %D/@@EMULSUBDIR@@/dev/dsp
-@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/dsp
-@exec ln -s /dev/null %D/@@EMULSUBDIR@@/dev/null
-@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/null
-@exec ln -s /dev/tty %D/@@EMULSUBDIR@@/dev/tty
-@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/tty
+@exec cp -p /dev/MAKEDEV  %D/@@EMULSUBDIR@@/dev
+@exec cd %D/@@EMULSUBDIR@@/dev && sh ./MAKEDEV std audio
+@exec cd %D/@@EMULSUBDIR@@/dev && ln -s sound dsp
+@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/*
 @dirrm @@EMULSUBDIR@@/dev
+



Home | Main Index | Thread Index | Old Index