From owner-svn-src-all@freebsd.org Thu Jun 28 13:49:02 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBF9710356B7; Thu, 28 Jun 2018 13:49:01 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 800607CB3A; Thu, 28 Jun 2018 13:49:01 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D4FC12FBF; Thu, 28 Jun 2018 13:49:01 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5SDn1SG014591; Thu, 28 Jun 2018 13:49:01 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5SDn0Ir014586; Thu, 28 Jun 2018 13:49:00 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201806281349.w5SDn0Ir014586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Thu, 28 Jun 2018 13:49:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335762 - in head: . etc release/packages share/mk share/termcap usr.bin/vgrind X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: . etc release/packages share/mk share/termcap usr.bin/vgrind X-SVN-Commit-Revision: 335762 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2018 13:49:02 -0000 Author: brd Date: Thu Jun 28 13:48:59 2018 New Revision: 335762 URL: https://svnweb.freebsd.org/changeset/base/335762 Log: Simplify using bsd.endian.mk and have it provide CAP_MKDB_ENDIAN, since it is the most common usage. Approved by: bapt (mentor) Modified: head/Makefile.inc1 head/etc/Makefile head/release/packages/generate-ucl.sh head/share/mk/bsd.endian.mk head/share/termcap/Makefile head/usr.bin/vgrind/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Jun 28 12:55:05 2018 (r335761) +++ head/Makefile.inc1 Thu Jun 28 13:48:59 2018 (r335762) @@ -1803,13 +1803,11 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul env -i LC_COLLATE=C sort ${KSTAGEDIR}/kernel.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \ - cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \ -e "s/%KERNELDIR%/kernel/" \ -e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ - -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ ${SRCDIR}/release/packages/kernel.ucl \ > ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ @@ -1837,13 +1835,11 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ env -i LC_COLLATE=C sort ${KSTAGEDIR}/kernel.${_kernel}.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${_kernel} ; \ - cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \ -e "s/%KERNELDIR%/kernel.${_kernel}/" \ -e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \ - -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ ${SRCDIR}/release/packages/kernel.ucl \ > ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Thu Jun 28 12:55:05 2018 (r335761) +++ head/etc/Makefile Thu Jun 28 13:48:59 2018 (r335762) @@ -178,13 +178,6 @@ distribute: ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include -.if ${TARGET_ENDIANNESS} == "1234" -CAP_MKDB_ENDIAN?= -l -.elif ${TARGET_ENDIANNESS} == "4321" -CAP_MKDB_ENDIAN?= -b -.else -CAP_MKDB_ENDIAN?= -.endif .if defined(NO_ROOT) METALOG.add?= cat -l >> ${METALOG} Modified: head/release/packages/generate-ucl.sh ============================================================================== --- head/release/packages/generate-ucl.sh Thu Jun 28 12:55:05 2018 (r335761) +++ head/release/packages/generate-ucl.sh Thu Jun 28 13:48:59 2018 (r335762) @@ -131,7 +131,7 @@ main() { [ -z "${desc}" ] && desc="${outname} package" cp "${uclsource}" "${uclfile}" - cap_arg="$(make -C ${srctree}/etc -VCAP_MKDB_ENDIAN)" + cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )" sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/${origname}/" \ -e "s/%COMMENT%/${comment}/" \ Modified: head/share/mk/bsd.endian.mk ============================================================================== --- head/share/mk/bsd.endian.mk Thu Jun 28 12:55:05 2018 (r335761) +++ head/share/mk/bsd.endian.mk Thu Jun 28 13:48:59 2018 (r335762) @@ -7,6 +7,7 @@ ${MACHINE_CPUARCH} == "riscv" || \ ${MACHINE_ARCH:Mmips*el*} != "" TARGET_ENDIANNESS= 1234 +CAP_MKDB_ENDIAN= -l .elif ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "powerpc64" || \ ${MACHINE_ARCH} == "powerpcspe" || \ @@ -14,4 +15,5 @@ TARGET_ENDIANNESS= 1234 (${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} != "") || \ ${MACHINE_ARCH:Mmips*} != "" TARGET_ENDIANNESS= 4321 +CAP_MKDB_ENDIAN= -b .endif Modified: head/share/termcap/Makefile ============================================================================== --- head/share/termcap/Makefile Thu Jun 28 12:55:05 2018 (r335761) +++ head/share/termcap/Makefile Thu Jun 28 13:48:59 2018 (r335762) @@ -12,13 +12,6 @@ FILESDIR= ${BINDIR}/misc CLEANFILES+= termcap.db .include -.if ${TARGET_ENDIANNESS} == "1234" -CAP_MKDB_ENDIAN= -l -.elif ${TARGET_ENDIANNESS} == "4321" -CAP_MKDB_ENDIAN= -b -.else -CAP_MKDB_ENDIAN= -.endif termcap.db: termcap cap_mkdb ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} Modified: head/usr.bin/vgrind/Makefile ============================================================================== --- head/usr.bin/vgrind/Makefile Thu Jun 28 12:55:05 2018 (r335761) +++ head/usr.bin/vgrind/Makefile Thu Jun 28 13:48:59 2018 (r335762) @@ -19,13 +19,6 @@ SCRIPTSDIR=/usr/bin CLEANFILES= vgrindefs.src.db .include -.if ${TARGET_ENDIANNESS} == "1234" -CAP_MKDB_ENDIAN= -l -.elif ${TARGET_ENDIANNESS} == "4321" -CAP_MKDB_ENDIAN= -b -.else -CAP_MKDB_ENDIAN= -.endif vgrindefs.src.db: vgrindefs.src cap_mkdb ${CAP_MKDB_ENDIAN} -f vgrindefs.src ${.ALLSRC}