From owner-dev-commits-src-branches@freebsd.org Fri Jan 22 16:27:51 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 30B684F86C8; Fri, 22 Jan 2021 16:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DMl6b0sNPz3NfR; Fri, 22 Jan 2021 16:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 107AD21990; Fri, 22 Jan 2021 16:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10MGRp3i006311; Fri, 22 Jan 2021 16:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10MGRotF006310; Fri, 22 Jan 2021 16:27:50 GMT (envelope-from git) Date: Fri, 22 Jan 2021 16:27:50 GMT Message-Id: <202101221627.10MGRotF006310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 551119253819 - stable/12 - Fix dependency cleanup hack for pf_ruleset.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5511192538198cf1d5d3a9b3ab802f2af59c798e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 16:27:51 -0000 The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5511192538198cf1d5d3a9b3ab802f2af59c798e commit 5511192538198cf1d5d3a9b3ab802f2af59c798e Author: Kristof Provost AuthorDate: 2021-01-22 16:24:07 +0000 Commit: Kristof Provost CommitDate: 2021-01-22 16:25:38 +0000 Fix dependency cleanup hack for pf_ruleset.c In 4046f57601eaa0bcd1ec8496e1280939b948aa46 we added a dependency cleanup to cope with the pf_ruleset.c changes. This commit failed to include '; \' at the end of the shell lines in the make target, causing build failures. PR: 252910 --- Makefile.inc1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ca842d182af2..be0d0d2a2334 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1005,9 +1005,9 @@ _cleanobj_fast_depend_hack: .PHONY .for f in pf_ruleset @if [ -e "${OBJTOP}"/sbin/pfctl/.depend.${f}.o ] && \ egrep -qw "sys/netpfil/pf/${f}.c" \ - "${OBJTOP}"/sbin/pfctl/.depend.${f}.o; then - echo "Removing old ${f} dependency file" - rm -rf "${OBJTOP}"/sbin/pfctl/.depend.${f}.o + "${OBJTOP}"/sbin/pfctl/.depend.${f}.o; then \ + echo "Removing old ${f} dependency file"; \ + rm -rf "${OBJTOP}"/sbin/pfctl/.depend.${f}.o; \ fi .endfor