From owner-freebsd-current@freebsd.org Tue Aug 14 14:43:31 2018 Return-Path: <owner-freebsd-current@freebsd.org> Delivered-To: freebsd-current@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 97A49107A1B4 for <freebsd-current@mailman.ysv.freebsd.org>; Tue, 14 Aug 2018 14:43:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22e.google.com (mail-it0-x22e.google.com [IPv6:2607:f8b0:4001:c0b::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2CD1072647 for <freebsd-current@freebsd.org>; Tue, 14 Aug 2018 14:43:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22e.google.com with SMTP id s7-v6so18458242itb.4 for <freebsd-current@freebsd.org>; Tue, 14 Aug 2018 07:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:from:date:message-id:subject:to; bh=xpXAHMJo/VPBJx/Xjx2f4QmOnuNqhPkqFqPmC8cI334=; b=A9Qv9rhDZKzsi29SlVoQ+x8OVg4ykijeqDsrem/1X9FmSycrnSqh0RGMTBsHNb2c2a 9hKKPM92sdhCcZbknsOkqBl3W8g0DTWU93uTJ44867+BJ0v22/rNIkMZNuRR7EKlCrWd ZZSNjJ5Q1pzmn9OOlgs9NQX2xtvOtUq0N6QU8H/9iTgkO0nnD9evjctu6wSL95IQjRzD TSjJroNXXHvCNjDlHiTQYnK8suSX1cOoAoElOlOgz1LW5mQLbk3Xm7GvfoA3FpQ/lrMh 0lCYL5A1EcIugXgYxRrpGcSVSIHDl1JiTwC64pAl4CpwueYas1WBNZvXQX/rIX7S7Bjf 9B3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=xpXAHMJo/VPBJx/Xjx2f4QmOnuNqhPkqFqPmC8cI334=; b=BdXaVvYAQP7R9I4Z6i8LyCffLS2ysl5hM3NoitakOVGPkO3j+dtpf+swNbVpu0hMTb 9GtCHbj1hdu6D9YjvHRtdXe4ferJQTpf2J8HsCEGUsufGQuooEax+w4E6v16gXyw5KHA Wx2wSrUw8cOmTNyMbtalRMSgJtZVC491r22wFn2GHnoVEnIU0VOMMdSiTUMrkHXbaH1O Goo8WymDQ/HcIlyE4QBwpaPKEzKoL39HV3w5B3aCwKQEAyKWM5ECN656dvZzw/mbUVGW Z6MoVjpTWCdp9VFXGeHVrD1fEOGDleDICeqmfLMObQNCTuqBf5iex6CLRwGMPSnroaDS y5Kw== X-Gm-Message-State: AOUpUlFZ1O1de9rYBG5uCW5R2T2qvt60q2MfnHpkMg0oyhtTGqDqmwDN VeBMf2rpuLV7D4bkEm3BQbuE1MeRNOTy0nPjIOP5afTnbmPTsA== X-Google-Smtp-Source: AA+uWPzlec/Bh2+gjCQH6QguG1zHfEqsssjU6HjWEOP8O2eAaFhDtgtt9iPw3VQdxyH6e7vAD685Fr+0l1dzYX9QMXs= X-Received: by 2002:a24:3ec3:: with SMTP id s186-v6mr14695373its.73.1534257810265; Tue, 14 Aug 2018 07:43:30 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 2002:a4f:381a:0:0:0:0:0 with HTTP; Tue, 14 Aug 2018 07:43:29 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] From: Warner Losh <imp@bsdimp.com> Date: Tue, 14 Aug 2018 08:43:29 -0600 X-Google-Sender-Auth: fHihkZGUxPW8YraSOrVIrjQZ6Kc Message-ID: <CANCZdfpVWsGqvaZ_OrUYSPUjGBGNQRD5mgjdR3iq1tATX1hZvQ@mail.gmail.com> Subject: Mergemaster tweak To: FreeBSD Current <freebsd-current@freebsd.org> Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Discussions about the use of FreeBSD-current <freebsd-current.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/> List-Post: <mailto:freebsd-current@freebsd.org> List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, <mailto:freebsd-current-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 14 Aug 2018 14:43:31 -0000 I never have /usr/src on my system (other than the directory that mtree creates). So when I run mergemaster it's always failing until I remember to add the -m . (or was it -t ., I sometimes forget). Given the recent ntpd stuff, I was annoyed enough with this default behavior to create a fix for it, which I've uploaded to https://reviews.freebsd.org/D16709 for review. Basically, if the proposed SOURCEDIR doesn't have a Makefile.inc1, but . does, then it prompts to use that. If it can't find one, it errors out early as a nice side effect. Please comment on the review. Thanks! Warner