d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'install: symlink usr/src/sys -> /sys: File exists' in distributeworld

Browse Source 
Follow r334617, specify ${DISTDIR} (by ${INSTALL_DDIR}), '/base' and add
${INSTALLFLAGS} while installing the '/sys' symbolic link.

Reviewed by:	bapt (earlier version), markj
Approved by:	re (gjb), markj (mentor)
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D16877
This commit is contained in:
Li-Wen Hsu 2018-08-28 23:56:52 +00:00
parent b4d1ec6c69
commit 26ffc1ab46
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -1334,7 +1334,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY
METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys ${INSTALL_SYMLINK} ${INSTALLFLAGS} usr/src/sys ${INSTALL_DDIR}/base/sys
.endif .endif
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
${IMAKEENV} rm -rf ${INSTALLTMP} ${IMAKEENV} rm -rf ${INSTALLTMP}