svn commit: r431465 - in head/emulators: linux_base-c6 linux_base-c7

Tijl Coosemans tijl at FreeBSD.org
Sat Jan 14 13:13:33 UTC 2017


Author: tijl
Date: Sat Jan 14 13:13:31 2017
New Revision: 431465
URL: https://svnweb.freebsd.org/changeset/ports/431465

Log:
  Don't use @dir for directories that may have filesystems mounted.  It may
  not be possible to change their mode and timestamp like @dir tries to do.
  
  PR:		215769
  MFH:		2017Q1

Modified:
  head/emulators/linux_base-c6/Makefile
  head/emulators/linux_base-c6/pkg-plist.i386
  head/emulators/linux_base-c6/pkg-plist.x86_64
  head/emulators/linux_base-c7/Makefile
  head/emulators/linux_base-c7/pkg-plist.i386
  head/emulators/linux_base-c7/pkg-plist.x86_64

Modified: head/emulators/linux_base-c6/Makefile
==============================================================================
--- head/emulators/linux_base-c6/Makefile	Sat Jan 14 12:48:30 2017	(r431464)
+++ head/emulators/linux_base-c6/Makefile	Sat Jan 14 13:13:31 2017	(r431465)
@@ -3,7 +3,7 @@
 
 PORTNAME=	c6
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 

Modified: head/emulators/linux_base-c6/pkg-plist.i386
==============================================================================
--- head/emulators/linux_base-c6/pkg-plist.i386	Sat Jan 14 12:48:30 2017	(r431464)
+++ head/emulators/linux_base-c6/pkg-plist.i386	Sat Jan 14 13:13:31 2017	(r431465)
@@ -2345,7 +2345,7 @@ usr/share/man/man8/wipefs.8.gz
 usr/tmp
 @rmtry var/cache/ldconfig/aux-cache
 var/mail
- at dir dev/shm
+ at dir dev
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/blkid
@@ -2363,10 +2363,8 @@ var/mail
 @dir lib/tls
 @dir mnt
 @dir opt
- at dir(,,555) proc
 @dir selinux
 @dir srv
- at dir(,,555) sys
 @dir usr/etc
 @dir usr/games
 @dir usr/lib/X11
@@ -2904,4 +2902,12 @@ var/mail
 @dir var/spool/mail
 @dir var/yp
 @dir %%LINUXBASE%%
+ at comment These directories may have filesystems mounted and then it may not be
+ at comment possible to change their mode and timestamp like @dir tries to do.
+ at postexec mkdir -p %D/dev/shm
+ at postunexec rmdir %D/dev/shm 2>/dev/null || true
+ at postexec mkdir -p %D/proc
+ at postunexec rmdir %D/proc 2>/dev/null || true
+ at postexec mkdir -p %D/sys
+ at postunexec rmdir %D/sys 2>/dev/null || true
 @postexec %D/sbin/ldconfig

Modified: head/emulators/linux_base-c6/pkg-plist.x86_64
==============================================================================
--- head/emulators/linux_base-c6/pkg-plist.x86_64	Sat Jan 14 12:48:30 2017	(r431464)
+++ head/emulators/linux_base-c6/pkg-plist.x86_64	Sat Jan 14 13:13:31 2017	(r431465)
@@ -2772,7 +2772,7 @@ usr/share/man/man8/x86_64.8.gz
 usr/tmp
 @rmtry var/cache/ldconfig/aux-cache
 var/mail
- at dir dev/shm
+ at dir dev
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/blkid
@@ -2792,10 +2792,8 @@ var/mail
 @dir lib64/tls
 @dir mnt
 @dir opt
- at dir(,,555) proc
 @dir selinux
 @dir srv
- at dir(,,555) sys
 @dir usr/etc
 @dir usr/games
 @dir usr/lib/games
@@ -3343,4 +3341,12 @@ var/mail
 @dir var/spool/mail
 @dir var/yp
 @dir %%LINUXBASE%%
