From owner-svn-ports-all@FreeBSD.ORG Tue Nov 12 19:44:52 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE3BE62D; Tue, 12 Nov 2013 19:44:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 553462005; Tue, 12 Nov 2013 19:44:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACJipDD079656; Tue, 12 Nov 2013 19:44:51 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACJipgq079655; Tue, 12 Nov 2013 19:44:51 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201311121944.rACJipgq079655@svn.freebsd.org> From: Rene Ladan Date: Tue, 12 Nov 2013 19:44:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333605 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 19:44:53 -0000 Author: rene Date: Tue Nov 12 19:44:50 2013 New Revision: 333605 URL: http://svnweb.freebsd.org/changeset/ports/333605 Log: Do not try to remove /boot/modules, it is part of BSD.root.dist [1] While here unquote an instance of /boot/modules. Submitted by: antoine [1] Modified: head/Mk/Uses/kmod.mk Modified: head/Mk/Uses/kmod.mk ============================================================================== --- head/Mk/Uses/kmod.mk Tue Nov 12 19:42:05 2013 (r333604) +++ head/Mk/Uses/kmod.mk Tue Nov 12 19:44:50 2013 (r333605) @@ -24,7 +24,7 @@ CATEGORIES+= kld SSP_UNSAFE= kernel module does not support SSP KMODDIR?= /boot/modules -.if ${KMODDIR} == "/boot/kernel" +.if ${KMODDIR} == /boot/kernel KMODDIR= /boot/modules .endif PLIST_SUB+= KMODDIR="${KMODDIR:C,^/,,}" @@ -48,6 +48,8 @@ kmod-post-install: .if defined(NO_STAGE) /usr/sbin/kldxref ${KMODDIR} .endif +.if ${KMODDIR} != /boot/modules ${ECHO_CMD} "@unexec rmdir ${KMODDIR} 2>/dev/null || true" >> ${TMPPLIST} +.endif .endif