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

Add more missing .PHONY.

Browse Source 
This also protects them from trying to create .meta files
with WITH_META_MODE.

Reported by:	Nikolai Lifanov <lifanov@mail.lifanov.com>
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-04-21 16:30:16 +00:00
parent bbe4eb6d54
commit c943a53eb4
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Makefile.inc1
View File

@ -729,9 +729,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
# #
# Checks to be sure system is ready for installworld/installkernel. # Checks to be sure system is ready for installworld/installkernel.
# #
installcheck: _installcheck_world _installcheck_kernel installcheck: _installcheck_world _installcheck_kernel .PHONY
_installcheck_world: _installcheck_world: .PHONY
_installcheck_kernel: _installcheck_kernel: .PHONY
# #
# Require DESTDIR to be set if installing for a different architecture or # Require DESTDIR to be set if installing for a different architecture or
@ -742,7 +742,7 @@ _installcheck_kernel:
.if !make(distributeworld) .if !make(distributeworld)
_installcheck_world: __installcheck_DESTDIR _installcheck_world: __installcheck_DESTDIR
_installcheck_kernel: __installcheck_DESTDIR _installcheck_kernel: __installcheck_DESTDIR
__installcheck_DESTDIR: __installcheck_DESTDIR: .PHONY
.if !defined(DESTDIR) || empty(DESTDIR) .if !defined(DESTDIR) || empty(DESTDIR)
@echo "ERROR: Please set DESTDIR!"; \ @echo "ERROR: Please set DESTDIR!"; \
false false
@ -769,7 +769,7 @@ CHECK_UIDS+= unbound
CHECK_GIDS+= unbound CHECK_GIDS+= unbound
.endif .endif
_installcheck_world: __installcheck_UGID _installcheck_world: __installcheck_UGID
__installcheck_UGID: __installcheck_UGID: .PHONY
.for uid in ${CHECK_UIDS} .for uid in ${CHECK_UIDS}
@if ! `id -u ${uid} >/dev/null 2>&1`; then \ @if ! `id -u ${uid} >/dev/null 2>&1`; then \
echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
@ -933,7 +933,7 @@ distributeworld installworld stageworld: _installcheck_world
.endif .endif
.endif .endif
packageworld: packageworld: .PHONY
.for dist in base ${EXTRA_DISTRIBUTIONS} .for dist in base ${EXTRA_DISTRIBUTIONS}
.if defined(NO_ROOT) .if defined(NO_ROOT)
${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
@ -1129,7 +1129,7 @@ buildkernel: .MAKE .PHONY
# Install the kernel defined by INSTALLKERNEL # Install the kernel defined by INSTALLKERNEL
# #
installkernel installkernel.debug \ installkernel installkernel.debug \
reinstallkernel reinstallkernel.debug: _installcheck_kernel reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
.if !defined(NO_INSTALLKERNEL) .if !defined(NO_INSTALLKERNEL)
.if empty(INSTALLKERNEL) .if empty(INSTALLKERNEL)
@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
@ -1153,7 +1153,7 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel
.endfor .endfor
.endif .endif
distributekernel distributekernel.debug: distributekernel distributekernel.debug: .PHONY
.if !defined(NO_INSTALLKERNEL) .if !defined(NO_INSTALLKERNEL)
.if empty(INSTALLKERNEL) .if empty(INSTALLKERNEL)
@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
@ -1192,7 +1192,7 @@ distributekernel distributekernel.debug:
.endfor .endfor
.endif .endif
packagekernel: packagekernel: .PHONY
.if defined(NO_ROOT) .if defined(NO_ROOT)
.if !defined(NO_INSTALLKERNEL) .if !defined(NO_INSTALLKERNEL)
cd ${DESTDIR}/${DISTDIR}/kernel; \ cd ${DESTDIR}/${DISTDIR}/kernel; \
@ -1237,7 +1237,7 @@ packagekernel:
.endif .endif
.endif .endif
stagekernel: stagekernel: .PHONY
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
PORTSDIR?= /usr/ports PORTSDIR?= /usr/ports
@ -1251,29 +1251,29 @@ PKGSIGNKEY?= # empty
.ORDER: create-packages create-kernel-packages .ORDER: create-packages create-kernel-packages
.ORDER: create-packages sign-packages .ORDER: create-packages sign-packages
_pkgbootstrap: _pkgbootstrap: .PHONY
.if !exists(${LOCALBASE}/sbin/pkg) .if !exists(${LOCALBASE}/sbin/pkg)
@env ASSUME_ALWAYS_YES=YES pkg bootstrap @env ASSUME_ALWAYS_YES=YES pkg bootstrap
.endif .endif
packages: packages: .PHONY
${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages ${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages
package-pkg: package-pkg: .PHONY
rm -rf /tmp/ports.${TARGET} || : rm -rf /tmp/ports.${TARGET} || :
env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${REVISION} \ env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${REVISION} \
PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} WSTAGEDIR=${WSTAGEDIR} \ PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} WSTAGEDIR=${WSTAGEDIR} \
sh ${.CURDIR}/release/scripts/make-pkg-package.sh sh ${.CURDIR}/release/scripts/make-pkg-package.sh
real-packages: stage-packages create-packages sign-packages real-packages: stage-packages create-packages sign-packages .PHONY
stage-packages: stage-packages: .PHONY
@mkdir -p ${REPODIR} ${WSTAGEDIR} ${KSTAGEDIR} @mkdir -p ${REPODIR} ${WSTAGEDIR} ${KSTAGEDIR}
${_+_}@cd ${.CURDIR}; \ ${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${WSTAGEDIR} -DNO_ROOT -B stageworld ; \ ${MAKE} DESTDIR=${WSTAGEDIR} -DNO_ROOT -B stageworld ; \
${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT -B stagekernel ${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT -B stagekernel
create-packages: _pkgbootstrap create-packages: _pkgbootstrap .PHONY
@mkdir -p ${REPODIR} @mkdir -p ${REPODIR}
${_+_}@cd ${.CURDIR}; \ ${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${WSTAGEDIR} \ ${MAKE} DESTDIR=${WSTAGEDIR} \
@ -1282,7 +1282,7 @@ create-packages: _pkgbootstrap
PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \ PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
create-kernel-packages create-kernel-packages
create-world-packages: _pkgbootstrap create-world-packages: _pkgbootstrap .PHONY
@rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || :
@cd ${WSTAGEDIR} ; \ @cd ${WSTAGEDIR} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
@ -1307,7 +1307,7 @@ create-world-packages: _pkgbootstrap
-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \ -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \
done done
create-kernel-packages: _pkgbootstrap create-kernel-packages: _pkgbootstrap .PHONY
.if exists(${KSTAGEDIR}/kernel.meta) .if exists(${KSTAGEDIR}/kernel.meta)
.for flavor in "" -debug .for flavor in "" -debug
@cd ${KSTAGEDIR}/${DISTDIR} ; \ @cd ${KSTAGEDIR}/${DISTDIR} ; \
@ -1367,7 +1367,7 @@ create-kernel-packages: _pkgbootstrap
.endfor .endfor
.endif .endif
sign-packages: _pkgbootstrap sign-packages: _pkgbootstrap .PHONY
@[ -L "${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \ @[ -L "${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \
unlink ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \ unlink ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \
pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \ pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \
@ -1409,7 +1409,7 @@ doxygen: .PHONY
# Update the source tree(s), by running svn/svnup to update to the # Update the source tree(s), by running svn/svnup to update to the
# latest copy. # latest copy.
# #
update: update: .PHONY
.if defined(SVN_UPDATE) .if defined(SVN_UPDATE)
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} using Subversion" @echo ">>> Updating ${.CURDIR} using Subversion"
@ -1441,7 +1441,7 @@ update:
_elftoolchain_libs= lib/libelf lib/libdwarf _elftoolchain_libs= lib/libelf lib/libdwarf
.endif .endif
legacy: legacy: .PHONY
.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0 .if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
@echo "ERROR: Source upgrades from versions prior to 8.0 are not supported."; \ @echo "ERROR: Source upgrades from versions prior to 8.0 are not supported."; \
false false
@ -1665,7 +1665,7 @@ build-tools: build-tools_${_tool}
# #
# kernel-tools: Build kernel-building tools # kernel-tools: Build kernel-building tools
# #
kernel-tools: kernel-tools: .PHONY
mkdir -p ${MAKEOBJDIRPREFIX}/usr mkdir -p ${MAKEOBJDIRPREFIX}/usr
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-p ${MAKEOBJDIRPREFIX}/usr >/dev/null -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
@ -2144,7 +2144,7 @@ RM_I=-i
RM_I=-v RM_I=-v
.endif .endif
delete-old-files: delete-old-files: .PHONY
@echo ">>> Removing old files (only deletes safe to delete libs)" @echo ">>> Removing old files (only deletes safe to delete libs)"
# Ask for every old file if the user really wants to remove it. # Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry. # It's annoying, but better safe than sorry.
@ -2180,7 +2180,7 @@ delete-old-files:
done done
@echo ">>> Old files removed" @echo ">>> Old files removed"
check-old-files: check-old-files: .PHONY
@echo ">>> Checking for old files" @echo ">>> Checking for old files"
@cd ${.CURDIR}; \ @cd ${.CURDIR}; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
@ -2205,7 +2205,7 @@ check-old-files:
fi; \ fi; \
done done
delete-old-libs: delete-old-libs: .PHONY
@echo ">>> Removing old libraries" @echo ">>> Removing old libraries"
@echo "${OLD_LIBS_MESSAGE}" | fmt @echo "${OLD_LIBS_MESSAGE}" | fmt
@exec 3<&0; \ @exec 3<&0; \
@ -2227,7 +2227,7 @@ delete-old-libs:
done done
@echo ">>> Old libraries removed" @echo ">>> Old libraries removed"
check-old-libs: check-old-libs: .PHONY
@echo ">>> Checking for old libraries" @echo ">>> Checking for old libraries"
@cd ${.CURDIR}; \ @cd ${.CURDIR}; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
@ -2243,7 +2243,7 @@ check-old-libs:
done; \ done; \
done done
delete-old-dirs: delete-old-dirs: .PHONY
@echo ">>> Removing old directories" @echo ">>> Removing old directories"
@cd ${.CURDIR}; \ @cd ${.CURDIR}; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
@ -2257,7 +2257,7 @@ delete-old-dirs:
done done
@echo ">>> Old directories removed" @echo ">>> Old directories removed"
check-old-dirs: check-old-dirs: .PHONY
@echo ">>> Checking for old directories" @echo ">>> Checking for old directories"
@cd ${.CURDIR}; \ @cd ${.CURDIR}; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
@ -2270,10 +2270,10 @@ check-old-dirs:
fi; \ fi; \
done done
delete-old: delete-old-files delete-old-dirs delete-old: delete-old-files delete-old-dirs .PHONY
@echo "To remove old libraries run '${MAKE} delete-old-libs'." @echo "To remove old libraries run '${MAKE} delete-old-libs'."
check-old: check-old-files check-old-libs check-old-dirs check-old: check-old-files check-old-libs check-old-dirs .PHONY
@echo "To remove old files and directories run '${MAKE} delete-old'." @echo "To remove old files and directories run '${MAKE} delete-old'."
@echo "To remove old libraries run '${MAKE} delete-old-libs'." @echo "To remove old libraries run '${MAKE} delete-old-libs'."
@ -2282,7 +2282,7 @@ check-old: check-old-files check-old-libs check-old-dirs
# #
# showconfig - show build configuration. # showconfig - show build configuration.
# #
showconfig: showconfig: .PHONY
@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \ @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \
${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u
@ -2305,7 +2305,7 @@ DTBOUTPUTPATH= ${.CURDIR}
# #
# Build 'standalone' Device Tree Blob # Build 'standalone' Device Tree Blob
# #
builddtb: builddtb: .PHONY
@PATH=${TMPPATH} MACHINE=${TARGET} \ @PATH=${TMPPATH} MACHINE=${TARGET} \
${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \ ${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
"${FDT_DTS_FILE}" ${DTBOUTPUTPATH} "${FDT_DTS_FILE}" ${DTBOUTPUTPATH}
@ -2378,10 +2378,10 @@ OSREL!= uname -r | sed -e 's/[-(].*//'
.endif .endif
.ORDER: xdev-build xdev-install xdev-links .ORDER: xdev-build xdev-install xdev-links
xdev: xdev-build xdev-install xdev: xdev-build xdev-install .PHONY
.ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools .PHONY
_xb-worldtmp: .PHONY _xb-worldtmp: .PHONY
mkdir -p ${CDTMP}/usr mkdir -p ${CDTMP}/usr
@ -2437,7 +2437,7 @@ _xi-mtree: .PHONY
.endif .endif
.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries .ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries .PHONY
_xi-cross-tools: .PHONY _xi-cross-tools: .PHONY
@echo "_xi-cross-tools" @echo "_xi-cross-tools"
@ -2471,6 +2471,6 @@ xdev-links: .PHONY
../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
done done
.else .else
xdev xdev-build xdev-install xdev-links: xdev xdev-build xdev-install xdev-links: .PHONY
@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target" @echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target"
.endif .endif