From 7ebbae99790df9b04d62de928d07e1270accdad5 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 9 Jul 2008 07:21:03 +0000 Subject: [PATCH] Build the installer as part of normal build-/installworld if WANT_INSTALLER is set. Clean up nrelease/Makefile to define WANT_INSTALLER if the 'installer' target is specified. --- etc/defaults/make.conf | 5 ++++- etc/mtree/BSD.usr.dist | 4 +++- nrelease/Makefile | 35 +++++++---------------------------- share/Makefile | 6 +++++- share/installer/Makefile | 12 +++++------- share/man/man5/make.conf.5 | 7 +++++-- usr.sbin/Makefile | 6 +++++- usr.sbin/installer/Makefile | 4 +--- 8 files changed, 35 insertions(+), 44 deletions(-) diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index e58b661f42..0cc79fe4b1 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $ -# $DragonFly: src/etc/defaults/make.conf,v 1.34 2008/05/14 15:02:47 hasso Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.35 2008/07/09 07:21:03 swildner Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -171,6 +171,9 @@ THREAD_LIB?= thread_xu # #LOADER_TFTP_SUPPORT= YES # +# To build the installer as part of buildworld. +#WANT_INSTALLER=yes +# # If you want Kerberos 5, define this. #WANT_KERBEROS= yes # diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 0c947b9848..4814dd5ff3 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.40 2003/02/14 22:38:14 nectar Exp $ -# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.53 2008/04/10 10:21:00 hasso Exp $ +# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.54 2008/07/09 07:21:03 swildner Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -335,6 +335,8 @@ .. info .. + installer + .. isdn .. libg++ diff --git a/nrelease/Makefile b/nrelease/Makefile index 52c9d06c5f..6ee25a11a0 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/nrelease/Makefile,v 1.83 2008/07/02 05:40:43 corecode Exp $ +# $DragonFly: src/nrelease/Makefile,v 1.84 2008/07/09 07:21:03 swildner Exp $ # ######################################################################### @@ -14,7 +14,6 @@ installer_fetch: warning fetch .if make(installer_release) || make(installer_quickrel) || make(installer_realquickrel) || make(installer_fetch) WITH_INSTALLER= -WITH_LOCAL_INSTALLER= .endif # New method e.g. 'make installer fetch'. A series of enhancement @@ -35,7 +34,6 @@ WITH_GUI= .endif .if make(installer) WITH_INSTALLER= -WITH_LOCAL_INSTALLER= .endif ######################################################################### @@ -92,18 +90,7 @@ PKGSRC_PACKAGES+= modular-xorg-apps \ ROOTSKELS+= ${.CURDIR}/gui .endif -.if defined(WITH_INSTALLER) || defined(WITH_LOCAL_INSTALLER) -.if !defined(WITH_LOCAL_INSTALLER) -# note: the old dfuibe_install and curses depend on the old gettext and -# must be removed for the old gettext to be removed. The new dfuibe install -# and curses are named the same as the old. -# -OLD_PKGSRC_PACKAGES+= dfuibe_installer-1.1.6 gettext-lib-0.14.5 \ -# dfuibe_installer-1.1.7nb1 dfuife_curses-1.5 -PKGSRC_PACKAGES+= dfuibe_installer-1.1.7nb1.tgz dfuife_curses-1.5.tgz -PKGSRC_PACKAGES+= gettext-lib-0.14.6.tgz gettext-tools-0.14.6nb1.tgz -PKGSRC_PACKAGES+= libaura-3.1.tgz libdfui-4.2.tgz libinstaller-5.1.tgz -.endif +.if defined(WITH_INSTALLER) ROOTSKELS+= ${.CURDIR}/installer .endif @@ -121,13 +108,13 @@ KERNEL_CCVER ?= ${CCVER} # BASE ISO TARGETS # ######################################################################### -release: localinstaller check clean buildworld1 buildkernel1 \ +release: check clean buildworld1 buildkernel1 \ buildiso syssrcs customizeiso mklocatedb mkiso -quickrel: localinstaller check clean buildworld2 buildkernel2 \ +quickrel: check clean buildworld2 buildkernel2 \ buildiso syssrcs customizeiso mklocatedb mkiso -realquickrel: localinstaller check clean buildiso syssrcs customizeiso mklocatedb mkiso +realquickrel: check clean buildiso syssrcs customizeiso mklocatedb mkiso quick: quickrel @@ -136,10 +123,6 @@ realquick: realquickrel ######################################################################### # CORE SUPPORT TARGETS # ######################################################################### -localinstaller: -.if defined(WITH_LOCAL_INSTALLER) - cd ${.CURDIR}/../usr.sbin/installer; make -.endif check: .if !exists(${PKGBIN_PKG_ADD}) @@ -173,7 +156,7 @@ check: .endif buildworld1 buildworld2: - cd ${.CURDIR}/..; CCVER=${WORLD_CCVER} make ${.TARGET:C/build(.*)2/quick\1/:C/1//} + cd ${.CURDIR}/..; CCVER=${WORLD_CCVER} make ${WITH_INSTALLER:C/^/-DWANT_INSTALLER/} ${.TARGET:C/build(.*)2/quick\1/:C/1//} buildkernel1 buildkernel2: cd ${.CURDIR}/..; \ @@ -193,11 +176,7 @@ buildkernel1 buildkernel2: buildiso: if [ ! -d ${ISOROOT} ]; then mkdir -p ${ISOROOT}; fi if [ ! -d ${NRLOBJDIR}/nrelease ]; then mkdir -p ${NRLOBJDIR}/nrelease; fi - ( cd ${.CURDIR}/..; make DESTDIR=${ISOROOT} installworld ) -.if defined(WITH_LOCAL_INSTALLER) - ( cd ${.CURDIR}/../usr.sbin/installer; make DESTDIR=${ISOROOT} install ) - ( cd ${.CURDIR}/../share/installer; make DESTDIR=${ISOROOT} install ) -.endif + ( cd ${.CURDIR}/..; make ${WITH_INSTALLER:C/^/-DWANT_INSTALLER/} DESTDIR=${ISOROOT} installworld ) ( cd ${.CURDIR}/../etc; MAKEOBJDIRPREFIX=${NRLOBJDIR}/nrelease \ make -m ${.CURDIR}/../share/mk DESTDIR=${ISOROOT} distribution ) cpdup ${ISOROOT}/etc ${ISOROOT}/etc.hdd diff --git a/share/Makefile b/share/Makefile index 1bc9d78781..bcb3b12dd9 100644 --- a/share/Makefile +++ b/share/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD: src/share/Makefile,v 1.22.2.4 2002/03/12 17:13:32 phantom Exp $ -# $DragonFly: src/share/Makefile,v 1.5 2006/07/14 21:42:07 swildner Exp $ +# $DragonFly: src/share/Makefile,v 1.6 2008/07/09 07:21:03 swildner Exp $ # Do not include `info' in the SUBDIR list, it is handled separately. @@ -15,4 +15,8 @@ SUBDIR+= isdn SUBDIR+= sendmail .endif +.if defined(WANT_INSTALLER) +SUBDIR+= installer +.endif + .include diff --git a/share/installer/Makefile b/share/installer/Makefile index e181ca0722..4c6ac146ad 100644 --- a/share/installer/Makefile +++ b/share/installer/Makefile @@ -1,11 +1,9 @@ -# $DragonFly: src/share/installer/Makefile,v 1.1 2008/03/25 22:55:38 dave Exp $ +# $DragonFly: src/share/installer/Makefile,v 1.2 2008/07/09 07:21:03 swildner Exp $ -INSTALLER_DIR= ${.CURDIR}/../../contrib/bsdinstaller-1.1.6 -DDIR= ${DESTDIR}/usr/share/installer +.PATH: ${.CURDIR}/../../contrib/bsdinstaller-1.1.6/src/frontends/ncurses -beforeinstall: - if [ ! -d ${DDIR} ]; then mkdir ${DDIR}; fi - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 744 cmdnames.conf ${DDIR}/cmdnames.conf - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 744 ${INSTALLER_DIR}/src/frontends/ncurses/fred.txt ${DDIR}/fred.txt +FILES= cmdnames.conf fred.txt +NOOBJ= +FILESDIR= ${BINDIR}/installer .include diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 72f58481f9..d6c4b06679 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,9 +23,9 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ -.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.34 2008/07/08 15:12:36 thomas Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.35 2008/07/09 07:21:03 swildner Exp $ .\" -.Dd December 24, 2007 +.Dd July 8, 2008 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -601,6 +601,9 @@ This code is patented in the USA and many European countries. It is .Em "YOUR RESPONSIBILITY" to determine if you can legally use IDEA. +.It Va WANT_INSTALLER +.Pq Vt bool +Set to build the installer. .It Va WANT_KERBEROS .Pq Vt bool Set this to build Kerberos5 (KTH Heimdal). diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 49a4f3697a..57c96e51c0 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,6 +1,6 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 # $FreeBSD: src/usr.sbin/Makefile,v 1.183.2.14 2003/04/16 11:01:51 ru Exp $ -# $DragonFly: src/usr.sbin/Makefile,v 1.46 2008/05/27 07:46:57 dillon Exp $ +# $DragonFly: src/usr.sbin/Makefile,v 1.47 2008/07/09 07:21:03 swildner Exp $ .include "../sys/platform/${MACHINE_PLATFORM}/Makefile.inc" @@ -196,4 +196,8 @@ SUBDIR+=i4b SUBDIR+=boot0cfg .endif +.ifdef WANT_INSTALLER +SUBDIR+=installer +.endif + .include diff --git a/usr.sbin/installer/Makefile b/usr.sbin/installer/Makefile index 0cd33ec0a4..a970a6e5e9 100644 --- a/usr.sbin/installer/Makefile +++ b/usr.sbin/installer/Makefile @@ -1,7 +1,5 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $DragonFly: src/usr.sbin/installer/Makefile,v 1.2 2008/03/25 22:55:38 dave Exp $ +# $DragonFly: src/usr.sbin/installer/Makefile,v 1.3 2008/07/09 07:21:03 swildner Exp $ SUBDIR= libaura libdfui libinstaller dfuife_curses dfuibe_installer -CFLAGS+= -g .include -- 2.41.0