PERFORCE change 57492 for review
Peter Wemm
peter at FreeBSD.org
Fri Jul 16 14:12:10 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=57492
Change 57492 by peter at peter_overcee on 2004/07/16 21:11:27
IFC @57490
Affected files ...
.. //depot/projects/hammer/Makefile#20 integrate
.. //depot/projects/hammer/UPDATING#46 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#1 branch
.. //depot/projects/hammer/include/Makefile#26 integrate
.. //depot/projects/hammer/include/proc_service.h#1 branch
.. //depot/projects/hammer/include/wchar.h#15 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#15 integrate
.. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#12 integrate
.. //depot/projects/hammer/lib/libc/stdio/fgetln.3#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/fgetln.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/fgetwln.3#1 branch
.. //depot/projects/hammer/lib/libc/stdio/fgetwln.c#1 branch
.. //depot/projects/hammer/lib/libc/stdio/local.h#12 integrate
.. //depot/projects/hammer/lib/libc/sys/getfsstat.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/recv.2#5 integrate
.. //depot/projects/hammer/lib/libthread_db/Makefile#1 branch
.. //depot/projects/hammer/lib/libthread_db/include/thread_db.h#1 branch
.. //depot/projects/hammer/lib/libthread_db/include/thread_db_int.h#1 branch
.. //depot/projects/hammer/lib/libthread_db/pthread/Makefile#1 branch
.. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.h#1 branch
.. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db_i386.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/src/Makefile#1 branch
.. //depot/projects/hammer/lib/libthread_db/src/thread_db.c#1 branch
.. //depot/projects/hammer/lib/msun/src/math.h#20 integrate
.. //depot/projects/hammer/release/Makefile#49 integrate
.. //depot/projects/hammer/release/alpha/mkisoimages.sh#4 integrate
.. //depot/projects/hammer/release/amd64/mkisoimages.sh#5 integrate
.. //depot/projects/hammer/release/i386/mkisoimages.sh#5 integrate
.. //depot/projects/hammer/release/ia64/mkisoimages.sh#5 integrate
.. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#19 integrate
.. //depot/projects/hammer/release/sparc64/mkisoimages.sh#6 integrate
.. //depot/projects/hammer/share/examples/Makefile#5 integrate
.. //depot/projects/hammer/share/examples/kld/cdev/module/cdev.c#3 integrate
.. //depot/projects/hammer/share/examples/kld/cdev/module/cdevmod.c#3 integrate
.. //depot/projects/hammer/share/examples/worm/README#2 delete
.. //depot/projects/hammer/share/examples/worm/makecdfs.sh#2 delete
.. //depot/projects/hammer/share/man/man4/fdc.4#3 integrate
.. //depot/projects/hammer/share/man/man4/mac_biba.4#5 integrate
.. //depot/projects/hammer/share/man/man4/mac_mls.4#7 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#31 integrate
.. //depot/projects/hammer/sys/alpha/alpha/promcons.c#10 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#9 integrate
.. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#11 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#93 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#13 integrate
.. //depot/projects/hammer/sys/cam/cam_periph.h#3 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#11 integrate
.. //depot/projects/hammer/sys/coda/coda_fbsd.c#10 integrate
.. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#13 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#11 integrate
.. //depot/projects/hammer/sys/conf/NOTES#54 integrate
.. //depot/projects/hammer/sys/conf/files#72 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#51 integrate
.. //depot/projects/hammer/sys/conf/files.i386#37 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#43 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#14 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#16 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#5 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#13 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_mem.c#5 integrate
.. //depot/projects/hammer/sys/dev/cx/if_cx.c#14 integrate
.. //depot/projects/hammer/sys/dev/cy/cy.c#11 integrate
.. //depot/projects/hammer/sys/dev/dcons/dcons.c#8 integrate
.. //depot/projects/hammer/sys/dev/digi/digi.c#16 integrate
.. //depot/projects/hammer/sys/dev/fb/fb.c#7 integrate
.. //depot/projects/hammer/sys/dev/fb/splashreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#9 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#1 branch
.. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#4 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#3 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#28 integrate
.. //depot/projects/hammer/sys/dev/harp/if_harp.c#5 integrate
.. //depot/projects/hammer/sys/dev/hfa/hfa_freebsd.c#5 integrate
.. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#6 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#33 integrate
.. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#15 integrate
.. //depot/projects/hammer/sys/dev/null/null.c#12 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#14 integrate
.. //depot/projects/hammer/sys/dev/ofw/openpromio.c#5 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev.c#17 integrate
.. //depot/projects/hammer/sys/dev/rc/rc.c#13 integrate
.. //depot/projects/hammer/sys/dev/rp/rp.c#14 integrate
.. //depot/projects/hammer/sys/dev/sab/sab.c#18 integrate
.. //depot/projects/hammer/sys/dev/si/si.c#13 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#39 integrate
.. //depot/projects/hammer/sys/dev/snp/snp.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/driver.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ess.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/gusc.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/mss.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csa.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#14 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/neomagic.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/solo.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#12 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#5 integrate
.. //depot/projects/hammer/sys/dev/streams/streams.c#9 integrate
.. //depot/projects/hammer/sys/dev/sx/sx.c#9 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#21 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.h#4 integrate
.. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#8 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_tty.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/ubser.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/ucom.c#16 integrate
.. //depot/projects/hammer/sys/dev/utopia/utopia.c#6 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinum.c#12 integrate
.. //depot/projects/hammer/sys/dev/zs/zs.c#13 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#6 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#11 integrate
.. //depot/projects/hammer/sys/geom/gate/g_gate.c#6 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#18 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#45 integrate
.. //depot/projects/hammer/sys/i386/i386/swtch.s#11 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#5 integrate
.. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#11 integrate
.. //depot/projects/hammer/sys/i386/isa/vesa.c#8 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#17 integrate
.. //depot/projects/hammer/sys/i4b/include/i4b_global.h#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#30 integrate
.. //depot/projects/hammer/sys/ia64/ia64/ssc.c#8 integrate
.. //depot/projects/hammer/sys/ia64/include/pmap.h#13 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#5 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#28 integrate
.. //depot/projects/hammer/sys/kern/kern_module.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_prot.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#45 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#36 integrate
.. //depot/projects/hammer/sys/kern/kern_syscalls.c#3 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#58 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#22 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#39 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#23 integrate
.. //depot/projects/hammer/sys/kern/subr_prof.c#11 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#23 integrate
.. //depot/projects/hammer/sys/kern/tty.c#22 integrate
.. //depot/projects/hammer/sys/kern/tty_conf.c#7 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#19 integrate
.. //depot/projects/hammer/sys/kern/tty_subr.c#5 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#33 integrate
.. //depot/projects/hammer/sys/kern/vfs_init.c#8 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#46 integrate
.. //depot/projects/hammer/sys/libkern/qsort.c#5 integrate
.. //depot/projects/hammer/sys/libkern/qsort_r.c#1 branch
.. //depot/projects/hammer/sys/modules/fdc/Makefile#7 integrate
.. //depot/projects/hammer/sys/modules/sound/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/sound/pcm/Makefile#3 delete
.. //depot/projects/hammer/sys/modules/sound/sound/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if_disc.c#12 integrate
.. //depot/projects/hammer/sys/net/if_ef.c#10 integrate
.. //depot/projects/hammer/sys/net/if_faith.c#15 integrate
.. //depot/projects/hammer/sys/net/if_gif.c#16 integrate
.. //depot/projects/hammer/sys/net/if_gre.c#18 integrate
.. //depot/projects/hammer/sys/net/if_loop.c#20 integrate
.. //depot/projects/hammer/sys/net/if_ppp.c#15 integrate
.. //depot/projects/hammer/sys/net/if_sl.c#15 integrate
.. //depot/projects/hammer/sys/net/if_spppsubr.c#15 integrate
.. //depot/projects/hammer/sys/net/if_stf.c#15 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#19 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#18 integrate
.. //depot/projects/hammer/sys/net/ppp_tty.c#8 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#16 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ppp.c#8 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#22 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#32 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#19 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#17 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_fw.c#9 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#12 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#20 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fdc_cbus.c#2 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#28 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#25 integrate
.. //depot/projects/hammer/sys/rpc/rpcclnt.c#8 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#26 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.h#5 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#26 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#26 integrate
.. //depot/projects/hammer/sys/sys/exec.h#5 integrate
.. //depot/projects/hammer/sys/sys/libkern.h#8 integrate
.. //depot/projects/hammer/sys/sys/proc.h#58 integrate
.. //depot/projects/hammer/sys/sys/procfs.h#3 integrate
.. //depot/projects/hammer/sys/sys/resourcevar.h#10 integrate
.. //depot/projects/hammer/sys/sys/socket.h#13 integrate
.. //depot/projects/hammer/sys/sys/systm.h#21 integrate
.. //depot/projects/hammer/sys/sys/tty.h#14 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#39 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#29 integrate
.. //depot/projects/hammer/usr.bin/basename/basename.c#3 integrate
.. //depot/projects/hammer/usr.bin/checknr/checknr.c#3 integrate
.. //depot/projects/hammer/usr.bin/col/col.1#3 integrate
.. //depot/projects/hammer/usr.bin/colcrt/colcrt.1#3 integrate
.. //depot/projects/hammer/usr.bin/colcrt/colcrt.c#3 integrate
.. //depot/projects/hammer/usr.bin/colrm/colrm.1#2 integrate
.. //depot/projects/hammer/usr.bin/column/column.1#2 integrate
.. //depot/projects/hammer/usr.bin/column/column.c#2 integrate
.. //depot/projects/hammer/usr.bin/du/du.c#8 integrate
.. //depot/projects/hammer/usr.bin/fmt/fmt.c#2 integrate
.. //depot/projects/hammer/usr.bin/hexdump/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/hexdump/conv.c#4 integrate
.. //depot/projects/hammer/usr.bin/jot/jot.c#3 integrate
.. //depot/projects/hammer/usr.bin/killall/killall.c#9 integrate
.. //depot/projects/hammer/usr.bin/lockf/lockf.c#2 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.c#4 integrate
.. //depot/projects/hammer/usr.bin/rev/rev.c#3 integrate
.. //depot/projects/hammer/usr.bin/rs/rs.c#2 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.c#16 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.h#9 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#3 integrate
.. //depot/projects/hammer/usr.bin/tar/read.c#9 integrate
.. //depot/projects/hammer/usr.bin/ul/ul.1#4 integrate
.. //depot/projects/hammer/usr.bin/whereis/whereis.c#3 integrate
.. //depot/projects/hammer/usr.bin/xstr/xstr.c#4 integrate
.. //depot/projects/hammer/usr.sbin/amd/include/config.h#4 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.8#8 integrate
.. //depot/projects/hammer/usr.sbin/ppp/command.c#6 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#5 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#5 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd_lock.c#6 integrate
.. //depot/projects/hammer/usr.sbin/usbd/usbd.conf.5#3 integrate
Differences ...
==== //depot/projects/hammer/Makefile#20 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.300 2004/07/09 13:55:50 phk Exp $
+# $FreeBSD: src/Makefile,v 1.301 2004/07/16 02:51:28 marcel Exp $
#
# The user-driven targets are:
#
@@ -144,14 +144,17 @@
# Set a reasonable default
.MAIN: all
+.if defined(DESTDIR)
.if make(world)
STARTTIME!= LC_ALL=C date
.endif
#
# world
#
-# Attempt to rebuild and reinstall *everything*, with reasonable chance of
-# success, regardless of how old your existing system is.
+# Attempt to rebuild and reinstall everything. This target is not to be
+# used for upgrading an existing FreeBSD system, because the kernel is
+# not included. One can argue that this target doesn't build everything
+# then.
#
world: upgrade_checks
@echo "--------------------------------------------------------------"
@@ -178,6 +181,17 @@
@echo ">>> make world completed on `LC_ALL=C date`"
@echo " (started ${STARTTIME})"
@echo "--------------------------------------------------------------"
+.else
+world:
+ @echo "WARNING: make world will overwrite your existing FreeBSD"
+ @echo "installation without also building and installing a new"
+ @echo "kernel. This can be dangerous. Please read the handbook,"
+ @echo "'Using make world', for how to upgrade your system."
+ @echo "Define DESTDIR to the where you want to install FreeBSD,
+ @echo "including /, to override this warning and proceed as usual."
+ @echo "Bailing out now..."
+ @false
+.endif
#
# kernel
==== //depot/projects/hammer/UPDATING#46 (text+ko) ====
@@ -17,6 +17,11 @@
developers choose to disable these features on build machines
to maximize performance.
+20040716:
+ The sound device drivers are renamed. `sound' is always required,
+ while `snd_*' should be configured accordingly to your hardware.
+ Refer to NOTES for the detail of the drivers.
+
20040710:
__FreeBSD_version bumped to 502122.
@@ -1714,4 +1719,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $
+$FreeBSD: src/UPDATING,v 1.326 2004/07/16 04:04:29 tanimura Exp $
==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/config.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.2 2004/07/16 05:03:41 marcel Exp $ */
/* config.h. Generated automatically by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
@@ -502,7 +502,7 @@
#define HAVE_FPREGSET_T 1
/* Define if <sys/procfs.h> has prgregset_t. */
-/* #undef HAVE_PRGREGSET_T */
+#define HAVE_PRGREGSET_T 1
/* Define if <sys/procfs.h> has prfpregset_t. */
#define HAVE_PRFPREGSET_T 1
@@ -517,7 +517,7 @@
#define HAVE_LWPID_T 1
/* Define if <sys/procfs.h> has psaddr_t. */
-/* #undef HAVE_PSADDR_T */
+#define HAVE_PSADDR_T 1
/* Define if <sys/procfs.h> has prsysent_t. */
/* #undef HAVE_PRSYSENT_T */
==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/config.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */
/* config.h. Generated automatically by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
@@ -502,7 +502,7 @@
#define HAVE_FPREGSET_T 1
/* Define if <sys/procfs.h> has prgregset_t. */
-/* #undef HAVE_PRGREGSET_T */
+#define HAVE_PRGREGSET_T 1
/* Define if <sys/procfs.h> has prfpregset_t. */
#define HAVE_PRFPREGSET_T 1
@@ -517,7 +517,7 @@
#define HAVE_LWPID_T 1
/* Define if <sys/procfs.h> has psaddr_t. */
-/* #undef HAVE_PSADDR_T */
+#define HAVE_PSADDR_T 1
/* Define if <sys/procfs.h> has prsysent_t. */
/* #undef HAVE_PRSYSENT_T */
==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/config.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */
/* config.h. Generated automatically by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
@@ -502,7 +502,7 @@
#define HAVE_FPREGSET_T 1
/* Define if <sys/procfs.h> has prgregset_t. */
-/* #undef HAVE_PRGREGSET_T */
+#define HAVE_PRGREGSET_T 1
/* Define if <sys/procfs.h> has prfpregset_t. */
#define HAVE_PRFPREGSET_T 1
@@ -517,7 +517,7 @@
#define HAVE_LWPID_T 1
/* Define if <sys/procfs.h> has psaddr_t. */
-/* #undef HAVE_PSADDR_T */
+#define HAVE_PSADDR_T 1
/* Define if <sys/procfs.h> has prsysent_t. */
/* #undef HAVE_PRSYSENT_T */
==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/config.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */
/* config.h. Generated automatically by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
@@ -502,7 +502,7 @@
#define HAVE_FPREGSET_T 1
/* Define if <sys/procfs.h> has prgregset_t. */
-/* #undef HAVE_PRGREGSET_T */
+#define HAVE_PRGREGSET_T 1
/* Define if <sys/procfs.h> has prfpregset_t. */
#define HAVE_PRFPREGSET_T 1
@@ -517,7 +517,7 @@
#define HAVE_LWPID_T 1
/* Define if <sys/procfs.h> has psaddr_t. */
-/* #undef HAVE_PSADDR_T */
+#define HAVE_PSADDR_T 1
/* Define if <sys/procfs.h> has prsysent_t. */
/* #undef HAVE_PRSYSENT_T */
==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/config.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.1 2004/06/25 06:48:54 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */
/* config.h. Generated automatically by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
@@ -502,7 +502,7 @@
#define HAVE_FPREGSET_T 1
/* Define if <sys/procfs.h> has prgregset_t. */
-/* #undef HAVE_PRGREGSET_T */
+#define HAVE_PRGREGSET_T 1
/* Define if <sys/procfs.h> has prfpregset_t. */
#define HAVE_PRFPREGSET_T 1
@@ -517,7 +517,7 @@
#define HAVE_LWPID_T 1
/* Define if <sys/procfs.h> has psaddr_t. */
-/* #undef HAVE_PSADDR_T */
+#define HAVE_PSADDR_T 1
/* Define if <sys/procfs.h> has prsysent_t. */
/* #undef HAVE_PRSYSENT_T */
==== //depot/projects/hammer/include/Makefile#26 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.216 2004/07/05 23:13:16 das Exp $
+# $FreeBSD: src/include/Makefile,v 1.217 2004/07/15 03:43:18 davidxu Exp $
#
# Doing a "make install" builds /usr/include.
@@ -12,7 +12,7 @@
inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \
netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \
- pthread.h \
+ proc_service.h pthread.h \
pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \
stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \
==== //depot/projects/hammer/include/wchar.h#15 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/wchar.h,v 1.41 2004/06/07 10:31:10 tjr Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.42 2004/07/16 06:06:09 tjr Exp $
*/
/*-
@@ -208,6 +208,7 @@
#endif
#if __BSD_VISIBLE
+wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict);
size_t wcslcat(wchar_t *, const wchar_t *, size_t);
size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
#endif
==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.30 2004/07/10 18:10:20 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.31 2004/07/15 03:13:27 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -72,7 +72,7 @@
struct extract {
mode_t umask;
mode_t default_dir_mode;
- struct archive_string mkdirpath;
+ struct archive_string create_parent_dir;
struct fixup_entry *fixup_list;
struct fixup_entry *current_fixup;
@@ -110,9 +110,11 @@
static int extract_symlink(struct archive *, struct archive_entry *, int);
static gid_t lookup_gid(struct archive *, const char *uname, gid_t);
static uid_t lookup_uid(struct archive *, const char *uname, uid_t);
-static int mkdirpath(struct archive *, const char *, int flags);
-static int mkdirpath_internal(struct archive *, char *, int flags);
-static int mkdirpath_recursive(struct archive *, char *, int flags);
+static int create_parent_dir(struct archive *, const char *, int flags);
+static int create_parent_dir_internal(struct archive *, char *,
+ int flags);
+static int create_parent_dir_recursive(struct archive *, char *,
+ int flags);
static int restore_metadata(struct archive *, struct archive_entry *,
int flags);
#ifdef HAVE_POSIX_ACL
@@ -275,7 +277,7 @@
p = next;
}
extract->fixup_list = NULL;
- archive_string_free(&extract->mkdirpath);
+ archive_string_free(&extract->create_parent_dir);
free(a->extract);
a->extract = NULL;
}
@@ -409,7 +411,7 @@
/* Might be a non-existent parent dir; try fixing that. */
if (fd < 0) {
- mkdirpath(a, name, flags);
+ create_parent_dir(a, name, flags);
fd = open(name, O_WRONLY | O_CREAT | O_EXCL, mode);
}
if (fd < 0) {
@@ -434,8 +436,9 @@
extract->pst = NULL; /* Invalidate cached stat data. */
/* Copy path to mutable storage. */
- archive_strcpy(&(extract->mkdirpath), archive_entry_pathname(entry));
- path = extract->mkdirpath.s;
+ archive_strcpy(&(extract->create_parent_dir),
+ archive_entry_pathname(entry));
+ path = extract->create_parent_dir.s;
/* Deal with any troublesome trailing path elements. */
for (;;) {
@@ -477,7 +480,7 @@
unlink(path);
} else {
/* Doesn't already exist; try building the parent path. */
- if (mkdirpath_internal(a, path, flags) != ARCHIVE_OK)
+ if (create_parent_dir_internal(a, path, flags) != ARCHIVE_OK)
return (ARCHIVE_WARN);
}
@@ -512,24 +515,26 @@
* path into mutable storage first.
*/
static int
-mkdirpath(struct archive *a, const char *path, int flags)
+create_parent_dir(struct archive *a, const char *path, int flags)
{
struct extract *extract;
+ int r;
extract = a->extract;
/* Copy path to mutable storage. */
- archive_strcpy(&(extract->mkdirpath), path);
+ archive_strcpy(&(extract->create_parent_dir), path);
- return (mkdirpath_internal(a, extract->mkdirpath.s, flags));
+ r = create_parent_dir_internal(a, extract->create_parent_dir.s, flags);
+ return (r);
}
/*
- * Handle remaining setup for mkdirpath_recursive(), assuming
+ * Handle remaining setup for create_parent_dir_recursive(), assuming
* path is already in mutable storage.
*/
static int
-mkdirpath_internal(struct archive *a, char *path, int flags)
+create_parent_dir_internal(struct archive *a, char *path, int flags)
{
char *slash;
mode_t old_umask;
@@ -541,7 +546,7 @@
return (ARCHIVE_OK);
*slash = '\0';
old_umask = umask(~SECURE_DIR_MODE);
- r = mkdirpath_recursive(a, path, flags);
+ r = create_parent_dir_recursive(a, path, flags);
umask(old_umask);
*slash = '/';
return (r);
@@ -554,7 +559,7 @@
* Otherwise, returns ARCHIVE_WARN.
*/
static int
-mkdirpath_recursive(struct archive *a, char *path, int flags)
+create_parent_dir_recursive(struct archive *a, char *path, int flags)
{
struct stat st;
struct extract *extract;
@@ -579,7 +584,7 @@
/* Don't bother trying to create null path, '.', or '..'. */
if (slash != NULL) {
*slash = '\0';
- r = mkdirpath_recursive(a, path, flags);
+ r = create_parent_dir_recursive(a, path, flags);
*slash = '/';
return (r);
}
@@ -611,7 +616,7 @@
return (ARCHIVE_WARN);
} else if (slash != NULL) {
*slash = '\0';
- r = mkdirpath_recursive(a, path, flags);
+ r = create_parent_dir_recursive(a, path, flags);
*slash = '/';
if (r != ARCHIVE_OK)
return (r);
@@ -658,7 +663,7 @@
if (r != 0) {
/* Might be a non-existent parent dir; try fixing that. */
- mkdirpath(a, pathname, flags);
+ create_parent_dir(a, pathname, flags);
r = link(linkname, pathname);
}
@@ -695,7 +700,7 @@
if (r != 0) {
/* Might be a non-existent parent dir; try fixing that. */
- mkdirpath(a, pathname, flags);
+ create_parent_dir(a, pathname, flags);
r = symlink(linkname, pathname);
}
@@ -728,7 +733,7 @@
/* Might be a non-existent parent dir; try fixing that. */
if (r != 0 && errno == ENOENT) {
- mkdirpath(a, archive_entry_pathname(entry), flags);
+ create_parent_dir(a, archive_entry_pathname(entry), flags);
r = mknod(archive_entry_pathname(entry), mode,
archive_entry_rdev(entry));
}
@@ -777,7 +782,7 @@
/* Might be a non-existent parent dir; try fixing that. */
if (r != 0 && errno == ENOENT) {
- mkdirpath(a, archive_entry_pathname(entry), flags);
+ create_parent_dir(a, archive_entry_pathname(entry), flags);
r = mkfifo(archive_entry_pathname(entry),
archive_entry_mode(entry));
}
==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#12 (text+ko) ====
@@ -1,11 +1,12 @@
# @(#)Makefile.inc 8.3 (Berkeley) 4/17/94
-# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.33 2004/07/16 06:06:09 tjr Exp $
# stdio sources
.PATH: ${.CURDIR}/stdio
SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \
- fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \
+ fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetwln.c \
+ fgetws.c \
fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \
fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \
ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \
@@ -22,7 +23,8 @@
vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \
wsetup.c
-MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 flockfile.3 \
+MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
+ flockfile.3 \
fopen.3 fputs.3 \
fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \
printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \
==== //depot/projects/hammer/lib/libc/stdio/fgetln.3#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fgetln.3 8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.7 2001/10/01 16:08:59 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.8 2004/07/16 06:07:12 tjr Exp $
.\"
.Dd April 19, 1994
.Dt FGETLN 3
@@ -118,6 +118,7 @@
.Sh SEE ALSO
.Xr ferror 3 ,
.Xr fgets 3 ,
+.Xr fgetwln 3 ,
.Xr fopen 3 ,
.Xr putc 3
.Sh HISTORY
==== //depot/projects/hammer/lib/libc/stdio/fgetln.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.9 2004/03/10 09:28:38 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.10 2004/07/16 05:52:51 tjr Exp $");
#include "namespace.h"
#include <stdio.h>
@@ -55,8 +55,8 @@
* so we add 1 here.
#endif
*/
-static int
-slbexpand(FILE *fp, size_t newsize)
+int
+__slbexpand(FILE *fp, size_t newsize)
{
void *p;
@@ -132,7 +132,7 @@
* file buffer to line buffer, refill file and look for
* newline. The loop stops only when we find a newline.
*/
- if (slbexpand(fp, len + OPTIMISTIC))
+ if (__slbexpand(fp, len + OPTIMISTIC))
goto error;
(void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
len - off);
@@ -146,7 +146,7 @@
p++;
diff = p - fp->_p;
len += diff;
- if (slbexpand(fp, len))
+ if (__slbexpand(fp, len))
goto error;
(void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
diff);
==== //depot/projects/hammer/lib/libc/stdio/local.h#12 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)local.h 8.3 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdio/local.h,v 1.25 2004/06/08 05:45:32 das Exp $
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.26 2004/07/16 05:52:51 tjr Exp $
*/
#include <sys/types.h> /* for off_t */
@@ -57,6 +57,7 @@
extern wint_t __fputwc(wchar_t, FILE *);
extern int __sflush(FILE *);
extern FILE *__sfp(void);
+extern int __slbexpand(FILE *, size_t);
extern int __srefill(FILE *);
extern int __sread(void *, char *, int);
extern int __swrite(void *, char const *, int);
==== //depot/projects/hammer/lib/libc/sys/getfsstat.2#5 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getfsstat.2 8.3 (Berkeley) 5/25/95
-.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.16 2003/11/21 01:30:28 tjr Exp $
+.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.17 2004/07/16 01:18:13 alfred Exp $
.\"
.Dd November 20, 2003
.Dt GETFSSTAT 2
@@ -63,8 +63,13 @@
The buffer is filled with an array of
.Fa fsstat
structures, one for each mounted file system
-up to the size specified by
+up to the byte count specified by
.Fa bufsize .
+Note, the
+.Fa bufsize
+argument is the number of bytes that
+.Fa buf
+can hold, not the count of statfs structures it will hold.
.Pp
If
.Fa buf
==== //depot/projects/hammer/lib/libc/sys/recv.2#5 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)recv.2 8.3 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.20 2003/12/24 18:52:41 alfred Exp $
+.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.21 2004/07/16 17:15:37 harti Exp $
.\"
.Dd February 21, 1994
.Dt RECV 2
@@ -124,10 +124,11 @@
function is formed by
.Em or Ap ing
one or more of the values:
-.Bl -column MSG_WAITALL -offset indent
+.Bl -column MSG_DONTWAIT -offset indent
.It Dv MSG_OOB Ta process out-of-band data
.It Dv MSG_PEEK Ta peek at incoming message
.It Dv MSG_WAITALL Ta wait for full request or error
+.It Dv MSG_DONTWAIT Ta don't block
.El
.Pp
The
@@ -145,6 +146,12 @@
However, the call may still return less data than requested
if a signal is caught, an error or disconnect occurs,
or the next data to be received is of a different type than that returned.
+The MSG_DONTWAIT flag requests the call to return when it would block otherwise.
+If no data is available
+.Va errno
+is set to
+.Er EAGAIN .
+This flag is not available in strict ANSI or C99 compilation mode.
.Pp
The
.Fn recvmsg
==== //depot/projects/hammer/lib/msun/src/math.h#20 (text+ko) ====
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: src/lib/msun/src/math.h,v 1.40 2004/07/09 03:32:39 das Exp $
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.41 2004/07/16 06:21:56 das Exp $
*/
#ifndef _MATH_H_
@@ -34,11 +34,11 @@
float __uf;
} __nan;
-#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__INTEL_COMPILER)
+#if (defined(__GNUC__) && ((__GNUC__ >= 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4)) || defined(__INTEL_COMPILER)
#define __MATH_BUILTIN_CONSTANTS
#endif
-#if (defined(__GNUC__) && __GNUC__ >= 3)
+#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER))
#define __MATH_BUILTIN_RELOPS
#endif
==== //depot/projects/hammer/release/Makefile#49 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.845 2004/06/10 19:33:26 brian Exp $
+# $FreeBSD: src/release/Makefile,v 1.846 2004/07/15 04:52:57 jhb Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -314,6 +314,18 @@
@echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
@exit 1
.endif
+.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES)
+.for p in ${LOCAL_PATCHES}
+.if !exists(${p})
+ @echo "The patch file ${p} does not exist!"
+ @exit 1
+.endif
+.endfor
+.endif
+.if defined(LOCAL_SCRIPT) && !exists(${LOCAL_SCRIPT})
+ @echo "The local script ${LOCAL_SCRIPT} does not exist!"
+ @exit 1
+.endif
.if make(release)
.if exists(${CHROOTDIR})
# The first command will fail on a handful of files that have their schg
@@ -347,12 +359,10 @@
.endif
.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES)
.for p in ${LOCAL_PATCHES}
-.if exists(${p})
patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p}
-.endif
.endfor
.endif
-.if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT})
+.if defined(LOCAL_SCRIPT)
cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} \
RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT}
.endif
==== //depot/projects/hammer/release/alpha/mkisoimages.sh#4 (text+ko) ====
@@ -4,7 +4,7 @@
# Author: Jordan K Hubbard
# Date: 22 June 2001
#
-# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $
+# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.10 2004/07/15 09:28:02 murray Exp $
#
# This script is used by release/Makefile to build the (optional) ISO images
# for a FreeBSD release. It is considered architecture dependent since each
@@ -23,6 +23,8 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
+publisher="The FreeBSD Project. http://www.freebsd.org/"
+
if [ "x$1" = "x-b" ]; then
bootable="yes"
shift
@@ -50,7 +52,7 @@
LABEL=$1; shift
NAME=$1; shift
-mkisofs -r -J -V $LABEL -o $NAME $*
+mkisofs -r -J -V $LABEL -P "$publisher" -o $NAME $*
type setcdboot 2>&1 | grep " is " >/dev/null
if [ $? -ne 0 ]; then
==== //depot/projects/hammer/release/amd64/mkisoimages.sh#5 (text+ko) ====
@@ -4,7 +4,7 @@
# Author: Jordan K Hubbard
# Date: 22 June 2001
#
-# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $
+# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.10 2004/07/15 09:28:03 murray Exp $
#
# This script is used by release/Makefile to build the (optional) ISO images
# for a FreeBSD release. It is considered architecture dependent since each
@@ -23,6 +23,7 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
+publisher="The FreeBSD Project. http://www.freebsd.org/"
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
bootable="-b boot/cdboot -no-emul-boot"
@@ -53,4 +54,4 @@
LABEL=$1; shift
NAME=$1; shift
-mkisofs $bootable -r -J -V $LABEL -o $NAME $*
+mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $*
==== //depot/projects/hammer/release/i386/mkisoimages.sh#5 (text+ko) ====
@@ -4,7 +4,7 @@
# Author: Jordan K Hubbard
# Date: 22 June 2001
#
-# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.10 2004/07/12 07:59:24 kris Exp $
+# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $
#
# This script is used by release/Makefile to build the (optional) ISO images
# for a FreeBSD release. It is considered architecture dependent since each
@@ -23,6 +23,8 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
+publisher="The FreeBSD Project. http://www.freebsd.org/"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list