cvs commit: src/etc/mtree BSD.root.dist src/include paths.h src/rescue Makefile README src/rescue/librescue Makefile src/rescue/rescue Makefile

[Thomas Moestl]

On Sun, 2003/06/29 at 11:35:37 -0700, Gordon Tetlow wrote:
> gordon      2003/06/29 11:35:37 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:
>     etc/mtree            BSD.root.dist 
>     include              paths.h 
>   Added files:
>     rescue               Makefile README 
>     rescue/librescue     Makefile 
>     rescue/rescue        Makefile 
>   Log:
>   Add /rescue bits. This basically encompasses all of bin and sbin along
>   with a couple of bits from usr.bin in a crunchgen'd binary.

A few comments:

> ###################################################################
> # Programs from standard /sbin
> #
> # WARNING: Changing this list may require adjusting
> # /usr/include/paths.h as well!  You were warned!
> #
> # Note that mdmfs and shutdown have their own private 'pathnames.h'
> # headers in addition to the standard 'paths.h' header.
> #
> CRUNCH_SRCDIRS+=$(.CURDIR)/../../sbin
> CRUNCH_PROGS+=atm adjkerntz atacontrol badsect camcontrol ccdconfig	\
> 	clri comcontrol conscontrol devfs disklabel dmesg dump		\
> 	dumpfs dumpon fdisk fore_dnld fsck fsck_ffs fsck_msdosfs fsdb	\
> 	fsirand gbde growfs ifconfig ilmid init ip6fw ipf ipfs ipfstat	\
> 	ipfw ipmon ipnat kldconfig kldload kldstat kldunload ldconfig 	\
> 	md5 mdconfig mdmfs mknod mount mount_cd9660 mount_ext2fs	\
> 	mount_msdosfs mount_nfs mount_ntfs mount_nullfs	mount_portalfs	\
> 	mount_std mount_udf mount_umapfs mount_unionfs natd newfs	\
> 	newfs_msdos nfsiod nos-tun ping ping6 quotacheck raidctl reboot	\
> 	restore rcorder route routed rtquery rtsol savecore shutdown	\
> 	slattach spppcontrol startslip swapon sysctl tunefs umount vinum

src/sbin/disklabel is not built any more; instead, /sbin/disklabel is a
link to /sbin/bsdlabel on i386, alpha and amd64. sparc64 additionally
needs src/sbin/sunlabel (and has no link to disklabel, just like the
remaining arches).

> .if ${MACHINE_ARCH} == "i386"
> CRUNCH_PROGS+= cxconfig mount_nwfs mount_smbfs
> .endif
> 
> .if ${MACHINE} == "pc98"
> CRUNCH_PROGS+= fdisk_pc98
> .endif

It seems that the binary produced from src/sbin/fdisk_pc98 is also
named named fdisk, so including src/sbin/fdisk should probably be
conditional for i386, ia64 and amd64 only.
 
> .if ${MACHINE_ARCH} == "ia64"
> CRUNCH_PROGS+= mca gpt
> .endif
> 
> .if ${MACHINE_ARCH} == "sparc"
> .endif

This should be "sparc64".

	- Thomas

-- 
Thomas Moestl <t.moestl at tu-bs.de>	http://www.tu-bs.de/~y0015675/
              <tmm at FreeBSD.org>		http://people.FreeBSD.org/~tmm/
PGP fingerprint: 1C97 A604 2BD0 E492 51D0  9C0F 1FE6 4F1D 419C 776C