Date: Wed, 19 Oct 2016 10:58:48 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424236 - head/emulators/linux_base-c6 Message-ID: <201610191058.u9JAwmta098688@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Oct 19 10:58:48 2016 New Revision: 424236 URL: https://svnweb.freebsd.org/changeset/ports/424236 Log: Since base r283461 /compat/linux/dev/shm must point to a tmpfs. Make /compat/linux/dev/shm a plain directory instead of a link to /tmp so we don't force users to mount tmpfs on /tmp. This also makes /dev/shm a separate namespace from /tmp. PR: 207769 Modified: head/emulators/linux_base-c6/Makefile head/emulators/linux_base-c6/pkg-message head/emulators/linux_base-c6/pkg-plist.i386 head/emulators/linux_base-c6/pkg-plist.x86_64 Modified: head/emulators/linux_base-c6/Makefile ============================================================================== --- head/emulators/linux_base-c6/Makefile Wed Oct 19 10:45:19 2016 (r424235) +++ head/emulators/linux_base-c6/Makefile Wed Oct 19 10:58:48 2016 (r424236) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- @@ -144,6 +144,7 @@ post-patch: .endif post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/dev/shm ${TOUCH} ${STAGEDIR}${PREFIX}/etc/mtab ${MV} ${STAGEDIR}${PREFIX}/etc/krb5.conf \ ${STAGEDIR}${PREFIX}/etc/krb5.conf.sample @@ -151,7 +152,6 @@ post-install: ${STAGEDIR}${PREFIX}/etc/nsswitch.conf.sample ${MV} ${STAGEDIR}${PREFIX}/usr/lib/locale/locale-archive.tmpl \ ${STAGEDIR}${PREFIX}/usr/lib/locale/locale-archive - ${LN} -sf /tmp ${STAGEDIR}${PREFIX}/dev/shm ${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp ${LN} -sf ../usr/bin/[ ${STAGEDIR}${PREFIX}/bin/[ ${LN} -sf ../usr/bin/expr ${STAGEDIR}${PREFIX}/bin/expr Modified: head/emulators/linux_base-c6/pkg-message ============================================================================== --- head/emulators/linux_base-c6/pkg-message Wed Oct 19 10:45:19 2016 (r424235) +++ head/emulators/linux_base-c6/pkg-message Wed Oct 19 10:58:48 2016 (r424236) @@ -1,6 +1,13 @@ -Some programs need linprocfs mounted on /compat/linux/proc. Add the following -line to /etc/fstab: +Some programs need linprocfs mounted on /compat/linux/proc. Add the +following line to /etc/fstab: linprocfs /compat/linux/proc linprocfs rw 0 0 -Then run "mount linprocfs". +Then run "mount /compat/linux/proc". + +Some programs need tmpfs mounted on /compat/linux/dev/shm. Add the +following line to /etc/fstab: + +tmpfs /compat/linux/dev/shm tmpfs rw,mode=1777 0 0 + +Then run "mount /compat/linux/dev/shm". Modified: head/emulators/linux_base-c6/pkg-plist.i386 ============================================================================== --- head/emulators/linux_base-c6/pkg-plist.i386 Wed Oct 19 10:45:19 2016 (r424235) +++ head/emulators/linux_base-c6/pkg-plist.i386 Wed Oct 19 10:58:48 2016 (r424236) @@ -57,7 +57,6 @@ bin/umount bin/uname bin/unlink bin/uuidgen -dev/shm etc/DIR_COLORS etc/DIR_COLORS.256color etc/DIR_COLORS.lightbgcolor @@ -2346,6 +2345,7 @@ usr/share/man/man8/wipefs.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail +@dir dev/shm @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/blkid Modified: head/emulators/linux_base-c6/pkg-plist.x86_64 ============================================================================== --- head/emulators/linux_base-c6/pkg-plist.x86_64 Wed Oct 19 10:45:19 2016 (r424235) +++ head/emulators/linux_base-c6/pkg-plist.x86_64 Wed Oct 19 10:58:48 2016 (r424236) @@ -57,7 +57,6 @@ bin/umount bin/uname bin/unlink bin/uuidgen -dev/shm etc/DIR_COLORS etc/DIR_COLORS.256color etc/DIR_COLORS.lightbgcolor @@ -2773,6 +2772,7 @@ usr/share/man/man8/x86_64.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail +@dir dev/shm @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/blkid
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610191058.u9JAwmta098688>