Date: Tue, 21 Mar 2006 01:28:11 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 93676 for review Message-ID: <200603210128.k2L1SBBU090722@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=93676 Change 93676 by soc-andrew@soc-andrew_serv on 2006/03/21 01:27:44 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#13 integrate .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#7 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#11 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#7 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#15 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.542 2006/03/19 15:36:56 mux Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.543 2006/03/20 14:24:56 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -963,6 +963,10 @@ _generic_libs= gnu/lib +.if ${MK_IPX} != "no" +_prebuild_libs+= lib/libipx +.endif + .if ${MK_KERBEROS} != "no" _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libkrb5 @@ -971,7 +975,7 @@ .endif _prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libipx lib/libkiconv lib/libkvm lib/libmd \ + lib/libkiconv lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ lib/libsbuf lib/libtacplus lib/libutil \ ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#7 (text+ko) ==== @@ -83,6 +83,18 @@ -- App.state.target:cmds_install_srcs(cmds, App.conf.install_items) + --- Install the generic kernel + cmds:add { + cmdline = "${root}${TAR} -x " .. + "-f ${root}usr/${uname}/kernels/generic.tgz " .. + "-C ${root}${base}/usr", + replacements = { + base = base, + uname = POSIX.uname("%r") + } + } + + --- Install the ports tree if App.conf.install_ports == true then cmds:add{ cmdline = "${root}${TAR} -x " .. ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.213 2006/03/17 18:54:24 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.214 2006/03/20 14:24:57 ru Exp $ .include <bsd.own.mk> @@ -31,7 +31,7 @@ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ - libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ + ${_libipx} libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ libpmc ${_libpthread} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ @@ -61,8 +61,14 @@ _libsdp= libsdp .endif +.if ${MK_IPX} != "no" +_libipx= libipx +.endif + .if ${MACHINE_ARCH} == "i386" +.if ${MK_NCP} != "no" _libncp= libncp +.endif _libsmb= libsmb _libvgl= libvgl .endif @@ -88,7 +94,9 @@ .endif .if ${MACHINE_ARCH} == "amd64" +.if ${MK_NCP} != "no" _libncp= libncp +.endif _libsmb= libsmb .endif ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.19 2006/01/31 20:36:01 luigi Exp $ +# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.20 2006/03/20 14:24:57 ru Exp $ # # configuration file for "bridge" floppy. # Depending on your needs, almost surely you will need to @@ -19,6 +19,7 @@ # that to use the most compact possible version of the code. # buildopts -DNO_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH -DTRACEROUTE_NO_IPSEC -DNO_INET6 +buildopts -DWITHOUT_IPX # directories where to look for sources of various binaries. # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) @@ -179,6 +180,6 @@ libs -lufs # used by mount ### ee uses ncurses instead of curses libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm -libs -lmytinfo -lipx -lz -lpcap -lwrap +libs -lmytinfo -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses libs -lgeom ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.290 2006/03/17 18:54:38 ru Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.291 2006/03/20 14:24:58 ru Exp $ .include <bsd.own.mk> @@ -303,8 +303,10 @@ .endif .if ${MACHINE_ARCH} == "i386" +.if ${MK_NCP} != "no" _ncplist= ncplist _ncplogin= ncplogin +.endif _smbutil= smbutil .endif @@ -313,8 +315,10 @@ .endif .if ${MACHINE_ARCH} == "amd64" +.if ${MK_NCP} != "no" _ncplist= ncplist _ncplogin= ncplogin +.endif _smbutil= smbutil .endif ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.347 2006/03/17 18:54:39 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.348 2006/03/20 14:24:58 ru Exp $ .include <bsd.own.mk> @@ -66,7 +66,7 @@ iostat \ ip6addrctl \ ipfwpcap \ - IPXrouted \ + ${_IPXrouted} \ jail \ jexec \ jls \ @@ -237,6 +237,10 @@ _traceroute6= traceroute6 .endif +.if ${MK_IPX} != "no" +_IPXrouted= IPXrouted +.endif + .if ${MK_NIS} != "no" _rpc.yppasswdd= rpc.yppasswdd _rpc.ypupdated= rpc.ypupdated @@ -284,7 +288,9 @@ _kgmon= kgmon _kgzip= kgzip _lptcontrol= lptcontrol +.if ${MK_NCP} != "no" _mount_nwfs= mount_nwfs +.endif _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt @@ -331,7 +337,9 @@ _btxld= btxld _kgmon= kgmon _lptcontrol= lptcontrol +.if ${MK_NCP} != "no" _mount_nwfs= mount_nwfs +.endif _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603210128.k2L1SBBU090722>