From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 01:06:28 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D3B91065694; Sat, 1 Jan 2011 01:06:28 +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 3C36D8FC0A; Sat, 1 Jan 2011 01:06:28 +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 p0116SAk094010; Sat, 1 Jan 2011 01:06:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0116SUK094004; Sat, 1 Jan 2011 01:06:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101010106.p0116SUK094004@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 1 Jan 2011 01:06:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216864 - in user/nwhitehorn/bsdinstall: distextract distfetch partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 01:06:28 -0000 Author: nwhitehorn Date: Sat Jan 1 01:06:27 2011 New Revision: 216864 URL: http://svn.freebsd.org/changeset/base/216864 Log: Fix build on powerpc and i386. Can now install a bootable system on powerpc that you can ssh into immediately after reboot, which sysinstall could never do. And that's it for 2010... Modified: user/nwhitehorn/bsdinstall/distextract/Makefile user/nwhitehorn/bsdinstall/distfetch/Makefile user/nwhitehorn/bsdinstall/distfetch/distfetch.c user/nwhitehorn/bsdinstall/partedit/Makefile user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Modified: user/nwhitehorn/bsdinstall/distextract/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/distextract/Makefile Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/distextract/Makefile Sat Jan 1 01:06:27 2011 (r216864) @@ -1,7 +1,7 @@ # $FreeBSD $ PROG= distextract -LDADD= -larchive -lncursesw -L/usr/local/lib -lcdialog +LDADD= -larchive -lncursesw -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include WARNS?= 6 Modified: user/nwhitehorn/bsdinstall/distfetch/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/distfetch/Makefile Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/distfetch/Makefile Sat Jan 1 01:06:27 2011 (r216864) @@ -1,7 +1,7 @@ # $FreeBSD $ PROG= distfetch -LDADD= -lfetch -lncursesw -L/usr/local/lib -lcdialog +LDADD= -lfetch -lncursesw -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include WARNS?= 6 Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c ============================================================================== --- user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sat Jan 1 01:06:27 2011 (r216864) @@ -116,7 +116,7 @@ fetch_files(int nfiles, char **urls) } if (ustat.size > 0) { - sprintf(status, "-%ld", (fsize*100)/ustat.size); + sprintf(status, "-%jd", (fsize*100)/ustat.size); items[i*2 + 1] = status; } Modified: user/nwhitehorn/bsdinstall/partedit/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/Makefile Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/partedit/Makefile Sat Jan 1 01:06:27 2011 (r216864) @@ -1,7 +1,7 @@ # $FreeBSD $ PROG= partedit -LDADD= -lgeom -lncursesw -lutil -L/usr/local/lib -lcdialog +LDADD= -lgeom -lncursesw -lutil -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include PARTEDIT_ARCH= ${MACHINE} Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sat Jan 1 01:06:27 2011 (r216864) @@ -117,7 +117,7 @@ gpart_activate(struct gprovider *pp) intmax_t index; /* - * Some partition scemes need this partition to be marked 'active' + * Some partition schemes need this partition to be marked 'active' * for it to be bootable. */ LIST_FOREACH(gc, &pp->lg_geom->lg_config, lg_config) { @@ -615,7 +615,7 @@ addpartform: gctl_ro_param(r, "flags", -1, GPART_FLAGS); gctl_ro_param(r, "verb", -1, "add"); gctl_ro_param(r, "type", -1, "freebsd-boot"); - snprintf(sizestr, sizeof(sizestr), "%zd", + snprintf(sizestr, sizeof(sizestr), "%jd", partcode_size(scheme) / sector); gctl_ro_param(r, "size", -1, sizestr); snprintf(startstr, sizeof(startstr), "%jd", firstfree);