+ at comment These directories may have filesystems mounted and then it may not be
+ at comment possible to change their mode and timestamp like @dir tries to do.
+ at postexec mkdir -p %D/dev/shm
+ at postunexec rmdir %D/dev/shm 2>/dev/null || true
+ at postexec mkdir -p %D/proc
+ at postunexec rmdir %D/proc 2>/dev/null || true
+ at postexec mkdir -p %D/sys
+ at postunexec rmdir %D/sys 2>/dev/null || true
 @postexec %D/sbin/ldconfig

Modified: head/emulators/linux_base-c7/Makefile
==============================================================================
--- head/emulators/linux_base-c7/Makefile	Sat Jan 14 12:48:30 2017	(r431464)
+++ head/emulators/linux_base-c7/Makefile	Sat Jan 14 13:13:31 2017	(r431465)
@@ -2,7 +2,7 @@
 
 PORTNAME=	c7
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 EXTRACT_ONLY=	${DISTFILES:N*.src.rpm*:Nfilesystem-*}

Modified: head/emulators/linux_base-c7/pkg-plist.i386
==============================================================================
--- head/emulators/linux_base-c7/pkg-plist.i386	Sat Jan 14 12:48:30 2017	(r431464)
+++ head/emulators/linux_base-c7/pkg-plist.i386	Sat Jan 14 13:13:31 2017	(r431465)
@@ -2572,7 +2572,7 @@ usr/tmp
 @rmtry var/cache/ldconfig/aux-cache
 var/db/Makefile
 var/mail
- at dir dev/shm
+ at dir dev
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/bash_completion.d
@@ -2589,9 +2589,7 @@ var/mail
 @dir etc/xinetd.d
 @dir mnt
 @dir opt
- at dir(,,555) proc
 @dir srv
- at dir(,,555) sys
 @dir usr/etc
 @dir usr/games
 @dir usr/include
@@ -3135,4 +3133,12 @@ var/mail
 @dir var/spool/mail
 @dir var/yp
 @dir %%LINUXBASE%%
+ at comment These directories may have filesystems mounted and then it may not be
+ at comment possible to change their mode and timestamp like @dir tries to do.
+ at postexec mkdir -p %D/dev/shm
+ at postunexec rmdir %D/dev/shm 2>/dev/null || true
+ at postexec mkdir -p %D/proc
+ at postunexec rmdir %D/proc 2>/dev/null || true
+ at postexec mkdir -p %D/sys
+ at postunexec rmdir %D/sys 2>/dev/null || true
 @postexec %D/usr/sbin/ldconfig

Modified: head/emulators/linux_base-c7/pkg-plist.x86_64
==============================================================================
--- head/emulators/linux_base-c7/pkg-plist.x86_64	Sat Jan 14 12:48:30 2017	(r431464)
+++ head/emulators/linux_base-c7/pkg-plist.x86_64	Sat Jan 14 13:13:31 2017	(r431465)
@@ -3022,7 +3022,7 @@ usr/tmp
 var/db/Makefile
 @rmtry var/cache/ldconfig/aux-cache
 var/mail
- at dir dev/shm
+ at dir dev
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/bash_completion.d
@@ -3039,9 +3039,7 @@ var/mail
 @dir etc/xinetd.d
 @dir mnt
 @dir opt
- at dir(,,555) proc
 @dir srv
- at dir(,,555) sys
 @dir usr/etc
 @dir usr/games
 @dir usr/include
@@ -3591,4 +3589,12 @@ var/mail
 @dir var/spool/mail
 @dir var/yp
 @dir %%LINUXBASE%%
+ at comment These directories may have filesystems mounted and then it may not be
+ at comment possible to change their mode and timestamp like @dir tries to do.
+ at postexec mkdir -p %D/dev/shm
+ at postunexec rmdir %D/dev/shm 2>/dev/null || true
+ at postexec mkdir -p %D/proc
+ at postunexec rmdir %D/proc 2>/dev/null || true
+ at postexec mkdir -p %D/sys
+ at postunexec rmdir %D/sys 2>/dev/null || true
 @postexec %D/usr/sbin/ldconfig


More information about the svn-ports-all mailing list