From owner-svn-src-all@FreeBSD.ORG Wed Dec 22 14:49:18 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C43411065670; Wed, 22 Dec 2010 14:49:18 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B33E88FC24; Wed, 22 Dec 2010 14:49:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBMEnI5o017334; Wed, 22 Dec 2010 14:49:18 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEnIpj017332; Wed, 22 Dec 2010 14:49:18 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201012221449.oBMEnIpj017332@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 22 Dec 2010 14:49:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216661 - releng/8.2/release/powerpc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:49:18 -0000 Author: nwhitehorn Date: Wed Dec 22 14:49:18 2010 New Revision: 216661 URL: http://svn.freebsd.org/changeset/base/216661 Log: MFC r216469: Fix the overflowing livefs ISO by removing man pages from the HFS part of the hybrid disk. This is a stopgap until a better solution can be found, but lets the powerpc release build complete for the time being. Approved by: re (kensmith) Modified: releng/8.2/release/powerpc/mkisoimages.sh Directory Properties: releng/8.2/release/powerpc/ (props changed) Modified: releng/8.2/release/powerpc/mkisoimages.sh ============================================================================== --- releng/8.2/release/powerpc/mkisoimages.sh Wed Dec 22 14:47:45 2010 (r216660) +++ releng/8.2/release/powerpc/mkisoimages.sh Wed Dec 22 14:49:18 2010 (r216661) @@ -25,7 +25,7 @@ if [ "x$1" = "x-b" ]; then cp /usr/src/release/powerpc/boot.tbxi ${4}/boot - bootable="-hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map" + bootable="-hfs -hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map -hide-hfs ${4}/usr/share/man" shift else bootable="" @@ -54,4 +54,4 @@ fi LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -hfs -part -no-desktop -hfs-volid $LABEL -l -J -allow-leading-dots -o $NAME $* +mkisofs $bootable -l -r -part -no-desktop -V $LABEL -o $NAME $*