Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Dec 2011 22:13:13 +0100
From:      Alexander Leidinger <Alexander@Leidinger.net>
To:        emulation@freebsd.org
Cc:        Manolis Kiagias <manolis@FreeBSD.org>
Subject:   Re: cvs commit: doc/en_US.ISO8859-1/books/handbook/desktop chapter.sgml doc/en_US.ISO8859-1/books/handbook/linuxemu chapter.sgml
Message-ID:  <20111210221313.000064ae@unknown>
In-Reply-To: <20111210214025.0000445d@unknown>
References:  <201112072132.pB7LW6Aa042461@repoman.freebsd.org> <20111210214025.0000445d@unknown>

next in thread | previous in thread | raw e-mail | index | archive | help

[-- Attachment #1 --]
On Sat, 10 Dec 2011 21:40:25 +0100 Alexander Leidinger
<Alexander@Leidinger.net> wrote:

Restricting the audience a little bit...

> On Wed, 7 Dec 2011 21:32:06 +0000 (UTC) Manolis Kiagias
> <manolis@FreeBSD.org> wrote:

> >   Log:
> >   Use /compat/linux/proc instead of /usr/compat/linux/proc as the
> > mount point of linproc in the examples, since:
> >   
> >   - linux_base always installs to /compat and creates it as a
> > directory if it does not exist as a symlink
> >   - Custom installations (not done by sysinstall(8)) may not
> > have /compat at all

> I try to get some time to have a look at fixing the linux_base ports,
> but anyone is free to have a look too, as I'm not sure if I get enough
> time to fix them before the release.

Untested patch attached. I got the time to check the f10 port and come
up with something, but I don't have the time to test. It would be great
if someone could test it (as a port and as a package, don't forget to
(re)move /compat away).

Bye,
Alexander.

-- 
http://www.Leidinger.net    Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org       netchild @ FreeBSD.org  : PGP ID = 72077137
[-- Attachment #2 --]
diff -ruH ./Makefile /root/linux_base-f10-fix/Makefile
--- Makefile	2011-07-21 06:39:21.000000000 +0200
+++ Makefile	2011-12-10 22:02:03.018633853 +0100
@@ -202,10 +202,11 @@
 #
 # Handle the loading of the linux loadable kernel module if required.
 #
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 #
 # Do install without using linux rpm system
 #
+#	@if [ ${PREFIX} = /compat/linux -a ! -e /compat ]; then; ${LN} -sf /usr/compat /compat; fi
 	@cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/{}" \;
 	@cd ${WRKSRC} && ${FIND} * ! -type d \
 		| ${CPIO} -pm -R root:wheel ${PREFIX}
diff -ruH ./pkg-install /root/linux_base-f10-fix/pkg-install
--- pkg-install	2009-05-12 16:53:58.000000000 +0200
+++ pkg-install	2011-12-10 22:02:03.018633853 +0100
@@ -20,6 +20,12 @@
 			exit 1
 		fi
 	fi
+	if [ -n "${PKG_PREFIX}" -a ${PKG_PREFIX} = /compat/linux -a ! -e /compat ]; then
+		if [ ! -e /usr/compat ]; then
+			mkdir /usr/compat
+		fi
+		ln -sf /usr/compat /compat
+	fi
 	;;
 POST-INSTALL)
 	if [ -z "`grep ^linproc /etc/fstab`" ]; then

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111210221313.000064ae>