UPDATING revision 1.296
11.296Smartin$NetBSD: UPDATING,v 1.296 2018/07/16 11:45:01 martin Exp $
21.1Sabs
31.123SjmcThis file (UPDATING) is intended to be a brief reference to recent
41.123Sjmcchanges that might cause problems in the build process, and a guide for
51.123Sjmcwhat to do if something doesn't work.
61.1Sabs
71.123SjmcFor a more detailed description of the recommended way to build NetBSD
81.123Sjmcusing build.sh, see the BUILDING file.
91.123Sjmc
101.123SjmcNote that much of the advice in this UPDATING file was written before
111.123Sjmcbuild.sh existed.  Nevertheless, the advice here may be useful for
121.123Sjmcworking around specific problems with build.sh.
131.123Sjmc
141.257SapbSections are marked with "^^^^^".  After the section on "Recent changes"
151.257Sapbare several sections containing more general information.
161.257Sapb
171.123SjmcSee also: BUILDING, build.sh, Makefile.
181.1Sabs
191.1SabsRecent changes:
201.1Sabs^^^^^^^^^^^^^^^
211.230Stls
221.296Smartin20180713:
231.296Smartin	On amd64 and i386 static binaries are now build position
241.296Smartin	independend. This requires recompilation of all object
251.296Smartin	files used to create the crunched /rescue binary.
261.296Smartin	Clean the rescue directory in your obj directory before
271.296Smartin	doing an update build, otherwise linking will fail.
281.296Smartin
291.293Sjakllsch20180414:
301.293Sjakllsch	Existing binutils was migrated to binutils.old.  Manual
311.293Sjakllsch	removal of tools/binutils objects directory may be required
321.293Sjakllsch	to fix tools build failure.
331.293Sjakllsch
341.292Smrg20180311:
351.292Smrg	bdftopcf was updated and may need cleaning in the
361.292Smrg	src/external/mit/xorg/tools/bdftopcf subdirectory if there are
371.292Smrg	link errors.
381.292Smrg
391.291Smrg20180212:
401.291Smrg	between OpenSSL and GCC updates, many things may fail to build.
411.291Smrg	any failure that looks like GCC or openssl is best handled by
421.291Smrg	a clean destdir and objdir.  Full cleandir and destdir deletion
431.291Smrg	is recommended if build failures occur.
441.291Smrg
451.288Smartin20171225:
461.288Smartin	removal of the vadvise syscall requires manual removal of all
471.288Smartin	associated files from the libc build object directory (including
481.289Schristos	the .depend files) - a command like:
491.288Smartin		cd $OBJ && find . -type d -name libc | xargs rm -rf
501.289Schristos	For architectures that support multiple "compat" binary targets,
511.289Schristos	you'll need to cleanup both the regular libc directory and the
521.290Smartin	compat ones (the above command will do that).
531.288Smartin
541.287Skre20171010:
551.287Skre	a change to the build structure of external/bsd/acpica/bin/iasl
561.287Skre	means that its objdir (or *.d and .depend at least) might need
571.287Skre	to be manually removed - or a build done once without -u.
581.287Skre
591.286Smrg20170822:
601.286Smrg	a new version of GMP has been imported and probably
611.286Smrg	will break parts of builds related to themselves or GCC, both
621.286Smrg	in the tools and the native section.  Remove all GCC, GMP, MPFR
631.286Smrg	and MPC objdirs or build once without -u.
641.286Smrg
651.285Smrg20170816:
661.285Smrg	a new version of MPFR and MPC have been imported and probably
671.285Smrg	will break parts of builds related to themselves or GCC, both
681.285Smrg	in the tools and the native section.  Remove all GCC, GMP, MPFR
691.285Smrg	and MPC objdirs or build once without -u.
701.285Smrg
711.284Smartin20170402:
721.284Smartin	a new version of dhcpcd has been imported, which does not support
731.284Smartin	update builds from the previous version. Remove your
741.284Smartin	external/bsd/dhcpcd object dir or build once without -u.
751.284Smartin
761.281Sroy20170211:
771.281Sroy	a new terminfo database has been imported.
781.281Sroy	The structure of it has changed slightly from prior versions and
791.281Sroy	an updated tic tool is required.
801.281Sroy	If you build.sh, don't use -u
811.281Sroy
821.280Skre20170207:
831.278Skre	various arch dependent libc/exect.S files were removed
841.279Skre	Either remove the obj directories (lib/libc and compat/amd64/i386/lib
851.279Skre	if it exists) or do a clean build.
861.279Skre	(This is a bug in the make system, it should be corrected without
871.279Skre	human intervention, but isn't.)
881.278Skre
891.277Smartin20170104:
901.277Smartin	xinput build options have changed.
911.277Smartin	Remove the obj directory (external/mit/xorg/bin/xinput)
921.277Smartin	if you build.sh -u
931.277Smartin
941.276Smartin20170103:
951.276Smartin	a new version of flex has been imported.
961.276Smartin	Remove the file from obj (external/bsd/flex)
971.276Smartin	if you build.sh -u
981.276Smartin
991.275Sspz20161014:
1001.275Sspz	a new version of OpenSSL has been imported.
1011.275Sspz	Remove the files from obj (crypto/external/bsd/openssl) 
1021.275Sspz	if you build.sh -u
1031.275Sspz
1041.274Smartin20161009:
1051.274Smartin	a new version of dhcpcd has been imported with slightly changed
1061.274Smartin	build infrastructure. When doing a build.sh -u this requires
1071.274Smartin	pruning the external/bsd/dhcpcd objdir.
1081.274Smartin
1091.273Smrg20160914:
1101.273Smrg	i386, amd64, shark, ofppc and macppc have joined shark and x68k
1111.273Smrg	ports in using xorg-server 1.18. This requires a clean destdir
1121.273Smrg	and a clean objdir.
1131.273Smrg
1141.272Sdholland20160527:
1151.272Sdholland	i386 needs a full cleandir or objdir deletion because PIE has
1161.272Sdholland	been enabled. (see the amd64 entry two down for further info)
1171.272Sdholland
1181.270Schristos20160418:
1191.270Schristos	libedit needs manual removal of all autogenerated files since
1201.271Schristos	some of them are not autogenerated anymore. Remember that there
1211.271Schristos	might be two copies of libedit if your platform builds "compat".
1221.270Schristos
1231.268Sriastrad20160410:
1241.268Sriastrad	amd64 needs full "make cleandir" or deletion of objdir now that
1251.268Sriastrad	PIE has been enabled for amd64.  PIE, or position-independent
1261.268Sriastrad	executables, means all code, including executables and not just
1271.268Sriastrad	shared libraries, is position-independent and hence able to be
1281.268Sriastrad	relocated by ASLR, address space layout randomization.
1291.268Sriastrad
1301.268Sriastrad	The change was made in Makefile variables for compiler and
1311.268Sriastrad	linker flags, for which make(1) does not record dependencies,
1321.268Sriastrad	hence it is unable to detect that all .o files need rebuilding.
1331.268Sriastrad
1341.268Sriastrad	Partial rebuilds with some modified source files will likely
1351.268Sriastrad	fail when linking executables, since the linker refuses to mix
1361.268Sriastrad	position-independent code with position-dependent code in
1371.268Sriastrad	position-independent executables:
1381.268Sriastrad
1391.268Sriastrad		.../x86_64--netbsd/bin/ld: foo.o: relocation R_X86_64_32 against `...' cannot be used when making a shared object; recompile with -fPIC
1401.268Sriastrad
1411.267Smrg20160401:
1421.267Smrg	Ports switching to GCC 5.3 will need a full "make cleandir".
1431.269Sdholland	Some people have found that cleandir is not sufficient, so if
1441.269Sdholland	in doubt delete the entire object directory tree for gcc.
1451.267Smrg
1461.266Saymeric20160306:
1471.265Saymeric	NetBSD's regexp implementation is now part of libnbcompat.
1481.265Saymeric	Nblex, nbm4, nbpax, nbsed use it and they may crash on
1491.265Saymeric	non-NetBSD hosts if linked with stale object files produced
1501.265Saymeric	while they included a non-NetBSD regex.h.
1511.265Saymeric	In any case, you should "make cleandir" at least these tools
1521.265Saymeric	before updating your toolchain.
1531.265Saymeric
1541.264Smartin20160125:
1551.264Smartin	Dtrace has been enabled by default on some architectures.
1561.264Smartin	When doing an update build, make sure to clean the etc/mtree
1571.264Smartin	object directory before starting the build - otherwise the
1581.264Smartin	needed directories in destdir will not be created.
1591.264Smartin	An easy way to do this is:
1601.264Smartin	   cd src/etc/mtree && $TOOLDIR/bin/nbmake-$arch cleandir
1611.264Smartin
1621.263Sdholland20150818:
1631.263Sdholland	New acpica requires "make cleandir" in src/external/bsd/acpica
1641.263Sdholland	again.
1651.263Sdholland
1661.262Schristos20150413:
1671.262Schristos	New acpica requires "make cleandir" and reinstalling yacc
1681.262Schristos	in /usr/src/external/bsd/byacc and /usr/src/tools/yacc and
1691.262Schristos	also "make cleandir" in /usr/src/external/bsd/acpica.
1701.262Schristos
1711.261Smartin20150404:
1721.261Smartin	Lint changes require a full rebuild of the tool, so make
1731.261Smartin	sure to build without -u option to build.sh, or manually
1741.261Smartin	do a make cleandir in src/tools/lint1 and
1751.261Smartin	src/usr.bin/xlint.
1761.261Smartin
1771.260Sskrll20150310:
1781.260Sskrll	Improvements to openssl for arm mean that update builds of
1791.260Sskrll	the openssl libraries will fail. A make cleandir in
1801.260Sskrll	external/bsd/openssl/lib is needed
1811.260Sskrll
1821.258Smartin20141026:
1831.259Smsaitoh	A mishap during the import of pppd may cause your corruption
1841.258Smartin	in your cvs directory if you happened to do a cvs update
1851.258Smartin	during a short period of time. To fix, just remove the
1861.258Smartin	directory src/external/bsd/ppp/dist/pppd completely
1871.258Smartin	and let cvs restore it on next update.
1881.258Smartin
1891.256Sapb20140721:
1901.256Sapb	The src/external/mit/lua/src directory was accidentally created
1911.256Sapb	and then deleted in the CVS repository.  If you get errors like
1921.256Sapb
1931.256Sapb	cvs [update aborted]: cannot open directory
1941.256Sapb	/cvsroot/src/external/mit/lua/src: No such file or directory
1951.256Sapb
1961.256Sapb	then delete your local copy of that directory tree and try again.
1971.256Sapb
1981.255Sjoerg20140530:
1991.255Sjoerg	ARM eABI switched to DWARF based exception handling. This requires
2001.255Sjoerg	rebuilding all C++ code. It is strongly advised to do a clean build.
2011.255Sjoerg
2021.251Smartin20140131:
2031.253Sjoerg	The new compiler_rt/libc integration moved a few things. It is strongly
2041.254Sskrll	advised to do a clean build. At least lib/libc, the compat version(s)
2051.253Sjoerg	of libc, libkern, rump and the kernels need to be cleaned.
2061.251Smartin
2071.250Schristos20131227:
2081.250Schristos	1. The new ntpd runs in a restricted mode to prevent amplification
2091.250Schristos	   attacks. If you need ntpdc to work you need to explicitly enable
2101.250Schristos	   mode7 in your config file. Make sure you put the necessary restrict
2111.250Schristos	   statements to avoid being exposed.
2121.250Schristos	2. strncat has moved from lib/libc to common/lib/libc; you might need
2131.250Schristos	   to make clean in libc
2141.250Schristos
2151.249Smrg20131129:
2161.249Smrg	The GMP sources were updated, and builds will likely fail without
2171.249Smrg	cleaning their build trees for both tools and in-tree, like below.
2181.249Smrg
2191.248Smrg20131128:
2201.248Smrg	The MPC and MPFR sources were updated, and builds may require their
2211.248Smrg	tools and in-tree directories cleaned for successful updates.
2221.248Smrg
2231.246Smartin20130605:
2241.247Sspz	The kernel option FAST_IPSEC no longer exists, it's been renamed
2251.247Sspz	to IPSEC (and the older IPSEC version removed).
2261.247Sspz
2271.247Sspz20130605:
2281.246Smartin	Previous freetype installations eroneously installed private
2291.246Smartin	header files. If you are building against a non-empty $DESTDIR,
2301.246Smartin	please remove ${DESTDIR}//usr/X11R7/include/freetype2/freetype/.
2311.246Smartin
2321.245Smrg20130531:
2331.245Smrg	The xdm update may cause build failure due to xdm.man being
2341.245Smrg	in the obj tree.  Make sure to ensure any like this:
2351.245Smrg		nbmake: nbmake: don't know how to make xdm.man. Stop
2361.245Smrg	is fixed by deleting the xdm.man in the obj tree.
2371.245Smrg
2381.244Smrg20130530:
2391.244Smrg	Updates of many xsrc packages will leave old .pc files around.
2401.244Smrg	Best to clean out the xsrc objdir entirely before rebuilds.
2411.244Smrg
2421.242Schristos20130301:
2431.242Schristos	The removal of netiso requires manual removal of /usr/include/netiso
2441.243Schristos	prior to the build and make cleandir in /usr/src/usr.bin/{ktruss,kdump}
2451.242Schristos
2461.238Sdholland20120726:
2471.241Swiz	The update of OpenSSL requires cleaning both the OpenSSL build
2481.241Swiz	directory and DESTDIR.  *Even non-update builds require cleaning
2491.240Sdholland	DESTDIR.* Builds done without taking these steps may fail, or in
2501.241Swiz	some cases may succeed and install broken OpenSSL libraries that
2511.240Sdholland	cause third-party software to link incorrectly and/or crash.
2521.238Sdholland
2531.237Swiz20120507:
2541.241Swiz	The database schema for makemandb was changed.  You will
2551.237Swiz	need to update the database using 'makemandb -f' or wait
2561.237Swiz	for the next weekly run to fix it.
2571.237Swiz
2581.236Sbsh20120319:
2591.236Sbsh	sys/conf/Makefile.kern.inc has been modified to adjust the
2601.236Sbsh	size of db_symtab automatically.  You need to update dbsym in
2611.236Sbsh	your $TOOLDIR to build kernels with options SYMTAB_SPACE.  If
2621.236Sbsh	you don't want this behavior, add AUTO_SYMTAB_SPACE=no to your
2631.236Sbsh	mk.conf.
2641.236Sbsh
2651.235Sjoerg20120216:
2661.241Swiz	Default for MKCATPAGES changed to NO.  Update builds will fail
2671.241Swiz	unless DESTDIR is cleaned manually.  If you built between 20120207
2681.239Sdholland	and 20120216, daily and weekly could have created an unreadable
2691.241Swiz	/var/db/man.db index for apropos.  Running makemandb -f or
2701.235Sjoerg	the next run of weekly will fix it.
2711.233Sjoerg
2721.232Schristos20111227:
2731.232Schristos	If you built between 20111225 and 20111227 you need to remove
2741.232Schristos	/usr/lib/libpam.so.4* and /usr/lib/security/*.so.4, since the
2751.232Schristos	bump has been reverted.
2761.232Schristos
2771.231Stls20111125:
2781.231Stls	The "rnd" pseudodevice has been added to sys/conf/std, which
2791.231Stls	means it should no longer be explicitly listed in kernel
2801.231Stls	configuration files.  The line "pseudo-device rnd" should be
2811.231Stls	removed from any custom kernel config files users may have.
2821.231Stls
2831.230Stls20111119:
2841.230Stls	A problem with the datastructures used by the rndctl(8)
2851.230Stls	utility (pointers in datastructures in an array, making 32->64
2861.230Stls	bit compatibility very painful) has been fixed in a
2871.230Stls	non-backwards-compatible way.  If you replace your kernel,
2881.230Stls	replace your rndctl executable too.
2891.241Swiz
2901.229Sjym20111001:
2911.229Sjym	the prop_*_send_syscall() functions from proplib(3) have been
2921.229Sjym	changed and their new version is not backward compatible with the old
2931.241Swiz	one.  So ensure that all consumers of these functions (currently:
2941.229Sjym	quota2 code and its tests) are updated together with the new lib.
2951.229Sjym
2961.228Smrg20110817:
2971.228Smrg	sparc has been changed to use GCC 4.5.3, so any objdir or
2981.228Smrg	DESTDIR for them should be deleted before updating.
2991.228Smrg
3001.227Sriastrad20110806:
3011.227Sriastrad	i386 and amd64 have been changed to use GCC 4.5.3, so any
3021.227Sriastrad	objdir or DESTDIR for them should be deleted before updating.
3031.227Sriastrad
3041.226Smrg20110805:
3051.226Smrg	The update to GCC 4.5.3 requires a non-trivial portion of
3061.226Smrg	the tree to be cleaned.  Best to delete both objdir and
3071.226Smrg	DESTDIR before running this update.  So far, only the
3081.226Smrg	sparc64, mips and powerpc platforms have changed.
3091.226Smrg
3101.225Smatt20110803:
3111.241Swiz	The layout of external/public-domain/xz has changed.  To do an
3121.225Smatt	update build you will have to remove the contents of the OBJDIR
3131.225Smatt	for external/public-domain/xz/bin by hand as the xz entry there
3141.225Smatt	is now a directory.
3151.225Smatt
3161.223Sjoerg20110410:
3171.241Swiz	The configuration of src/tools/gcc has changed.  To do an
3181.224Sdholland	update build you have to clean both tools/binutils and
3191.224Sdholland	tools/gcc by hand.
3201.223Sjoerg
3211.222Splunky20110328:
3221.222Splunky	Building the Xorg binary was moved into a subdirectory to fix
3231.241Swiz	ordering issues with "make all".  It may be necessary to remove
3241.222Splunky	the OBJDIR for external/mit/xorg/server/xorg-server/hw/xfree86
3251.222Splunky	if your update build fails, as the "Xorg" entry there is now a
3261.222Splunky	directory.
3271.222Splunky
3281.220Sjoerg20110121:
3291.221Slukem	Assembler files no longer use -traditional-cpp.  This can break
3301.220Sjoerg	the build of individual parts of the tree.  This is handled
3311.220Sjoerg	correctly by build.sh.  Manual builds have to update /usr/share/mk
3321.220Sjoerg	and re-run config(1) for any kernel configurations as needed.
3331.218Sjoerg
3341.217Sjruoho20101217:
3351.217Sjruoho	The tcpdump(8) program was changed to drop privileges and chroot(2)
3361.241Swiz	by default.  It may be necessary to manually update passwd(5) and
3371.217Sjruoho	group(5) in order to make the program work with existing setups.
3381.217Sjruoho
3391.216Schristos20101125:
3401.216Schristos	The latest changes to setenv(3) dissallow setting environment
3411.241Swiz	variables with names that contain '='.  Revision 1.18 of env.c
3421.241Swiz	assumed that this was allowed.  Installing a new libc with an
3431.216Schristos	old copy of /usr/bin/env causes env x=1 printenv | grep x= to
3441.216Schristos	break which affects the autoconf tests for dependency finding,
3451.216Schristos	so building gcc will end up printing:
3461.216Schristos	    checking dependency style of gcc... none
3471.216Schristos	    configure: error: no usable dependency style found
3481.216Schristos	Fix it by rebuilding and re-installing env.
3491.138Slukem
3501.215Smrg20101119:
3511.215Smrg	Recent Xorg updates in xsrc/external/mit/ may cause various build
3521.215Smrg	or run-time problems.  Delete your entire DESTDIR and OBJDIR if you
3531.215Smrg	have any build problems with xsrc, or problems with mismatched
3541.215Smrg	versions between xorg-server and drivers.
3551.215Smrg
3561.213Sjmmv20100604:
3571.213Sjmmv	The update of ATF to 0.9 causes old tests written in shell to fail
3581.213Sjmmv	unless they are rebuilt.  If you are building with MKUPDATE=yes,
3591.213Sjmmv	you need to clean the src/external/bsd/atf/tests/ and the src/tests/
3601.213Sjmmv	trees by hand.
3611.213Sjmmv
3621.211Stnozaki20100522:
3631.212Smrg	Recent Xorg updates in xsrc/external/mit/ will cause various build
3641.212Smrg	problems.  Delete your entire DESTDIR and OBJDIR if you have any
3651.212Smrg	build problems with xsrc.
3661.212Smrg
3671.212Smrg20100522:
3681.211Stnozaki	private section of <ctype.h> was splitted, and now mklocale(1)
3691.214Sdholland	include ctype_local.h, so you have to make cleandir in tools/mklocale.
3701.211Stnozaki
3711.210Schristos20100520:
3721.241Swiz	The location of the xkb compiled descriptions has changed.  Please
3731.210Schristos	remove usr/X11R7/lib/X11/xkb/compiled from your $DESTDIR.
3741.210Schristos
3751.209Snjoly20100222:
3761.209Snjoly	The shared objects file extension has been changed from .so to
3771.209Snjoly	.pico, in order to avoid conflicts with shared libraries names
3781.209Snjoly	libXX.so.  All now stale regular .so files can be removed from
3791.209Snjoly	your object directories.
3801.209Snjoly
3811.208Sroy20100204:
3821.208Sroy	The termcap database has been removed from the sources,
3831.208Sroy	but has not been marked obsolete so it is not removed
3841.208Sroy	from the system when upgrading.
3851.208Sroy	As such, you will need to remove them from your object
3861.208Sroy	and destination directories.
3871.208Sroy
3881.203Sdyoung20091101:
3891.205Sdholland        After updating, it may be necessary to make the 'cleandir'
3901.205Sdholland        target in src/tools/yacc/ and in src/usr.bin/yacc/ before a
3911.205Sdholland        'build.sh -u tools' or 'build.sh -u distribution'.  Ditto
3921.205Sdholland        src/tools/lex/ and src/usr.bin/lex/.
3931.203Sdyoung
3941.202Smrg20091001:
3951.206Sdholland	On amd64 you must rebuild tools (to get the new binutils)
3961.206Sdholland	before building a kernel, or the build fails on cpufunc.S.
3971.206Sdholland
3981.206Sdholland20091001:
3991.202Smrg	An error will create a ./usr/X11R7/lib/X11/xkb/compiled/xkb
4001.202Smrg	symlink, failing the build.  Delete the link, and the subdir
4011.202Smrg	it is in, and retry your build.
4021.202Smrg
4031.201Sdsl20090718:
4041.201Sdsl	libc build changed so that strchr() provides the extra entry
4051.241Swiz	point for index().  Update build of libc.a (and libc_pic.a)
4061.201Sdsl	may fail because the archive contains the unwanted index.o.
4071.201Sdsl	(Similarly for strrchr() and rindex().)
4081.201Sdsl
4091.198Smrg20090709:
4101.198Smrg	Native Xorg was upgraded again.  Builds will probably fail again
4111.198Smrg	without a clean objdir, at least for src/external/mit/xorg.
4121.198Smrg
4131.197Smrg20090616:
4141.197Smrg	Native Xorg was upgraded.  Builds will need a clean objdir for
4151.197Smrg	src/external/mit/xorg.  Upgrading a system from sets will not
4161.197Smrg	work properly yet as the /usr/X11R7/lib/X11/xkb/symbols/pc
4171.197Smrg	subdirectory has been changed into a file, and this needs to
4181.197Smrg	be manually "rm -r"'ed before installing xbase.tgz.
4191.197Smrg
4201.195Sperry20090501:
4211.195Sperry	Several new functions were added to string.h/libc, and this
4221.195Sperry	can cause autoconf problems during the tool build for people
4231.241Swiz	who fail to clean out their tools objects properly.  If you
4241.195Sperry	note messages about stpcpy, stpncpy or strnlen accompanying a
4251.195Sperry	failure during the tool build, clean out all your tools
4261.195Sperry	objects and start again.
4271.195Sperry
4281.194Smrg20090325:
4291.194Smrg	The i386 port was switched to i486 default toolchain.  This requires
4301.194Smrg	cleaning your src/tools directory and $TOOLDIR and rebuilding them.
4311.194Smrg
4321.192Sskrll20090126:
4331.241Swiz	The __posix_fadvise50 system call changed assembly stub type.  You
4341.207Smbalmer	need to 'rm -f __posix_fadvise50.*' in the libc build directory
4351.207Smbalmer	to avoid using the old assembly stub.
4361.192Sskrll
4371.191Sjoerg20090202:
4381.191Sjoerg	pkg_install now depends on the pkgdb cache for automatic conflict
4391.191Sjoerg	detection.  It is recommented to rebuild the cache with
4401.191Sjoerg	``pkg_admin rebuild''.
4411.191Sjoerg
4421.184Schristos20090110:
4431.241Swiz	time_t and dev_t have been bumped to 64 bit quantities.  To upgrade:
4441.241Swiz	1. Make sure your kernel has COMPAT_50 in it.  Build and install.
4451.188Schristos	   This is needed even in the MODULAR kernel because there is
4461.188Schristos	   conditionally compiled code in rtsock.c.
4471.184Schristos	2. make sure build.sh completes and the binaries in a chroot work
4481.184Schristos	   before installing.
4491.184Schristos	3. If you don't use build.sh and you build directly to root, and
4501.241Swiz	   your build breaks in the middle, don't despair.  Make sure headers
4511.184Schristos	   are installed properly, and start building libraries first libc
4521.184Schristos	   and libutil, install them and then continue building all the
4531.241Swiz	   libraries in src/lib and src/gnu/lib and install them.  Once
4541.184Schristos	   the new libraries are installed, you can restart the build.
4551.184Schristos	4. If you compile packages and you notice link time warnings,
4561.189Shubertf	   rebuild the required packages to update their shared libraries.
4571.189Shubertf	   Any package you rebuild will require rebuilding all the packages
4581.189Shubertf	   that depend on it.
4591.186Schristos	5. Next time you run pwd_mkdb with the new binary, the file
4601.186Schristos	   will be upgraded and it will not be backwards compatible.
4611.190Sapb	6. The utmpx/wtmpx files (/var/run/utmpx and /var/log/wtmpx, see
4621.190Sapb	   lastlogx(5)) have been versioned, and there is a heuristic
4631.241Swiz	   for utmp.  You are better off removing the old files after
4641.190Sapb	   upgrading.  The automated clearing of /var/run during
4651.190Sapb	   boot, and the automated rotating of files in /var/log by
4661.190Sapb	   newsyslog(8), may mean that you do not have to remove the
4671.190Sapb	   files manually.
4681.190Sapb	7. The optional accounting file (/var/account/acct, see
4691.190Sapb	   accton(8)) has not been versioned, and will need to be
4701.190Sapb	   removed.  The automatic rotation of the accounting file by
4711.190Sapb	   /etc/daily limits the bad consequences of failure to remove
4721.190Sapb	   the file.
4731.196Sdholland	8. Application software that writes time_t to binary files on
4741.241Swiz	   disk will break or need attention.  Most notably: if you are
4751.196Sdholland	   using PostgreSQL < 8.4, you need to dump your databases,
4761.196Sdholland	   rebuild PostgreSQL with the new time_t, then restore.
4771.185Sjmcneill
4781.183Spgoyette20081219:
4791.183Spgoyette	config(1) has been updated, and one of the files it creates -
4801.183Spgoyette	swapnetbsd.o - has changed format.  You need to rebuild config
4811.183Spgoyette	(done automatically by build.sh) and then you need to rerun
4821.183Spgoyette	config on all kernel configuration files before rebuilding those
4831.183Spgoyette	kernels.
4841.183Spgoyette
4851.181Scube20081205:
4861.181Scube	If you build with MKX11=no, you should remove /etc/rc.d/xdm and
4871.181Scube	/etc/rc.d/xfs from DESTDIR because those files were moved to the xetc
4881.181Scube	set and will appear as extra files for MKX11=no update builds.
4891.178Slukem
4901.179Stsutsui20081122:
4911.182Stsutsui	On i386, various kernel options(4) in GENERIC including
4921.180Swiz	file systems have been disabled and moved into kernel modules.
4931.180Swiz	Before trying a new GENERIC kernel, you have to prepare the
4941.179Stsutsui	following files as well as a new GENERIC kernel:
4951.179Stsutsui
4961.179Stsutsui	- build and install kernel modules from src/sys/modules
4971.179Stsutsui
4981.179Stsutsui	- install the latest bootloader, which will load a module
4991.180Swiz	  for the file system from which the kernel is loaded automatically
5001.179Stsutsui
5011.180Swiz	If you have to load your kernel from a file system which is not of
5021.180Swiz	the same type as the root file system, you have to load the necessary
5031.180Swiz	file system module manually on the boot prompt or in the boot.cfg file.
5041.179Stsutsui
5051.178Slukem20080827:
5061.178Slukem	If you built and installed a libc from sources between
5071.178Slukem	2008/08/20 and 2008/08/26 you got a broken strtouq(3)
5081.178Slukem	which results in false errors reported by lint(1).
5091.178Slukem	Since this breaks the libc build itself, manual help is
5101.180Swiz	needed -- lint must be disabled temporarily, e.g.:
5111.178Slukem	  $ (cd lib/libc && make MKLINT=no dependall install)
5121.178Slukem
5131.177Schristos20080813:
5141.177Schristos	MKDEBUG build was broken because the .depend files did not know
5151.241Swiz	about .go files.  You need to remove all .depend files and rebuild.
5161.177Schristos
5171.200Sdholland20080802:
5181.200Sdholland	A regression in binary compatibility for pthread_mutex_t has
5191.241Swiz	been fixed.  Unfortunately, the price is breaking compatibility
5201.200Sdholland	for -current.
5211.200Sdholland
5221.200Sdholland	Threaded programs (using libpthread) and C++ programs (using
5231.200Sdholland	libstdc++) compiled after 20070907 and before 20080802 need to
5241.200Sdholland	be recompiled.
5251.200Sdholland
5261.200Sdholland	One way to find affected pkgsrc packages:
5271.200Sdholland
5281.200Sdholland	  $ grep REQUIRES=/usr/lib/libpthread /var/db/pkg/*/+BUILD_INFO
5291.200Sdholland	  $ grep REQUIRES=/usr/lib/libstdc++ /var/db/pkg/*/+BUILD_INFO
5301.200Sdholland
5311.175Ssimonb20080731:
5321.175Ssimonb	WAPBL (metadata journaling support) has been added, but at this
5331.175Ssimonb	time isn't backwards compatible with pre-WAPBL aware kernels
5341.175Ssimonb	and userland (fsck_ffs in particular).  Please make sure you
5351.175Ssimonb	don't use a journaled filesystem with an older kernel/userland,
5361.176Ssimonb	especially an uncleanly mounted journaled filesystem.  WAPBL
5371.176Ssimonb	also requires the super block to be in the UFS2 format.  You
5381.176Ssimonb	can use fsck_ffs -c 4 to update the superblock format.
5391.175Ssimonb
5401.174Slukem20080721:
5411.174Slukem	Assembler warnings are now fatal if $WARNS>0 and $NOGCCERROR
5421.174Slukem	isn't defined.
5431.174Slukem
5441.173Sfreza20080531:
5451.241Swiz	The ioctl number of DRVSUSPENDDEV command on /dev/drvctl changed
5461.241Swiz	from 125 (conflicted with DRVCTLCOMMAND) to 129.  The drvctl(8)
5471.173Sfreza	utility needs to be rebuilt and reinstalled as older binaries
5481.241Swiz	won't work correctly.  The following sequence of commands:
5491.173Sfreza
5501.173Sfreza	  $ (cd sys/sys/ && nbmake-$arch includes)
5511.173Sfreza	  $ (cd sbin/drvctl/ && nbmake-$arch clean)
5521.173Sfreza	  $ (cd sbin/drvctl/ && nbmake-$arch all)
5531.173Sfreza
5541.173Sfreza	leaves new drvctl utility in sbin/drvctl build directory.
5551.173Sfreza
5561.172Slukem20080503:
5571.172Slukem	The <bsd.lib.mk> variable MKPRIVATELIB was renamed to LIBISPRIVATE.
5581.172Slukem
5591.171She20080521:
5601.171She	For a while, unprivileged UPDATE builds would fail to
5611.171She	succeed at the checkflist stage, complaining that
5621.171She	${DESTDIR}/stand/<arch>/ did not exist.  A fix for this
5631.171She	problem was committed to share/mk/bsd.kmodule.mk, revision 1.9.
5641.171She	If you already hit this problem, update the .mk file,
5651.171She	remove ${DESTDIR}/stand/<arch>, and re-run the build.
5661.171She
5671.174Slukem20080303:
5681.174Slukem	Linker warnings are now fatal if $WARNS>0.
5691.174Slukem
5701.170Schristos20080126:
5711.170Schristos	The posix_fadvise system call has been changed from an assembly
5721.241Swiz	stub, to a c file that calls an assembly stub.  You need to
5731.170Schristos	'rm -f posix_fadvise.* .depend' in the libc build directory to
5741.170Schristos	avoid using the old assembly stub.
5751.170Schristos
5761.168Sjoerg20071209:
5771.241Swiz	The acpiec(4) driver has been split into two attachments.  If you
5781.168Sjoerg	get ACPI errors before the attachment, please update your kernel
5791.169Swiz	configuration file appropriately or see GENERIC for more details.
5801.168Sjoerg
5811.166Sxtraeme20071115:
5821.166Sxtraeme	The it(4) driver has been renamed to itesio(4) and the old port
5831.166Sxtraeme	argument specified in the kernel configuration file is not valid
5841.241Swiz	anymore.  The itesio(4) driver now uses the Super I/O address port
5851.241Swiz	rather than the EC address port.  Please update your kernel
5861.167Swiz	configuration file appropriately or see GENERIC for more details.
5871.166Sxtraeme
5881.165Sjmmv20071028:
5891.165Sjmmv	The pccons(4) driver has been removed from the NetBSD/shark port.
5901.165Sjmmv	You need to update any custom kernel configuration file you have
5911.165Sjmmv	to remove any references to pccons (which includes removing the
5921.165Sjmmv	now useless XSERVER option) and replace them with the correct
5931.165Sjmmv	entries for the wscons driver.  See the GENERIC configuration file
5941.165Sjmmv	for more details.
5951.165Sjmmv
5961.164Sgdt20070913:
5971.164Sgdt	A latent bug in dhclient/dhcpd that caused it to be unable to
5981.164Sgdt	enumerate interfaces was fixed.  The bug began to cause
5991.164Sgdt	problems after 20070911 when the kernel's SIOCGIFCONF
6001.164Sgdt	implementation was repaired.  From 20070529 to 20070911 racoon
6011.164Sgdt	could not enumerate interfaces.  (These are noted because
6021.164Sgdt	normal kernel/userspace version matching hygiene is not
6031.164Sgdt	sufficient to avoid this problem.)  Ensure that both kernel
6041.164Sgdt	and userland are from after 20070913.
6051.164Sgdt
6061.163Sjoerg20070703:
6071.241Swiz	nbinstall has been renamed ${MACHINE_GNU_ARCH}-install.  It
6081.199Sdholland	calls the target-specific strip program, and the logic to pass
6091.199Sdholland	down STRIP from make has been removed.  This requires a
6101.199Sdholland	re-installation of tools.
6111.163Sjoerg
6121.161Sdsl20070422:
6131.161Sdsl	The way OS emulations lookup filenames inside the emulation root
6141.161Sdsl	has been changed.  Rather than modify the pathname (and copy back
6151.161Sdsl	to userspace) namei() and lookup() directly check the emulation
6161.241Swiz	root.  One side effect is that absolute symlinks inside the emulated
6171.167Swiz	root file system will be relative to that file system - unless they
6181.161Sdsl	start /../ this is useful when the emulated root is a real install
6191.161Sdsl	that has such links.
6201.161Sdsl	This might affect symlinks that have been added to reference outside
6211.161Sdsl	the emulated root.
6221.161Sdsl
6231.160Sjmcneill20070412:
6241.241Swiz	The pckbc driver on sgimips IP32 has been removed.  Use macekbc
6251.241Swiz	instead.  See the GENERIC32_IP3x kernel configuration for an
6261.160Sjmcneill	example.
6271.160Sjmcneill
6281.159Sgdt20070319:
6291.159Sgdt        src/lib/libc/Makefile revision 1.129 broke libc and ld.elf_so
6301.159Sgdt        on many platforms due to incorrect flags settings.  If you
6311.159Sgdt        updated and built after about 20070315, do "nbmake-$arch
6321.159Sgdt	cleandir" in src/lib/libc and src/libexec/ld.elf_so to force a
6331.159Sgdt	rebuild of object files that might have been built
6341.159Sgdt	incorrectly, and ensure that you have at least
6351.159Sgdt	src/lib/libc/Makefile 1.130.
6361.159Sgdt
6371.241Swiz20070210:
6381.158Sdbj        src/sys/sys/{sa.h,savar.h} were removed.
6391.158Sdbj          find ${OBJDIR} \( -name .depend -o -name '*.d' \) -print \
6401.158Sdbj              | xargs egrep -l '/sa.h|/savar.h' | xargs rm
6411.158Sdbj        will allow dependencies on those files to get get rebuilt
6421.158Sdbj
6431.157Sapb20070209:
6441.157Sapb        The threading model was changed when the newlock2 branch
6451.157Sapb        was merged to NetBSD-current.  If you boot with a new
6461.157Sapb        kernel (version 4.99.10), then you also need a new pthread
6471.157Sapb        library (/usr/lib/libpthread.so.0.7).  If you boot with
6481.157Sapb        an old kernel, then you need the old pthread library
6491.157Sapb        (/usr/lib/libpthread.so.0.6).  Provided you keep the kernel and
6501.157Sapb        the pthread library in sync, old threaded applications should
6511.157Sapb        continue to work with an old or new kernel.  Note that named(8)
6521.157Sapb	is the only threaded application in the base system.
6531.157Sapb
6541.154She20061214:
6551.154She	Following the move of string_to_flags() and flags_to_string()
6561.154She	from the bin/ls/ sources to libutil, users doing UPDATE builds
6571.154She	will need to do a "make cleandir" in
6581.154She		tools/mtree/, tools/makefs/, tools/binstall/, tools/pax/,
6591.154She		bin/pax/, bin/ls/, usr.sbin/mtree/, usr.sbin/makefs/,
6601.156She		usr.bin/xinstall/, libexec/ftpd/, rescue/, as well
6611.156She		as the installation images in distrib/
6621.154She	in order to excise stale references to the old stat_flags.h header
6631.154She	file in the ls sources -- stat_flags.h has been removed.
6641.154She
6651.152Schristos20061108:
6661.152Schristos	The configure script used in the src/tools/gcc compiler has been
6671.152Schristos	changed to indicate that our libc has ssp support built-in and
6681.241Swiz	does not depend on -lssp and -lssp-nonshared.  You'll need to
6691.152Schristos	make clean in src/tools/gcc first to rebuild the compiler.
6701.152Schristos
6711.151Srpaulo20061009:
6721.151Srpaulo	The sysctl variables net.inet{,6}.tcp{,6}.newreno are no longer
6731.241Swiz	available.  Use net.inet{,6}.tcp{,6}.congctl.selected instead.
6741.151Srpaulo
6751.150Sbjh2120060814:
6761.150Sbjh21	The vt, vidcconsole, kbd, and rpckbd drivers on acorn32 have been
6771.150Sbjh21	withdrawn.  Use vidcvideo and pckbd instead.  See the GENERIC
6781.150Sbjh21	kernel configuration for an example.  X servers from the last
6791.150Sbjh21	few years should cope.
6801.150Sbjh21
6811.149Schristos20060703:
6821.241Swiz	MPACPI is no more.  We always configure PCI interrupts using ACPI
6831.241Swiz	if we have an ACPI kernel.  The option MPACPI_SCANPCI has been renamed
6841.241Swiz	to ACPI_SCANPCI.  Thanks to work from fvdl.
6851.149Schristos
6861.148Sdogcow20060627:
6871.148Sdogcow	socket(2) has changed, and its system call has been versioned.
6881.148Sdogcow	For userlands with the old version of socket(2), make sure that
6891.148Sdogcow	your kernel has 'options COMPAT_30' set, or else 'bad system call'
6901.148Sdogcow	errors will result.
6911.148Sdogcow
6921.1SabsHints for a more successful build:
6931.1Sabs^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6941.123Sjmc    Use build.sh, but do not use its "expert mode":
6951.132Sjmmv	This will automatically build the tools in the
6961.123Sjmc	   correct order, and it will keep the tools and the
6971.123Sjmc	   new build products from interfering with the running
6981.123Sjmc	   system.  This will allow you to ignore most of the
6991.123Sjmc	   other advice in this file.
7001.2Smrg    Build a new kernel first:
7011.2Smrg	This makes sure that any new system calls or features
7021.2Smrg	   expected by the new userland will be present.  This
7031.2Smrg	   helps to avoid critical errors when upgrading.
7041.1Sabs    Use object directories:
7051.1Sabs	This helps to keep stale object
7061.1Sabs	   files from polluting the build if a Makefile "forgets"
7071.1Sabs	   about one.  It also makes it easier to clean up after
7081.1Sabs	   a build.  It's also necessary if you want to use the
7091.1Sabs	   same source tree for multiple machines.
7101.123Sjmc	   To use object directories with build.sh:
7111.123Sjmc	    a) invoke build.sh with the "-M" or "-O" options.
7121.123Sjmc	   To use object directories without using build.sh:
7131.1Sabs	    a) cd /usr/src ; make cleandir
7141.2Smrg	    b) Add "OBJMACHINE=yes" to /etc/mk.conf
7151.2Smrg	    c) Add "MKOBJDIRS=yes" to /etc/mk.conf
7161.1Sabs	    d) cd /usr/src ; make build
7171.2Smrg	   Note that running "make obj" in a directory will create
7181.2Smrg	   in obj.$MACHINE directory.
7191.1Sabs    Build to a DESTDIR:
7201.123Sjmc	This helps to keep old installed files (especially libraries)
7211.123Sjmc	   from interfering with the new build.
7221.123Sjmc	   To build to a DESTDIR with build.sh, use the "-D" option.
7231.123Sjmc	   To build to a DESTDIR without using build.sh, set the DESTDIR
7241.123Sjmc	   environment variable before running make build.  It should be
7251.123Sjmc	   set to the pathname of an initially empty directory.
7261.123Sjmc	   Problems: if you do not use build.sh, you might need to
7271.123Sjmc		update critical utilities without using DESTDIR since
7281.123Sjmc		nothing is executed from what is installed in DESTDIR.
7291.123Sjmc		(See critical utils, below.)
7301.1Sabs    Build often:
7311.1Sabs	This keeps critical utilities current enough to not choke
7321.1Sabs	on any other part of the source tree that depends on up to
7331.123Sjmc	date functionality.  If you use build.sh, you should not have
7341.123Sjmc	this problem.
7351.241Swiz
7361.1SabsWhat to do if things don't work:
7371.1Sabs^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7381.230StlsWhen things don't work there are usually a few things that commonly
7391.1Sabsshould be done.
7401.1Sabs    1)	make includes
7411.1Sabs	This should be done automatically by make build.
7421.1Sabs    2)  cd share/mk && make install
7431.1Sabs	Again, automatically done by make build.
7441.1Sabs
7451.1SabsFailsafe rebuild of a small part of the tree:
7461.1Sabs^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7471.1SabsTo make sure you rebuild something correctly you want to do
7481.1Sabssomething like the following:
7491.1Sabs    1)  Make sure the includes and .mk files are up to date.
7501.1Sabs    2)  Make sure any program used to build the particular
7511.1Sabs	utility is up to date.  (yacc, lex, etc...)
7521.1Sabs    3)  cd ...path/to/util...
7531.1Sabs	make cleandir
7541.1Sabs	rm ...all obj directories...
7551.1Sabs	make cleandir			# yes, again
7561.1Sabs	make obj
7571.1Sabs	make depend && make
7581.1Sabs
7591.1SabsFailsafe rebuild of the entire tree:
7601.1Sabs^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7611.1SabsIf you really want to make sure the source tree is clean and
7621.2Smrgready for a build try the following.  Note that sourcing /etc/mk.conf
7631.2Smrg(a make(1) Makefile) in this manner is not right, and will not work
7641.2Smrgfor anyone who uses any make(1) features in /etc/mk.conf.
7651.1Sabs
7661.1Sabs---cut here---
7671.1Sabs#!/bin/sh
7681.1Sabs. /etc/mk.conf
7691.1Sabs
7701.58Slukemif [ -z $NETBSDSRCDIR ] ; then
7711.58Slukem    NETBSDSRCDIR=/usr/src
7721.1Sabsfi
7731.58Slukemif [ \! -d $NETBSDSRCDIR ] ; then
7741.1Sabs    echo Unable to find sources
7751.1Sabs    exit 1
7761.1Sabsfi
7771.58Slukemfind $NETBSDSRCDIR -name \*.o -o -name obj.\* -o -name obj -exec rm \{\} \;
7781.1Sabs
7791.1Sabsif [ -z $BSDOBJDIR ] ; then
7801.1Sabs    BSDOBJDIR=/usr/obj
7811.1Sabsfi
7821.1Sabsif [ -d $BSDOBJDIR ] ; then
7831.1Sabs    rm -rf $BSDOBJDIR
7841.1Sabsfi
7851.1Sabs
7861.58Slukemcd $NETBSDSRCDIR && make cleandir
7871.1Sabs
7881.1Sabs---cut here---
7891.1Sabs
7901.1SabsCritical utilities:
7911.1Sabs^^^^^^^^^^^^^^^^^^^
7921.3Sitojun	usr.bin/compile_et
7931.1Sabs	usr.bin/make
7941.1Sabs	usr.bin/yacc
7951.1Sabs	usr.bin/lex
7961.11Slukem	usr.bin/xlint
7971.142Sdrochner	usr.bin/config
7981.1Sabs
7991.34SsimonbOther problems and possible solutions:
8001.1Sabs^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8011.1SabsSymptom:Complaints involving a Makefile.
8021.17SerhFix:	Rebuild usr.bin/make:
8031.17Serh	cd usr.bin/make && make && make install
8041.111Ssimonb	Or, a failsafe method if that doesn't work:
8051.17Serh	cd usr.bin/make && cc *.c */*.c -I . -o make && mv make /usr/bin
8061.17Serh
8071.1SabsFix:	Make sure .mk files are up to date.
8081.1Sabs	cd share/mk && make install
8091.2Smrg
8101.2SmrgSymptom:Kernel `config' fails to configure any kernel, including GENERIC.
8111.142SdrochnerFix:	Rebuild usr.bin/config
8121.1Sabs
8131.1SabsSymptom:
8141.1SabsFix:	Rebuild usr.bin/yacc
8151.1Sabs
8161.1SabsSymptom:
8171.1SabsFix:	Rebuild usr.bin/lex
8181.1Sabs
8191.1SabsSymptom:
8201.1SabsFix:	rm /usr/lib/libbfd.a
8211.4Sitojun
8221.4SitojunSymptom:Obsolete intermediate files are used during compilation
8231.4SitojunFix:	Try the following sequence of commands in the directory in question.
8241.4Sitojun	make cleandir; rm `make print-objdir`; make cleandir; make obj
8251.4Sitojun	(If you built the tree without "make obj" in the past, obsolete files
8261.4Sitojun	may remain.  The command tries to clean everything up)
8271.5Swiz
8281.207SmbalmerSymptom:.../sysinst/run.c:xx: warning: initialization from incompatible
8291.207Smbalmer	pointer type
8301.5SwizFix:	Rebuild and install usr.bin/menuc
8311.12Sitojun
8321.12SitojunSymptom:mklocale not found during build in share/locale/ctype
8331.12SitojunFix:	Build and install usr.bin/mklocale
8341.13Sdogcow
8351.86SkleinkSymptom:undefined reference to `__assert13' or `__unsetenv13'
8361.13SdogcowFix:    Rebuild and install lib/libc
8371.13Sdogcow
8381.142SdrochnerSymptom:usr.bin/config fails to build.
8391.19ScgdFix:	Try building with -DMAKE_BOOTSTRAP added to CFLAGS in Makefile.
8401.13Sdogcow
8411.19ScgdSymptom:undefined reference to `getprogname' or `setprogname'
8421.19ScgdFix:    Rebuild and install lib/libc
8431.24Sabs
8441.24SabsSymptom:lint does not understand the '-X' option
8451.24SabsFix:    May need to build & install libs with NOLINT=1 before rebuilding lint
8461.223Sjoerg
8471.223SjoergSymptom:Update build fails in src/tools/gcc complaining that a variable
8481.223Sjoerg	(e.g. CPPFLAGS) has changed since the previous run.
8491.223SjoergFix:    Run "nbmake-${ARCH} clean" in src/tools/gcc or do a clean build.
8501.257Sapb
8511.257SapbSymptom:cvs [update aborted]: cannot open directory /cvsroot/src/...:
8521.257Sapb	No such file or directory.
8531.257SapbCause:	If a directory is created by mistake, then it is sometimes
8541.257Sapb	deleted from the CVS repository using administrative commands
8551.257Sapb	that bypass the normal cvs access controls.  If your cvs working tree
8561.257Sapb	contains references to a directory that has been deleted on the
8571.257Sapb	server in this way, then "cvs update" reports this error.
8581.257SapbFix:	Recursively delete the affected directory from your working tree
8591.257Sapb	and try the update again.
860