From owner-cvs-all Fri Jan 17 11: 5:34 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FBA037B401; Fri, 17 Jan 2003 11:05:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA2A743EB2; Fri, 17 Jan 2003 11:05:32 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0HJ5Wfh033419; Fri, 17 Jan 2003 11:05:32 -0800 (PST) (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0HJ5WnF033418; Fri, 17 Jan 2003 11:05:32 -0800 (PST) Message-Id: <200301171905.h0HJ5WnF033418@repoman.freebsd.org> From: John Baldwin Date: Fri, 17 Jan 2003 11:05:32 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/sysinstall dispatch.c dist.c dist.h install.c menus.c sysinstall.h X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG jhb 2003/01/17 11:05:32 PST Modified files: usr.sbin/sysinstall dispatch.c dist.c dist.h install.c menus.c sysinstall.h Log: - Rename installFixupBin to installFixupBase to finish up the 'bin' to 'base' dist rename. - Rework struct dist to allow for different types of dists. There are currently three types of dists: DT_TARBALL, the traditonal gzipped and split tar file; DT_PACKAGE, a package; and DT_SUBDIST, a meta-dist in the tree that has its own array of dists as its contents. For example, the 'base' dist is a DT_TARBALL dist, the 'perl' dist is a DT_PACKAGE dist, and the 'src' dist is a DT_SUBDIST dist with its own dist table that contains 'sbase', 'ssys', etc. - Add helper macros for defining array entries for the different types of dists to try and make the statically defined dist table in dist.c more readable. - Split the logic to deal with a DT_TARBALL dist out of distExtract() and into its own distExtractTarball() function. distExtract() now calls other functions to extract each dist. - Tweak the percentage complete calculation in distExtractTarball() to do the multiply prior to the divide so it doesn't have to use floating point. - Axe the installPackage() function along with the special handling for the perl and XFree86 dists in distExtractAll() since distExtract() handles package dists directly now. - Add back in subdists for the X packages based on the split up packages that XFree86-4 uses that as closely map to the X dists we used with X 3.3.x. - Lots of things like distSetX() and the X dist masks are no longer #ifndef X_AS_PKG since we use them in both cases now. - Make the entire installFixupXFree() function #ifndef X_AS_PKG, we only call it in that case anyways, and it's not suitable for the X_AS_PKG case. - Add in X dist menus for the X_AS_PKG case. Approved by: re Revision Changes Path 1.45 +1 -1 src/usr.sbin/sysinstall/dispatch.c 1.218 +450 -431 src/usr.sbin/sysinstall/dist.c 1.56 +24 -1 src/usr.sbin/sysinstall/dist.h 1.339 +3 -16 src/usr.sbin/sysinstall/install.c 1.366 +82 -16 src/usr.sbin/sysinstall/menus.c 1.240 +5 -8 src/usr.sbin/sysinstall/sysinstall.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message