From owner-svn-src-head@freebsd.org Sun Aug 2 04:15:50 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B30239AF862; Sun, 2 Aug 2015 04:15:50 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0126.outbound.protection.outlook.com [207.46.100.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C98361DAB; Sun, 2 Aug 2015 04:15:49 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from SN1PR0501CA0029.namprd05.prod.outlook.com (10.163.126.167) by CO2PR05MB634.namprd05.prod.outlook.com (10.141.199.17) with Microsoft SMTP Server (TLS) id 15.1.225.19; Sun, 2 Aug 2015 04:15:42 +0000 Received: from BY2FFO11FD022.protection.gbl (2a01:111:f400:7c0c::176) by SN1PR0501CA0029.outlook.office365.com (2a01:111:e400:52fe::39) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Sun, 2 Aug 2015 04:15:41 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.18) smtp.mailfrom=juniper.net; FreeBSD.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.18 as permitted sender) Received: from p-emfe01b-sac.jnpr.net (66.129.239.18) by BY2FFO11FD022.mail.protection.outlook.com (10.1.15.211) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Sun, 2 Aug 2015 04:15:40 +0000 Received: from magenta.juniper.net (172.17.27.123) by p-emfe01b-sac.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.123.3; Sat, 1 Aug 2015 21:15:40 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t724FeD12834; Sat, 1 Aug 2015 21:15:40 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id D23EF580AB; Sat, 1 Aug 2015 21:15:39 -0700 (PDT) To: Bryan Drewery CC: , , Subject: Re: svn commit: r284598 - head/share/mk In-Reply-To: <55B8268A.5030305@FreeBSD.org> References: <201506191456.t5JEuPDU074336@svn.freebsd.org> <55B8268A.5030305@FreeBSD.org> Comments: In-reply-to: Bryan Drewery message dated "Tue, 28 Jul 2015 18:04:10 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sat, 1 Aug 2015 21:15:39 -0700 Message-ID: <4974.1438488939@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD022; 1:ZAgONPxEYyA/lxRARhiiNzFA3ZIzeBjP7Ri/Wy1+jAW1LWDoUa2WsESJFVR4I1yWp0Px3f0B07w9JaARhV4FxZltl6jgq9UtTIMSEn9mYFejomuFZpLscsKMPEw/8tLYFJNh+ldUQ3y/sZW8ub3rcbvD1jFfYvq3yHrS6BkG542MaR4hnrfKR/R4R+r+4M7dsJTe0UE345BQZvKXZ/ClzaCy5f/tS4UWcSIoTYZviMVzY7PCncp7BK9Dji7ncyBVDsTXRccr41KS1qO5zDMZsMrzapmRD556J62OXplo+o8= X-Forefront-Antispam-Report: CIP:66.129.239.18; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(24454002)(189002)(57986006)(87936001)(76506005)(50466002)(47776003)(19580405001)(450100001)(5001960100002)(62966003)(189998001)(110136002)(106466001)(77156002)(105596002)(48376002)(50226001)(117636001)(46102003)(50986999)(92566002)(77096005)(2950100001)(33716001)(76176999)(86362001)(6806004)(19580395003)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR05MB634; H:p-emfe01b-sac.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB634; 2:J9sIMeBQxh4C/VMuWiJkOOSuL4dtRvWtFxztHjx6R3Yj+gwlvu5AKsQB69viN6sdwxkCAXQxycgOmwHdAzPVaGX0+Dt+W8xrJg4jNtC5zBRwclDWSaEn0+A7EhEXX+en8I9cGrGcBDkxexbx6K2TzolX+FWyXQXa5VgHC8CzFdI=; 3:SfFyYbjk9xEDOrslYQORi/+8Biq0ZvczCw2ZBI/6aJ85Am9baymZuqEJRPWzmSoTO6BAJXqRzZ+OUqtqRUyt3y5qq8Ah5SbwamOYunrcfX6MaIKeSSMRnDhT/HGYKmGUO1tIaqHKAuIPP4AdVCLqV6vNF0d/SgQog/yXZV6YtTIenKx4z/QYGlpMk/cFPY9JBnw6Z/0TOjqZ1icXfOS5QvnUnNZzIGw5tHqBJU2c4bM=; 25:+Hy+slv74EI+JG+N9jGoYvAmWs3Sy+UbdhjXmLE8I4exygSD9ONNeKXDa613b2AcjD/o/0l4KjsQ/j1/y6dlSrnBya6dXSPyVHsMg+g6WnmrN5TBq09R+j9ooo+JyDVxN5E57DaUKiXk/Deoh6WSsE9bmj5ktG9NNv7oOAoqwcEocvt4oZj92/CRISO5QW9ePppyfOyXJgcOK+Fj3GZa3dYGnSWtT/EXottTZD6dJrHXxYaCc14A4VoV6dC1uCV71Aaw1rbQ3VJF9SMkHfCmlw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR05MB634; X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB634; 20:lBJ9UeVEuE13AZkO1anlHMQX/WH2XwpgPpr90kufUQJ5NLfLdl/cdeUe0vOlssJ0+lvM3Dop5c8Ea6nAwH2z6zopLMd3pL4OL+IxQCHcmiGoZZ2P5cWjuICUO2quIf06d2/2FesWg8IbJkqJdUXmJs1t+OzpcEMS+wKEbSPXZxxr7Jtf6DI1mSqp6oQD7gBmb+/Doas49/LVug7VW4MRXyGezF1qb7FCQEIWl2lz3Nl+/Z3JIPqQFQmHVszem5y5km9+7v+DHqtWX54cLS/2AAX89jFxwNGzzwzrhg/hDL6jJLQzUfr5D1QEiy/E2VDsgSzBFks71AG2YrfHCPqgN2tr21wZTidqWartgZX1qjX7KuFX4rhRYLgQFKg4dlz8hruFHHbePDTvw33Ss1HgwHTTRyI8+woCepuoYnV0TTNqE+3OlOdgSA0gRg53QN4OqVV/4Wd1n3FDYO5bw5Mxftglp7zed/ATeje9NZwuj+D5cb/kZYHNDVAo9gw9rbgJ; 4:RhzTd3xJI9eHZKLqfzoCN/LZlPZL8u+yUk3H7gm4+ctidH5zFaw2vMihInmonxiGl4V2Q2aFkxVkzuXlcjT05A2odDh0KQK/jjTmPSEmbGvdHB1tD4Hm96FpUeuQkkCD0Ni+PxJnrjjYDL79NNyOPgPKhv39cOLk9cQNCERmjkMaSpB0ddwrLk+AnbexxnjjqEmUFGXqQByqG3j+LNJNUSffsou3fYER7qG+uETzm/CIkHvZEJvXmq4jvz00BUCzKKmHj5I0Hh4K07ktLwipcmU+lk5d4VkcDTTnrWi2NMY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CO2PR05MB634; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB634; X-Forefront-PRVS: 0656A4403B X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB634; 23:qw3OUvgS1JgRuHZT/zKsRq4+vIh+khgTTCKffhmS3Y3ktb/ZuAFw1xO2z7CHSV7oZYlsALSO6UR5jBm48FQkMl2HsTyuwwMB9m3PavlbpqyCf+6yOw8keKfql9fHATO+gh6HrvPvTnmTDuoLg4vFjlqjHdkT5H4MQVbzZg8AgN7CCNlJdwgjMz38RpVjm8wghoX6D+CYEbcml1uUL6RYEb2N/r0q79D5liJ6rfog2H9pefncJKmv+cvRbjuEPtOluUemEjLHMvP0bsmn1Xge2+15wTJE7rPkSs2n4Qtt5dhf0wV6VhFWVymml4Y7l9Km4Zx66rnzLlECTPn/MkqHxGL7O81JchwSsAKnl3sTaoHRvxrA9d0RFZSW6GAk+7ItamB3G5MXfP294KIVKnGtqKmkxFQELRR8sqSfgn6JEla/mSiZlmRU4bcObTkuuapEbd5ylotICHfE9m+tScYNoZsRLejrPLGJ4oXHN2II85kHG4463uO5VoAkQc0hgrND4zT2JpwsJ661lJBE4ILVQ2lfLYqIb0RVssB5KBshii9Bv/TWU3pXl3Ziw3nhqzppwxAd42/MFddcmiVuGIVYQC1rhwZmJfaWJGW/NUqI9VW+E7GQyEXwIk1itpccag8Claka6bUcSkoL4leciGGhqvd3IzG4IBEA1U4qWWzE0/8u3iyDBE9mlzdZQ0NnKTaf4VdZ4P1L41iIJPfIJJSjZRKgZWym9wc2p4aUro90Apcty7STR0pHuwwhjxH7U8uoLjXxOq1kd3FgOv7kXoK8ws8NgL7X73/IMiMBA0z6oFZIz9Gd36TE+9ROYDBLIHWJHbE/3+iXD46WYUd6qVDbBXVP68/2xKao9Ge0bD32s9qEaZxchWpiGLn/X3jM1IJKAiasPcI/tv9IL5ySW4H/IA== X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB634; 5:WDFhYw3HqXSbRwoeBlJOrFOogkX7w2ilnZ/WcR1tGZackAC74OD4AHoOdWfq2M8vIDQrAUMsIipkQA3KV+LavY4QHzDb2tSNLokrna01CamivcUAJcKx0a33a4Y2/l+ST1/aGB36YZ/nDW8Bqyd5xw==; 24:MVcHemA2guvVWfVmQhfmkL4UA3YbmjQ/zvxoTn04f/YS1iCgiZUP3mLY7RhT3FOG05Rz+/3Y6Zm+FBLAynZyuMGs7jQ6MPCG0CtvILhgYjQ=; 20:grZ8GXkWEFeyfifPz6dUN+36IzFgbxVkUaUx0VGpRouHZlOwrfIO3Ah8Jr10a79XUQZV6+yiGAfWJSe/q8efFA== X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2015 04:15:40.9231 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.18]; Helo=[p-emfe01b-sac.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR05MB634 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2015 04:15:50 -0000 Bryan Drewery wrote: > > head/share/mk/local.sys.mk > > I'm bothered by the amount of local.* files committed in the tree. I > expect, as a user and working in a downstream product, that a local.* > file is MINE, not FREEBSD. The pattern of using 'local' is quite common > as a *user* file. Yes that's exactly the point. local*mk (and src*) do not get installed in /usr/share/mk, yet the inlcudes exist as points for you to customize the behavior. > Why are these named as such? It seems they should just be 'src.' with > .sinclude hooks for actual local overrides. local* are name as such since that's all that bsd* should know about. Providing for local customization. Ideally the local.*.mk in src/share/mk would do nothing except include src.*mk which is where the smarts for building src should be. But /usr/share/mk/ should know noting about src* since it is supposed to be generically useful infra. There's extra stuff there because it might be useful as an example. We can work on that over time I guess. After many years consulting and providing tools to customers, I really like making it possible for them to customize without touching (hacking) any of the original bits, it has worked very well. That's key when you get to something really complicated like dirdeps.mk > > +# site customizations that do not depend on anything! > > +SRC_ENV_CONF?= /etc/src-env.conf > > +.if !empty(SRC_ENV_CONF) && !target(_src_env_conf_included_) > > +.-include "${SRC_ENV_CONF}" > > +_src_env_conf_included_: .NOTMAIN > > .endif > > This needs to be documented in at least src.conf(5). I'm concerned that > the need to add this indicates subtle changes elsewhere that may break > existing /etc/src.conf setups, but I cannot find an example. Sorry, I didn't do the above originally; what is the concern? > > +# late include for customization > > +.-include > > In local.sys.mk from r284345 is an inclusion of SRCCONF, which is now > different and earlier than before. I wonder if this should move back to > only being included from bsd.own.mk (there is even a lingering > WITHOUT_SRCCONF check in that file). The way it is now is very obscure > in terms of when it is actually included and from where. Since I didn't move the inlcude of src.conf from bsd.own.mk (I would *guess* it was part of the src.opts changes) I'm not sure what the pros/cons of the two locations are. Certainly changing *anything* has potential to bite someone, but it is very hard to improve without change.