Date: Sun, 15 Jan 2017 10:39:55 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431543 - in branches/2017Q1/emulators: linux_base-c6 linux_base-c7 Message-ID: <201701151039.v0FAdt9w099020@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Jan 15 10:39:54 2017 New Revision: 431543 URL: https://svnweb.freebsd.org/changeset/ports/431543 Log: MFH: r431465 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 Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/emulators/linux_base-c6/Makefile branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 branches/2017Q1/emulators/linux_base-c7/Makefile branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/emulators/linux_base-c6/Makefile ============================================================================== --- branches/2017Q1/emulators/linux_base-c6/Makefile Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c6/Makefile Sun Jan 15 10:39:54 2017 (r431543) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- Modified: branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 ============================================================================== --- branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 Sun Jan 15 10:39:54 2017 (r431543) @@ -2345,7 +2345,7 @@ usr/share/man/man8/wipefs.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@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 -@dir(,,555) proc @dir selinux @dir srv -@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%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/sbin/ldconfig Modified: branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 ============================================================================== --- branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 Sun Jan 15 10:39:54 2017 (r431543) @@ -2772,7 +2772,7 @@ usr/share/man/man8/x86_64.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@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 -@dir(,,555) proc @dir selinux @dir srv -@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%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/sbin/ldconfig Modified: branches/2017Q1/emulators/linux_base-c7/Makefile ============================================================================== --- branches/2017Q1/emulators/linux_base-c7/Makefile Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c7/Makefile Sun Jan 15 10:39:54 2017 (r431543) @@ -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: branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 ============================================================================== --- branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 Sun Jan 15 10:39:54 2017 (r431543) @@ -2572,7 +2572,7 @@ usr/tmp @rmtry var/cache/ldconfig/aux-cache var/db/Makefile var/mail -@dir dev/shm +@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 -@dir(,,555) proc @dir srv -@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%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig Modified: branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 ============================================================================== --- branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 Sun Jan 15 10:39:54 2017 (r431543) @@ -3022,7 +3022,7 @@ usr/tmp var/db/Makefile @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@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 -@dir(,,555) proc @dir srv -@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%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701151039.v0FAdt9w099020>