Date: Sun, 2 Jun 2019 23:38:19 +0000 (UTC) From: Maxim Sobolev <sobomax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348521 - in head: . etc sys/conf sys/modules usr.bin/login usr.sbin/services_mkdb Message-ID: <201906022338.x52NcJV9070782@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sobomax Date: Sun Jun 2 23:38:19 2019 New Revision: 348521 URL: https://svnweb.freebsd.org/changeset/base/348521 Log: Fix several places where tool name has been hardcoded: install -> ${INSTALL} mtree -> ${MTREE_CMD} services_mkdb -> ${SERVICES_MKDB_CMD} cap_mkdb -> ${CAP_MKDB_CMD} pwd_mkdb -> ${PWD_MKDB_CMD} kldxref -> ${KLDXREF_CMD} If you do custom FreeBSD builds you may want to override those in some cases. Sponsored by: Sippy Software, Inc. Modified: head/Makefile.inc1 head/etc/Makefile head/sys/conf/kern.opts.mk head/sys/conf/kmod.mk head/sys/modules/Makefile head/usr.bin/login/Makefile head/usr.sbin/services_mkdb/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Jun 2 22:27:26 2019 (r348520) +++ head/Makefile.inc1 Sun Jun 2 23:38:19 2019 (r348521) @@ -887,8 +887,8 @@ MTREEFLAGS+= -W INSTALLFLAGS+= -h sha256 .endif .if defined(DB_FROM_SRC) || defined(NO_ROOT) -IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}" -IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}" +IMAKE_INSTALL= INSTALL="${INSTALL} ${INSTALLFLAGS}" +IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" .endif DESTDIR_MTREEFLAGS= -deU Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sun Jun 2 22:27:26 2019 (r348520) +++ head/etc/Makefile Sun Jun 2 23:38:19 2019 (r348521) @@ -6,6 +6,7 @@ FILESGROUPS= FILES NLS_ALIASES= POSIX C \ en_US.US_ASCII C +PWD_MKDB_CMD?= pwd_mkdb # No need as it is empty and just causes rebuilds since this file does so much. UPDATE_DEPENDFILE= no Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Sun Jun 2 22:27:26 2019 (r348520) +++ head/sys/conf/kern.opts.mk Sun Jun 2 23:38:19 2019 (r348521) @@ -22,6 +22,8 @@ # They have to be listed here so we can build modules outside of the # src tree. +KLDXREF_CMD?= kldxref + __DEFAULT_YES_OPTIONS = \ AUTOFS \ BHYVE \ Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Sun Jun 2 22:27:26 2019 (r348520) +++ head/sys/conf/kmod.mk Sun Jun 2 23:38:19 2019 (r348521) @@ -348,8 +348,8 @@ afterinstall: _kldxref .ORDER: _installlinks _kldxref _kldxref: .PHONY @if type kldxref >/dev/null 2>&1; then \ - ${ECHO} kldxref ${DESTDIR}${KMODDIR}; \ - kldxref ${DESTDIR}${KMODDIR}; \ + ${ECHO} ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ + ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ fi .endif .endif # !target(realinstall) Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sun Jun 2 22:27:26 2019 (r348520) +++ head/sys/modules/Makefile Sun Jun 2 23:38:19 2019 (r348521) @@ -795,8 +795,8 @@ SUBDIR:= ${SUBDIR:N${reject}} .MAKEFLAGS+= -DNO_XREF afterinstall: .PHONY @if type kldxref >/dev/null 2>&1; then \ - ${ECHO} kldxref ${DESTDIR}${KMODDIR}; \ - kldxref ${DESTDIR}${KMODDIR}; \ + ${ECHO} ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ + ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ fi .endif Modified: head/usr.bin/login/Makefile ============================================================================== --- head/usr.bin/login/Makefile Sun Jun 2 22:27:26 2019 (r348520) +++ head/usr.bin/login/Makefile Sun Jun 2 23:38:19 2019 (r348521) @@ -8,6 +8,7 @@ PROG= login SRCS= login.c login_fbtab.c CFLAGS+=-DLOGALL LIBADD= util pam +CAP_MKDB_CMD?= cap_mkdb WARNS?= 5 @@ -25,7 +26,7 @@ PRECIOUSPROG= .include <bsd.endian.mk> afterinstallconfig: - cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf + ${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf .if defined(NO_ROOT) && defined(METALOG) echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel" | \ cat -l >> ${METALOG} Modified: head/usr.sbin/services_mkdb/Makefile ============================================================================== --- head/usr.sbin/services_mkdb/Makefile Sun Jun 2 22:27:26 2019 (r348520) +++ head/usr.sbin/services_mkdb/Makefile Sun Jun 2 23:38:19 2019 (r348521) @@ -4,12 +4,13 @@ CONFS= services PROG= services_mkdb MAN= services_mkdb.8 SRCS= services_mkdb.c uniq.c extern.h +SERVICES_MKDB_CMD?= ${PROG} .include <bsd.endian.mk> .include <src.opts.mk> .if ${MK_SERVICESDB} != "no" afterinstallconfig: - services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \ + ${SERVICES_MKDB_CMD} ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \ ${DESTDIR}/etc/services .if defined(NO_ROOT) && defined(METALOG) echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel" | \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906022338.x52NcJV9070782>