6-STABLE and mount_ufs.c

[Torgan Flores de Siqueira]

Hello,

I'm tracking 6-STABLE, and cvsup'ed sources as of
6:00am GMT today (in fact, I did this yesterday, too,
with a fresh copy of the repository).
Upon building world, I got the following error:

[...]
rm -f .depend
mkdep -f .depend -a     /usr/src/sbin/mksnap_ffs/mksnap_ffs.c
echo mksnap_ffs: /usr/obj/usr/src/tmp/usr/lib/libc.a  >> .depend
===> sbin/mount (depend)
make: don't know how to make mount_ufs.c. Stop
*** Error code 2

Stop in /usr/src/sbin.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.


I took a closer look at the deltas in the CVSWeb, and, if I
understood correctly, mount_ufs.c should no longer exist, but
is still being referenced in the Makefile.
I removed the reference from the Makefile, and the compilation
goes a little bit further, but fails with:


[...]
ld -dc -r -o chroot.lo chroot_stub.o 
/usr/obj/usr/src/rescue/rescue//usr/src/usr
.sbin/chroot/chroot.o
crunchide -k _crunched_chroot_stub chroot.lo
cc -static -o rescue rescue.o cat.lo chflags.lo chio.lo chmod.lo cp.lo 
date.lo d
d.lo df.lo echo.lo ed.lo expr.lo getfacl.lo hostname.lo kenv.lo kill.lo 
ln.lo ls
.lo mkdir.lo mv.lo pax.lo ps.lo pwd.lo realpath.lo rm.lo rmdir.lo 
setfacl.lo sh.
lo stty.lo sync.lo test.lo rcp.lo csh.lo atacontrol.lo badsect.lo 
bsdlabel.lo ca
mcontrol.lo ccdconfig.lo clri.lo devfs.lo dmesg.lo dump.lo dumpfs.lo 
dumpon.lo f
sck.lo fsck_ffs.lo fsck_msdosfs.lo fsdb.lo fsirand.lo gbde.lo 
ifconfig.lo init.l
o kldconfig.lo kldload.lo kldstat.lo kldunload.lo ldconfig.lo md5.lo 
mdconfig.lo
  mdmfs.lo mknod.lo mount.lo mount_cd9660.lo mount_ext2fs.lo 
mount_msdosfs.lo mou
nt_nfs.lo mount_ntfs.lo mount_nullfs.lo mount_std.lo mount_udf.lo 
mount_umapfs.l
o mount_unionfs.lo newfs.lo newfs_msdos.lo nos-tun.lo ping.lo reboot.lo 
restore.
lo rcorder.lo route.lo routed.lo rtquery.lo rtsol.lo savecore.lo 
slattach.lo spp
pcontrol.lo startslip.lo swapon.lo sysctl.lo tunefs.lo umount.lo 
ping6.lo ipf.lo
  sconfig.lo fdisk.lo dhclient.lo bzip2.lo tar.lo vi.lo id.lo gzip.lo 
chroot.lo /
usr/obj/usr/src/rescue/rescue/../librescue/exec.o 
/usr/obj/usr/src/rescue/rescue
/../librescue/getusershell.o 
/usr/obj/usr/src/rescue/rescue/../librescue/login_c
lass.o /usr/obj/usr/src/rescue/rescue/../librescue/popen.o 
/usr/obj/usr/src/resc
ue/rescue/../librescue/rcmdsh.o 
/usr/obj/usr/src/rescue/rescue/../librescue/sysc
tl.o /usr/obj/usr/src/rescue/rescue/../librescue/system.o -lcrypt -ledit 
-lkvm -
ll -lm -ltermcap -lutil -lcrypto -lalias -lbsdxml -lcam -lcurses 
-ldevstat -lips
ec -lipx -lgeom -lkiconv -lmd -lreadline -lsbuf -lufs -lz -lbz2 
-larchive
mount.lo(.text+0xc33): In function `mountfs':
: undefined reference to `mount_ufs'
*** Error code 1

Stop in /usr/obj/usr/src/rescue/rescue.
*** Error code 1

Stop in /usr/src/rescue/rescue.
*** Error code 1

Stop in /usr/src/rescue.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.



Looking in the sbin/mount.c file, I found a call to mount_ufs,
a function which was previously in mount_ufs.c.
What is the correct way I should deal with this? Copy the old
mount_ufs.c? Or change the call to something else? I suppose
this would be nmount()?
Or am I missing something else?

The revision of mount.c is 1.69, and for the Makefile, is
1.15. Are they correct for 6-STABLE? Can I safely use the
HEAD tag for those two files in a stable tree?

Thanks in advance,

Torgan