From owner-p4-projects@FreeBSD.ORG  Mon Jul  4 08:50:11 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16E8C16A420; Mon,  4 Jul 2005 08:50:11 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DCA2F16A41C
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 08:50:10 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C630243D53
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 08:50:10 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j648oAxx070393
	for <perforce@freebsd.org>; Mon, 4 Jul 2005 08:50:10 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j648oATd070390
	for perforce@freebsd.org; Mon, 4 Jul 2005 08:50:10 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Mon, 4 Jul 2005 08:50:10 GMT
Message-Id: <200507040850.j648oATd070390@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79521 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 08:50:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=79521

Change 79521 by soc-andrew@soc-andrew_serv on 2005/07/04 08:49:29

	Add support to libinstaller to extract a distribution by name.
	Also sneak in the removal of unneeded libraries from the frontend.

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile.inc1#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/Makefile#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.c#1 add
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.h#1 add
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/Makefile#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/install_ncurses/Makefile#3 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile.inc1#2 (text+ko) ====

@@ -1,7 +1,7 @@
 BSD_INSTALLER_DIR=${.CURDIR}/../../../contrib/bsdinstaller
 LIB_DIR=${BSD_INSTALLER_DIR}/lib
 
-CFLAGS+=-I${LIB_DIR}
+CFLAGS+=-I${LIB_DIR} -I${.CURDIR}/..
 
 AURA_DIR=${LIB_DIR}/aura
 DFUI_DIR=${LIB_DIR}/dfui

==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/Makefile#3 (text+ko) ====

@@ -3,7 +3,7 @@
 SRCS=commands.c confed.c diskutil.c functions.c \
      mount.c package.c survey.c uiutil.c
 
-SRCS+=extract.c
+SRCS+=dist.c extract.c
 
 SHLIB_MAJOR=5
 

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/Makefile#3 (text+ko) ====

@@ -9,6 +9,7 @@
 
 LDADD+=${LIB_AURA} ${LIB_DFUI} ${LIB_INSTALLER}
 LDADD+=-larchive -lbz2 -lz
+LDADD+=-lutil
 
 .PATH: ${BSD_INSTALLER_DIR}/backend/installer
 

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/install_ncurses/Makefile#3 (text+ko) ====

@@ -7,9 +7,8 @@
 
 .include "../Makefile.inc1"
 
-LDADD+=${LIB_AURA} ${LIB_DFUI} ${LIB_INSTALLER} \
-       -lpanel -lcurses
-LDADD+=-larchive -lbz2 -lz
+LDADD=${LIB_AURA} ${LIB_DFUI}
+LDADD+=-lpanel -lcurses
 
 .PATH: ${BSD_INSTALLER_DIR}/frontends/ncurses