Re: svn commit: r325116 - head
On Sat, Nov 4, 2017 at 11:30 PM, Ngie Cooper (yaneurabeya) < yaneurab...@gmail.com> wrote: > > > On Nov 4, 2017, at 08:31, Bryan Drewery wrote: > > > > On 11/4/2017 12:08 AM, Ngie Cooper (yaneurabeya) wrote: > >> I just ran into this with bash on universe12a.freebsd.org by > doing ^d. I think the change should be reverted. > >> Thanks, > >> -Ngie > >> > >> $ exit > >> *** Error code 130 > >> > >> Stop. > >> make[1]: stopped in /scratch/tmp/ngie/svn > >> *** Error code 1 > >> > >> Stop. > >> make: stopped in /scratch/tmp/ngie/svn > >> > > > > When you first go into buildenv check 'echo $?'. > > My problem was a construct like '[ -f xxx ] && . xxx' at the end of one > > of my profile scripts. It needs to be 'if [ -f xxx ]; then . xxx; fi' > > to avoid the bad status. It's really unrelated to buildenv. > > The last line in my ~/.bashrc on my VM is export PATH that doesn’t fail > with a syntax error, and the last line on my ~/.bashrc on universe12a is an > alias set, which also doesn’t fail with a syntax error. Both cases set $? = > 0. > > The issue I reported is caused by doing ^c + ^d (hence the error code 130 > in my original reply). I guess this is expected, but it’s going to confuse > people and force them to have to investigate the issue, unnecessarily, when > it wasn’t an “issue” before. > I can confirm this in my rather bare-bones bash environment. I'm inclined to think that the edge case like this throwing slightly odd results is a less bad outcome than not being able to get the results of a make buildenv command... It's good to know that this oddity can happen. We could: (a) just put "|| true" back and stop. This breaks detecting if the make buildenv command failed. (b) We could just document this can happen, which is easy but still has the issue (c) We could create a new target to run commands, but that would be exactly what buildenv is w/o the || true. I'm inclined do (b). (a) is a non-starter. (c) is possible, but seems wasteful to solve this case that can be explained in documentation. Warner ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325378 - head/sys/dev/ipmi
On Sat, Nov 4, 2017 at 11:19 PM, Peter Wemm wrote: > On Saturday, November 04, 2017 11:03:55 PM Warner Losh wrote: > > On Sat, Nov 4, 2017 at 10:50 PM, Peter Wemm wrote: > > > On Saturday, November 04, 2017 03:01:58 AM Warner Losh wrote: > > > > Author: imp > > > > Date: Sat Nov 4 03:01:58 2017 > > > > New Revision: 325378 > > > > URL: https://svnweb.freebsd.org/changeset/base/325378 > > > > > > > > Log: > > > > Make the startup timeout 0 seconds by default rathern than 420s. > This > > > > makes the default fail safe when watchdogd is disabled (which is > also > > > > the default). > > > > > > We're still getting unanticipated reboots. > > > > > > I think what is happening is: > > > 1) orderly reboot initiated. > > > 2) By default, the watchdog code sets a 420 second timer, even with no > > > watchdogd. > > > 3) reboot complets, system comes up. > > > 4) A few minutes later, the pre-reboot 420 second timer expires and > > > *another* > > > reboot happens. > > > > > > Setting hw.ipmi.on="0" in loader.conf stops this... > > > > > > eg: reboot at 4:41:47.. system comes back up, and later: > > > ... > > > Uptime: 322 Sun Nov 5 04:48:45 UTC 2017 > > > Uptime: 323 Sun Nov 5 04:48:46 UTC 2017 > > > Uptime: 324 Sun Nov 5 04:48:47 UTC 2017 > > > Stopping cron. > > > Waiting for PIDS: 1004. > > > Stopping sshd. > > > Waiting for PIDS: 994. > > > Stopping nginx. > > > ... > > > That's exactly 420 seconds after the original reboot which matches the > > > wd_shutdown_countdown timer that is still enabled.] > > > > Good detective work.I suspect this will need to be opt-in as well... > Though > > the other option is to disable the watchdog on attach if we're not > enabling > > the early watchdog which would give us a watchdog when we hang on > > shutdown... I need to think this through Fix it early with less > > protection by setting this to 0, or fix it later with more protection, > but > > perhaps odd behavior for some edge cases like downgrade. > > > > In the mean time hw.ipmi.wd_shutdown_countdown=0 should also fix it. Can > > you confirm that? > > > > Warner > > We have a number of obnoxious machines that take 5+ minutes in POST. The 7 > minute timer is cutting it awfully close. > > However, what I'm more worried about: what if you're going to boot > something > other than FreeBSD? Or going into the BIOS to tweak something? If I > break > into the loader to pause booting, it'll just silently reboot out from > under me > a few minutes later. I don't see how this can be anything but opt-in by > default. As it's a timer initiated by an orderly shutdown/reboot there > should > be plenty of time for an approprate value to be safely set. > > Yes, setting the sysctl after boot did prevent the spurious reboot after > the > next boot-up. OK. Given the edge cases aren't so edgy as I was originally thinking, I'm inclined to agree here: both features have to be opt-in. Attempts at being clever only work in a monoculture of FreeBSD where one is always moving forward in versions and never back. There's problems with both of these assumptions... Sorry for what sounds like a lot of hassle to diagnose this. Warner ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325116 - head
> On Nov 4, 2017, at 08:31, Bryan Drewery wrote: > > On 11/4/2017 12:08 AM, Ngie Cooper (yaneurabeya) wrote: >> I just ran into this with bash on universe12a.freebsd.org by doing ^d. >> I think the change should be reverted. >> Thanks, >> -Ngie >> >> $ exit >> *** Error code 130 >> >> Stop. >> make[1]: stopped in /scratch/tmp/ngie/svn >> *** Error code 1 >> >> Stop. >> make: stopped in /scratch/tmp/ngie/svn >> > > When you first go into buildenv check 'echo $?'. > My problem was a construct like '[ -f xxx ] && . xxx' at the end of one > of my profile scripts. It needs to be 'if [ -f xxx ]; then . xxx; fi' > to avoid the bad status. It's really unrelated to buildenv. The last line in my ~/.bashrc on my VM is export PATH that doesn’t fail with a syntax error, and the last line on my ~/.bashrc on universe12a is an alias set, which also doesn’t fail with a syntax error. Both cases set $? = 0. The issue I reported is caused by doing ^c + ^d (hence the error code 130 in my original reply). I guess this is expected, but it’s going to confuse people and force them to have to investigate the issue, unnecessarily, when it wasn’t an “issue” before. -Ngie signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r325378 - head/sys/dev/ipmi
On Saturday, November 04, 2017 11:03:55 PM Warner Losh wrote: > On Sat, Nov 4, 2017 at 10:50 PM, Peter Wemm wrote: > > On Saturday, November 04, 2017 03:01:58 AM Warner Losh wrote: > > > Author: imp > > > Date: Sat Nov 4 03:01:58 2017 > > > New Revision: 325378 > > > URL: https://svnweb.freebsd.org/changeset/base/325378 > > > > > > Log: > > > Make the startup timeout 0 seconds by default rathern than 420s. This > > > makes the default fail safe when watchdogd is disabled (which is also > > > the default). > > > > We're still getting unanticipated reboots. > > > > I think what is happening is: > > 1) orderly reboot initiated. > > 2) By default, the watchdog code sets a 420 second timer, even with no > > watchdogd. > > 3) reboot complets, system comes up. > > 4) A few minutes later, the pre-reboot 420 second timer expires and > > *another* > > reboot happens. > > > > Setting hw.ipmi.on="0" in loader.conf stops this... > > > > eg: reboot at 4:41:47.. system comes back up, and later: > > ... > > Uptime: 322 Sun Nov 5 04:48:45 UTC 2017 > > Uptime: 323 Sun Nov 5 04:48:46 UTC 2017 > > Uptime: 324 Sun Nov 5 04:48:47 UTC 2017 > > Stopping cron. > > Waiting for PIDS: 1004. > > Stopping sshd. > > Waiting for PIDS: 994. > > Stopping nginx. > > ... > > That's exactly 420 seconds after the original reboot which matches the > > wd_shutdown_countdown timer that is still enabled.] > > Good detective work.I suspect this will need to be opt-in as well... Though > the other option is to disable the watchdog on attach if we're not enabling > the early watchdog which would give us a watchdog when we hang on > shutdown... I need to think this through Fix it early with less > protection by setting this to 0, or fix it later with more protection, but > perhaps odd behavior for some edge cases like downgrade. > > In the mean time hw.ipmi.wd_shutdown_countdown=0 should also fix it. Can > you confirm that? > > Warner We have a number of obnoxious machines that take 5+ minutes in POST. The 7 minute timer is cutting it awfully close. However, what I'm more worried about: what if you're going to boot something other than FreeBSD? Or going into the BIOS to tweak something? If I break into the loader to pause booting, it'll just silently reboot out from under me a few minutes later. I don't see how this can be anything but opt-in by default. As it's a timer initiated by an orderly shutdown/reboot there should be plenty of time for an approprate value to be safely set. Yes, setting the sysctl after boot did prevent the spurious reboot after the next boot-up. -- Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 signature.asc Description: This is a digitally signed message part.
svn commit: r325425 - head/sys/dev/ipmi
Author: peter Date: Sun Nov 5 05:05:18 2017 New Revision: 325425 URL: https://svnweb.freebsd.org/changeset/base/325425 Log: As a follow-on to r325378, make the shutdown timer default to 0 as well. Otherwise an orderly shutdown will initiate a watchdog that will cause a 7 minute delayed reboot *by default*, In the freebsd.org cluster's case this often worked out be a surprise reboot a minute or two after the machine came back up. Modified: head/sys/dev/ipmi/ipmi.c Modified: head/sys/dev/ipmi/ipmi.c == --- head/sys/dev/ipmi/ipmi.cSun Nov 5 04:28:05 2017(r325424) +++ head/sys/dev/ipmi/ipmi.cSun Nov 5 05:05:18 2017(r325425) @@ -83,7 +83,7 @@ int ipmi_attached = 0; static int on = 1; static bool wd_in_shutdown = false; static int wd_timer_actions = IPMI_SET_WD_ACTION_POWER_CYCLE; -static int wd_shutdown_countdown = 420; /* sec */ +static int wd_shutdown_countdown = 0; /* sec */ static int wd_startup_countdown = 0; /* sec */ static int wd_pretimeout_countdown = 120; /* sec */ static int cycle_wait = 10; /* sec */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325378 - head/sys/dev/ipmi
On Sat, Nov 4, 2017 at 10:50 PM, Peter Wemm wrote: > On Saturday, November 04, 2017 03:01:58 AM Warner Losh wrote: > > Author: imp > > Date: Sat Nov 4 03:01:58 2017 > > New Revision: 325378 > > URL: https://svnweb.freebsd.org/changeset/base/325378 > > > > Log: > > Make the startup timeout 0 seconds by default rathern than 420s. This > > makes the default fail safe when watchdogd is disabled (which is also > > the default). > > We're still getting unanticipated reboots. > > I think what is happening is: > 1) orderly reboot initiated. > 2) By default, the watchdog code sets a 420 second timer, even with no > watchdogd. > 3) reboot complets, system comes up. > 4) A few minutes later, the pre-reboot 420 second timer expires and > *another* > reboot happens. > > Setting hw.ipmi.on="0" in loader.conf stops this... > > eg: reboot at 4:41:47.. system comes back up, and later: > ... > Uptime: 322 Sun Nov 5 04:48:45 UTC 2017 > Uptime: 323 Sun Nov 5 04:48:46 UTC 2017 > Uptime: 324 Sun Nov 5 04:48:47 UTC 2017 > Stopping cron. > Waiting for PIDS: 1004. > Stopping sshd. > Waiting for PIDS: 994. > Stopping nginx. > ... > That's exactly 420 seconds after the original reboot which matches the > wd_shutdown_countdown timer that is still enabled.] > Good detective work.I suspect this will need to be opt-in as well... Though the other option is to disable the watchdog on attach if we're not enabling the early watchdog which would give us a watchdog when we hang on shutdown... I need to think this through Fix it early with less protection by setting this to 0, or fix it later with more protection, but perhaps odd behavior for some edge cases like downgrade. In the mean time hw.ipmi.wd_shutdown_countdown=0 should also fix it. Can you confirm that? Warner ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325378 - head/sys/dev/ipmi
On Saturday, November 04, 2017 03:01:58 AM Warner Losh wrote: > Author: imp > Date: Sat Nov 4 03:01:58 2017 > New Revision: 325378 > URL: https://svnweb.freebsd.org/changeset/base/325378 > > Log: > Make the startup timeout 0 seconds by default rathern than 420s. This > makes the default fail safe when watchdogd is disabled (which is also > the default). We're still getting unanticipated reboots. I think what is happening is: 1) orderly reboot initiated. 2) By default, the watchdog code sets a 420 second timer, even with no watchdogd. 3) reboot complets, system comes up. 4) A few minutes later, the pre-reboot 420 second timer expires and *another* reboot happens. Setting hw.ipmi.on="0" in loader.conf stops this... eg: reboot at 4:41:47.. system comes back up, and later: ... Uptime: 322 Sun Nov 5 04:48:45 UTC 2017 Uptime: 323 Sun Nov 5 04:48:46 UTC 2017 Uptime: 324 Sun Nov 5 04:48:47 UTC 2017 Stopping cron. Waiting for PIDS: 1004. Stopping sshd. Waiting for PIDS: 994. Stopping nginx. ... That's exactly 420 seconds after the original reboot which matches the wd_shutdown_countdown timer that is still enabled. -- Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 signature.asc Description: This is a digitally signed message part.
svn commit: r325422 - head/lib/libc/sys
Author: emaste Date: Sun Nov 5 03:02:19 2017 New Revision: 325422 URL: https://svnweb.freebsd.org/changeset/base/325422 Log: posix_fallocate.2: add an EINVAL errno case As of r325320 posix_fallocate returns EINVAL on ZFS to indicate that the underlying filesystem does not support this operation, per POSIX.1-2008. Document this case in the man page. MFC after:20 days MFC with: r325320 Sponsored by: The FreeBSD Foundation Modified: head/lib/libc/sys/posix_fallocate.2 Modified: head/lib/libc/sys/posix_fallocate.2 == --- head/lib/libc/sys/posix_fallocate.2 Sun Nov 5 02:47:46 2017 (r325421) +++ head/lib/libc/sys/posix_fallocate.2 Sun Nov 5 03:02:19 2017 (r325422) @@ -28,7 +28,7 @@ .\" @(#)open.2 8.2 (Berkeley) 11/16/93 .\" $FreeBSD$ .\" -.Dd October 12, 2017 +.Dd November 4, 2017 .Dt POSIX_FALLOCATE 2 .Os .Sh NAME @@ -106,9 +106,10 @@ A signal was caught during execution. .It Bq Er EINVAL The .Fa len -argument was less than or equal to zero or the +argument was less than or equal to zero, the .Fa offset -argument was less than zero. +argument was less than zero, +or the operation is not supported by the file system. .It Bq Er EIO An I/O error occurred while reading from or writing to a file system. .It Bq Er ENODEV ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325421 - in head/sys: conf powerpc/mpc85xx
Author: jhibbits
Date: Sun Nov 5 02:47:46 2017
New Revision: 325421
URL: https://svnweb.freebsd.org/changeset/base/325421
Log:
Add Freescale QorIQ SATA controller support.
The Freescale SATA controller has many similarities to AHCI controllers, so
this driver is a heavily modified AHCI driver. Currently it seems to only
do SATA 1.0 speeds (~100-150MB/s), so there is still room for improvement.
Still to be done:
* Address erratum SATA-A-006187 -- Spread Spectrum Support (intermittent
non-recoverable transient data integrity error seen when SSC enabled).
* Linux doesn't read the log page as it hangs on the P1022. See if that's
applicable to this, and address accordingly.
* Try to determine what's holding back performance, and address it.
MFC after:3 weeks
Differential Revision:https://reviews.freebsd.org/D6071
Added:
head/sys/powerpc/mpc85xx/fsl_sata.c (contents, props changed)
head/sys/powerpc/mpc85xx/fsl_sata.h (contents, props changed)
Modified:
head/sys/conf/files.powerpc
Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Sun Nov 5 00:51:53 2017(r325420)
+++ head/sys/conf/files.powerpc Sun Nov 5 02:47:46 2017(r325421)
@@ -141,6 +141,7 @@ powerpc/mpc85xx/ds1553_bus_fdt.coptionalds1553
fdt
powerpc/mpc85xx/ds1553_core.c optionalds1553
powerpc/mpc85xx/fsl_diu.c optionalmpc85xx diu
powerpc/mpc85xx/fsl_espi.c optionalmpc85xx spibus
+powerpc/mpc85xx/fsl_sata.c optionalmpc85xx ata
powerpc/mpc85xx/i2c.c optionaliicbus fdt
powerpc/mpc85xx/isa.c optionalmpc85xx isa
powerpc/mpc85xx/lbc.c optionalmpc85xx
Added: head/sys/powerpc/mpc85xx/fsl_sata.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/powerpc/mpc85xx/fsl_sata.c Sun Nov 5 02:47:46 2017
(r325421)
@@ -0,0 +1,1917 @@
+/*-
+ * Copyright (c) 2009-2012 Alexander Motin
+ * Copyright (c) 2017 Justin Hibbits
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer,
+ *without modification, immediately at the beginning of the file.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+
+#include "fsl_sata.h"
+
+struct fsl_sata_channel;
+struct fsl_sata_slot;
+enum fsl_sata_err_type;
+struct fsl_sata_cmd_tab;
+
+
+/* local prototypes */
+static int fsl_sata_init(device_t dev);
+static int fsl_sata_deinit(device_t dev);
+static int fsl_sata_suspend(device_t dev);
+static int fsl_sata_resume(device_t dev);
+static void fsl_sata_pm(void *arg);
+static void fsl_sata_intr(void *arg);
+static void fsl_sata_intr_main(struct fsl_sata_channel *ch, uint32_t istatus);
+static void fsl_sata_begin_transaction(struct fsl_sata_channel *ch, union ccb
*ccb);
+static void fsl_sata_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs,
int error);
+static void fsl_sata_execute_transaction(struct fsl_sata_slot *slot);
+static void fsl_sata_timeout(struct fsl_sata_slot *slot);
+static void fsl_sata_end_transaction(struct fsl_sata_slot *slot, enum
fsl_sata_err_type et);
+static int fsl_sata_setup_fis(struct fsl_sata_channel *ch, struct
fsl_sata_cmd_tab *ctp, union ccb *ccb, int tag);
+static void fsl_sata_dmainit(device_t dev);
+static void fsl_sata_dmasetupc_cb(void *xsc, bus_dma_segment_t *segs, int
nsegs, int error);
+static void fsl_sata_dmafini(de
Re: svn commit: r325404 - head/share/mk
In message , Bryan
Drewery wr
ites:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --jd5aa1W7povpBFPr1nqjb2xhVAv2QJAJI
> Content-Type: multipart/mixed; boundary="a4v8qebmubPimsLtRnfCw0RINtwFC8x8D";
> protected-headers="v1"
> From: Bryan Drewery
> To: Cy Schubert
> Cc: "O. Hartmann" , "Simon J. Gerraty"
> , svn-src-h...@freebsd.org, svn-src-all@freebsd.org,
> src-committ...@freebsd.org
> Message-ID:
> Subject: Re: svn commit: r325404 - head/share/mk
> References: <201711042230.va4muhjw014...@slippy.cwsent.com>
>
> In-Reply-To:
>
> --a4v8qebmubPimsLtRnfCw0RINtwFC8x8D
> Content-Type: text/plain; charset=utf-8
> Content-Language: en-US
> Content-Transfer-Encoding: quoted-printable
>
> On 11/4/2017 4:57 PM, Bryan Drewery wrote:
> > On 11/4/2017 3:30 PM, Cy Schubert wrote:
> >> In message <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>, Bryan=20
> >> Drewery wr
> >> ites:
> >>> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> >>> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD
> >>> Content-Type: multipart/mixed; boundary=3D"MKHGkKGfLlBFL1Vl1W5AEj2Bcc=
> B14C28h";
> >>> protected-headers=3D"v1"
> >>> From: Bryan Drewery
> >>> To: "O. Hartmann" , "Simon J. Gerraty"
> >>>
> >>> Cc: svn-src-h...@freebsd.org, svn-src-all@freebsd.org,
> >>> src-committ...@freebsd.org
> >>> Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>
> >>> Subject: Re: svn commit: r325404 - head/share/mk
> >>> References: <201711042102.va4l2rur063...@repo.freebsd.org>
> >>> <20171104223133.00f5b...@thor.intern.walstatt.dynvpn.de>
> >>> <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
> >>> In-Reply-To: <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>=
>
> >>>
> >>> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h
> >>> Content-Type: text/plain; charset=3Dutf-8
> >>> Content-Language: en-US
> >>> Content-Transfer-Encoding: quoted-printable
> >>>
> >>> On 11/4/2017 2:36 PM, O. Hartmann wrote:
> Am Sat, 4 Nov 2017 22:31:33 +0100
> "O. Hartmann" schrieb:
> =3D20
> > Am Sat, 4 Nov 2017 21:02:27 + (UTC)
> > "Simon J. Gerraty" schrieb:
> >
> >> Author: sjg
> >> Date: Sat Nov 4 21:02:26 2017
> >> New Revision: 325404
> >> URL: https://svnweb.freebsd.org/changeset/base/325404
> >>
> >> Log:
> >> Ensure .OBJDIR has known value
> >> =3D20
> >> If for any reason we cannot set .OBJDIR=3D3D=3D3D_objdir as desi=
> red
> >> use .CURDIR so that at least the classic
> >> .if ${.OBJDIR} !=3D3D ${.CURDIR}
> >> works and dangerous misstakes can be avoided.
> >> =3D20
> >> Reviewed by: bdrewery
> >>
> >> Modified:
> >> head/share/mk/auto.obj.mk
> >>
> >> Modified: head/share/mk/auto.obj.mk
> >> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D=
> 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
> >>> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3=
> D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
> >>> =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3=
> D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
> >>> =3D3D=3D3D=3D3D=3D3D=3D3D
> >> --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017(r32540
> >>> 3)
> >> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017(r32540
> >>> 4)
> >> @@ -61,11 +61,17 @@ __objdir_made !=3D3D echo ${__objdir}/; umask =
> ${OBJ=3D
> >>> DIR_UMA
> >> .endif
> >> # This causes make to use the specified directory as .OBJDIR
> >> .OBJDIR: ${__objdir}
> >> -.if ${.OBJDIR:tA} !=3D3D ${__objdir:tA} && ${__objdir_made:Uno:M$=
> {__ob=3D
> >>> jdir}/*} !=3D3D ""
> >> +.if ${.OBJDIR:tA} !=3D3D ${__objdir:tA}
> >> +# we did not get what we want - do we care?
> >> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D3D ""
> >> # watch out for __objdir being relative path
> >> .if !(${__objdir:M/*} =3D3D=3D3D "" && ${.OBJDIR:tA} =3D3D=3D3D $=
> {${.CURDIR}=3D
> >>> /${__objdir}:L:tA})
> >> .error could not use ${__objdir}: .OBJDIR=3D3D${.OBJDIR}
> >> .endif
> >> +.endif
> >> +# apparently we can live with it
> >> +# make sure we know what we have
> >> +.OBJDIR: ${.CURDIR}
> >> .endif
> >> .endif
> >> .endif
> >> ___
> >> svn-src-h...@freebsd.org mailing list
> >> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> >> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd=
> =2Eor=3D
> >>> g" =3D20
> >
> > With the recent patches, nvidia driver x11/nvidia-driver fails tobu=
> ild=3D
> >>> with the error
> > shown below:
> >
> > [...]
> > =3D3D=3D3D=3D3D> src/nvidia (all) =3D20
> > make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditio=
> nal=3D
> >>>
> > (${CANONICALOBJDIR} =3D3D=3D3D /${RELDIR} || ${.OBJDIR} =3D3D=3D3D =
> /${RELDIR})=3D
> >>> make[7]: F
Re: svn commit: r325416 - head/share/mk
> On Nov 4, 2017, at 18:27, Bryan Drewery wrote:
>
> Pretty sure this fixes /etc host files being used in ‘make distribution’
> (without AUTO_OBJ) as the source files to install to DESTDIR since many of
> the etc dirs use NO_OBJ.
> I am away from computer for a while so cannot confirm but some basic tests
> before I left showed it was possible and Peter has run into such a case.
> I’ll look more when I get home and mail current@ if it did fix it. It would
> have regressed since the src.sys.obj.mk commit the other day.
>
If it wasn’t clear, any such case is definitely fixed by this commit and
r325405 would assert it doesn’t happen again.
I’m just not sure if the above is a possible failure case yet.
>
> Regards,
> Bryan Drewery
>
>> On Nov 4, 2017, at 17:12, Bryan Drewery wrote:
>>
>> Author: bdrewery
>> Date: Sun Nov 5 00:12:05 2017
>> New Revision: 325416
>> URL: https://svnweb.freebsd.org/changeset/base/325416
>>
>> Log:
>> Always try to set .OBJDIR, even if AUTO_OBJ is enabled, and fallback to
>> .CURDIR.
>>
>> When AUTO_OBJ is enabled this change becomes redundant with the auto.obj.mk
>> check added in r325404. However, it is possible that new code is added
>> at some point between src.sys.obj.mk and auto.obj.mk that disables AUTO_OBJ.
>> That could leave make with a bogus and unsafe .OBJDIR in some cases.
>>
>> Sponsored by:Dell EMC Isilon
>>
>> Modified:
>> head/share/mk/src.sys.obj.mk
>>
>> Modified: head/share/mk/src.sys.obj.mk
>> ==
>> --- head/share/mk/src.sys.obj.mkSun Nov 5 00:12:02 2017(r325415)
>> +++ head/share/mk/src.sys.obj.mkSun Nov 5 00:12:05 2017(r325416)
>> @@ -154,9 +154,8 @@ MK_AUTO_OBJ:=${OBJDIR_WRITABLE}
>> .export MK_AUTO_OBJ
>> .endif# ${MK_AUTO_OBJ} == "no" && ...
>>
>> -# Assign this directory as .OBJDIR if possible after determining if AUTO_OBJ
>> -# can be enabled by default.
>> -.if ${MK_AUTO_OBJ} == "no"
>> +# Assign this directory as .OBJDIR if possible.
>> +#
>> # The expected OBJDIR already exists, set it as .OBJDIR.
>> .if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}${.CURDIR})
>> .OBJDIR: ${MAKEOBJDIRPREFIX}${.CURDIR}
>> @@ -169,5 +168,10 @@ MK_AUTO_OBJ:=${OBJDIR_WRITABLE}
>> .elif ${MAKE_VERSION} <= 20170720 && \
>>${.CURDIR} == ${SRCTOP} && ${.OBJDIR} == ${SRCTOP}/
>> .OBJDIR: ${.CURDIR}
>> +.else
>> +# The OBJDIR we wanted does not yet exist, ensure we default to safe .CURDIR
>> +# in case make started with a bogus MAKEOBJDIR, that expanded before OBJTOP
>> +# was set, that happened to match some unexpected directory. Either
>> +# auto.obj.mk or bsd.obj.mk will create the directory and fix .OBJDIR later.
>> +.OBJDIR: ${.CURDIR}
>> .endif
>> -.endif# ${MK_AUTO_OBJ} == "no"
>>
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325416 - head/share/mk
Pretty sure this fixes /etc host files being used in ‘make distribution’
(without AUTO_OBJ) as the source files to install to DESTDIR since many of the
etc dirs use NO_OBJ.
I am away from computer for a while so cannot confirm but some basic tests
before I left showed it was possible and Peter has run into such a case.
I’ll look more when I get home and mail current@ if it did fix it. It would
have regressed since the src.sys.obj.mk commit the other day.
Regards,
Bryan Drewery
> On Nov 4, 2017, at 17:12, Bryan Drewery wrote:
>
> Author: bdrewery
> Date: Sun Nov 5 00:12:05 2017
> New Revision: 325416
> URL: https://svnweb.freebsd.org/changeset/base/325416
>
> Log:
> Always try to set .OBJDIR, even if AUTO_OBJ is enabled, and fallback to
> .CURDIR.
>
> When AUTO_OBJ is enabled this change becomes redundant with the auto.obj.mk
> check added in r325404. However, it is possible that new code is added
> at some point between src.sys.obj.mk and auto.obj.mk that disables AUTO_OBJ.
> That could leave make with a bogus and unsafe .OBJDIR in some cases.
>
> Sponsored by:Dell EMC Isilon
>
> Modified:
> head/share/mk/src.sys.obj.mk
>
> Modified: head/share/mk/src.sys.obj.mk
> ==
> --- head/share/mk/src.sys.obj.mkSun Nov 5 00:12:02 2017(r325415)
> +++ head/share/mk/src.sys.obj.mkSun Nov 5 00:12:05 2017(r325416)
> @@ -154,9 +154,8 @@ MK_AUTO_OBJ:=${OBJDIR_WRITABLE}
> .export MK_AUTO_OBJ
> .endif# ${MK_AUTO_OBJ} == "no" && ...
>
> -# Assign this directory as .OBJDIR if possible after determining if AUTO_OBJ
> -# can be enabled by default.
> -.if ${MK_AUTO_OBJ} == "no"
> +# Assign this directory as .OBJDIR if possible.
> +#
> # The expected OBJDIR already exists, set it as .OBJDIR.
> .if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}${.CURDIR})
> .OBJDIR: ${MAKEOBJDIRPREFIX}${.CURDIR}
> @@ -169,5 +168,10 @@ MK_AUTO_OBJ:=${OBJDIR_WRITABLE}
> .elif ${MAKE_VERSION} <= 20170720 && \
> ${.CURDIR} == ${SRCTOP} && ${.OBJDIR} == ${SRCTOP}/
> .OBJDIR: ${.CURDIR}
> +.else
> +# The OBJDIR we wanted does not yet exist, ensure we default to safe .CURDIR
> +# in case make started with a bogus MAKEOBJDIR, that expanded before OBJTOP
> +# was set, that happened to match some unexpected directory. Either
> +# auto.obj.mk or bsd.obj.mk will create the directory and fix .OBJDIR later.
> +.OBJDIR: ${.CURDIR}
> .endif
> -.endif# ${MK_AUTO_OBJ} == "no"
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325420 - head/contrib/llvm/lib/Support/Unix
Author: emaste
Date: Sun Nov 5 00:51:53 2017
New Revision: 325420
URL: https://svnweb.freebsd.org/changeset/base/325420
Log:
lld: accept EINVAL to indicate posix_fallocate is unsupported
As of r325320 posix_fallocate on a ZFS filesystem returns EINVAL to
indicate that the operation is not supported. (I think this is a strange
choice of errno on the part of POSIX.)
PR: 223383, 223440
Reported by: Mark Millard
Tested by:Mark Millard
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/llvm/lib/Support/Unix/Path.inc
Modified: head/contrib/llvm/lib/Support/Unix/Path.inc
==
--- head/contrib/llvm/lib/Support/Unix/Path.inc Sun Nov 5 00:26:28 2017
(r325419)
+++ head/contrib/llvm/lib/Support/Unix/Path.inc Sun Nov 5 00:51:53 2017
(r325420)
@@ -427,7 +427,7 @@ std::error_code resize_file(int FD, uint64_t Size) {
// If we have posix_fallocate use it. Unlike ftruncate it always allocates
// space, so we get an error if the disk is full.
if (int Err = ::posix_fallocate(FD, 0, Size)) {
-if (Err != EOPNOTSUPP)
+if (Err != EINVAL && Err != EOPNOTSUPP)
return std::error_code(Err, std::generic_category());
}
#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r324657 - head/usr.sbin/wlandebug
On 16 Oct 2017, at 15:01, Andriy Voskoboinyk wrote: Author: avos Date: Mon Oct 16 07:01:27 2017 New Revision: 324657 URL: https://svnweb.freebsd.org/changeset/base/324657 Log: wlandebug(8): obtain original interface name via ifconfig_get_orig_name() Modified: head/usr.sbin/wlandebug/Makefile head/usr.sbin/wlandebug/wlandebug.c This appears to have broken bsdbox: /usr/home/kp/tplink/src/contrib/netcat/netcat.c:351: warning: warning: mktemp() possibly used unsafely; consider using mkstemp() wlandebug.lo: In function `get_orig_iface_name': /usr/home/kp/tplink/src/usr.sbin/wlandebug/wlandebug.c:171: undefined reference to `ifconfig_open' /usr/home/kp/tplink/src/usr.sbin/wlandebug/wlandebug.c:172: undefined reference to `ifconfig_get_orig_name' /usr/home/kp/tplink/src/usr.sbin/wlandebug/wlandebug.c:173: undefined reference to `ifconfig_err_errno' /usr/home/kp/tplink/src/usr.sbin/wlandebug/wlandebug.c:178: undefined reference to `ifconfig_close' collect2: error: ld returned 1 exit status --- bsdbox --- *** [bsdbox] Error code 1 make[4]: stopped in /usr/home/kp/tplink/obj/mips_ap/usr/home/kp/tplink/src/mips.mips/tools/bsdbox This is a freebsd-wifi-build driven cross-compile for mips. bsdbox now requires libifconfig. I’ve had a quick try to teach it how to include that, but haven’t managed to get that to work yet. Regards, Kristof ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325419 - head/share/mk
Author: bdrewery
Date: Sun Nov 5 00:26:28 2017
New Revision: 325419
URL: https://svnweb.freebsd.org/changeset/base/325419
Log:
Avoid trying to remove a fullpath directory in CLEANDIRS.
Let CLEANDIRS work relative since make is already in .OBJDIR.
MFC after:2 weeks
X-MFC-With: r322511
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/suite.test.mk
Modified: head/share/mk/suite.test.mk
==
--- head/share/mk/suite.test.mk Sun Nov 5 00:12:12 2017(r325418)
+++ head/share/mk/suite.test.mk Sun Nov 5 00:26:28 2017(r325419)
@@ -101,11 +101,11 @@ realcheck: .PHONY
fi
@env ${TESTS_ENV:Q} ${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile
-MAKE_CHECK_SANDBOX_DIR=${.OBJDIR}/checkdir
+MAKE_CHECK_SANDBOX_DIR=checkdir
CLEANDIRS+=${MAKE_CHECK_SANDBOX_DIR}
.if ${MK_MAKE_CHECK_USE_SANDBOX} != "no" && make(check)
-DESTDIR:= ${MAKE_CHECK_SANDBOX_DIR}
+DESTDIR:= ${.OBJDIR}/${MAKE_CHECK_SANDBOX_DIR}
beforecheck:
.for t in clean depend all
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325404 - head/share/mk
On 4 Nov, Bryan Drewery wrote:
> On 11/4/2017 3:30 PM, Cy Schubert wrote:
>> In message <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>, Bryan
>> Drewery wr
>> ites:
>>> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
>>> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD
>>> Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h";
>>> protected-headers="v1"
>>> From: Bryan Drewery
>>> To: "O. Hartmann" , "Simon J. Gerraty"
>>>
>>> Cc: svn-src-h...@freebsd.org, svn-src-all@freebsd.org,
>>> src-committ...@freebsd.org
>>> Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>
>>> Subject: Re: svn commit: r325404 - head/share/mk
>>> References: <201711042102.va4l2rur063...@repo.freebsd.org>
>>> <20171104223133.00f5b...@thor.intern.walstatt.dynvpn.de>
>>> <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
>>> In-Reply-To: <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
>>>
>>> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h
>>> Content-Type: text/plain; charset=utf-8
>>> Content-Language: en-US
>>> Content-Transfer-Encoding: quoted-printable
>>>
>>> On 11/4/2017 2:36 PM, O. Hartmann wrote:
Am Sat, 4 Nov 2017 22:31:33 +0100
"O. Hartmann" schrieb:
=20
> Am Sat, 4 Nov 2017 21:02:27 + (UTC)
> "Simon J. Gerraty" schrieb:
>
>> Author: sjg
>> Date: Sat Nov 4 21:02:26 2017
>> New Revision: 325404
>> URL: https://svnweb.freebsd.org/changeset/base/325404
>>
>> Log:
>> Ensure .OBJDIR has known value
>> =20
>> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired
>> use .CURDIR so that at least the classic
>> .if ${.OBJDIR} !=3D ${.CURDIR}
>> works and dangerous misstakes can be avoided.
>> =20
>> Reviewed by: bdrewery
>>
>> Modified:
>> head/share/mk/auto.obj.mk
>>
>> Modified: head/share/mk/auto.obj.mk
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>>> =3D=3D=3D=3D=3D
>> --- head/share/mk/auto.obj.mkSat Nov 4 16:23:34 2017(r32540
>>> 3)
>> +++ head/share/mk/auto.obj.mkSat Nov 4 21:02:26 2017(r32540
>>> 4)
>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ=
>>> DIR_UMA
>> .endif
>> # This causes make to use the specified directory as .OBJDIR
>> .OBJDIR: ${__objdir}
>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob=
>>> jdir}/*} !=3D ""
>> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA}
>> +# we did not get what we want - do we care?
>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D ""
>> # watch out for __objdir being relative path
>> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}=
>>> /${__objdir}:L:tA})
>> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR}
>> .endif
>> +.endif
>> +# apparently we can live with it
>> +# make sure we know what we have
>> +.OBJDIR: ${.CURDIR}
>> .endif
>> .endif
>> .endif
>> ___
>> svn-src-h...@freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.or=
>>> g" =20
>
> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild=
>>> with the error
> shown below:
>
> [...]
> =3D=3D=3D> src/nvidia (all) =20
> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional=
>>>
> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})=
>>> make[7]: Fatal errors
> encountered -- cannot continue
> [...]
=20
The very same with emulators/virtualbox-ose-kmod:
=20
[...]
kBuild:
Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi=
>>> rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src=
>>> /vboxdrv/Makefile
=3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/=
>>> mk/bsd.obj.mk" line 87:
Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI=
>>> R} =3D=3D /${RELDIR})
make[6]: Fatal errors encountered -- cannot continue make[6]: stopped
in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
>>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv=
>>>
*** Error code 1
=20
Stop.
make[5]: stopped
in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
>>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src
=3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=
>>> =3Dyes and rebuild before
reporting the failure to the maintainer.
*** Error code 1
=20
=20
>>>
>>> It was r32
Re: svn commit: r325404 - head/share/mk
On 11/4/2017 5:11 PM, Don Lewis wrote:
> On 4 Nov, Bryan Drewery wrote:
>> On 11/4/2017 3:30 PM, Cy Schubert wrote:
>>> In message <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>, Bryan
>>> Drewery wr
>>> ites:
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD
Content-Type: multipart/mixed;
boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h";
protected-headers="v1"
From: Bryan Drewery
To: "O. Hartmann" , "Simon J. Gerraty"
Cc: svn-src-h...@freebsd.org, svn-src-all@freebsd.org,
src-committ...@freebsd.org
Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>
Subject: Re: svn commit: r325404 - head/share/mk
References: <201711042102.va4l2rur063...@repo.freebsd.org>
<20171104223133.00f5b...@thor.intern.walstatt.dynvpn.de>
<20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
In-Reply-To: <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
--MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable
On 11/4/2017 2:36 PM, O. Hartmann wrote:
> Am Sat, 4 Nov 2017 22:31:33 +0100
> "O. Hartmann" schrieb:
> =20
>> Am Sat, 4 Nov 2017 21:02:27 + (UTC)
>> "Simon J. Gerraty" schrieb:
>>
>>> Author: sjg
>>> Date: Sat Nov 4 21:02:26 2017
>>> New Revision: 325404
>>> URL: https://svnweb.freebsd.org/changeset/base/325404
>>>
>>> Log:
>>> Ensure .OBJDIR has known value
>>> =20
>>> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired
>>> use .CURDIR so that at least the classic
>>> .if ${.OBJDIR} !=3D ${.CURDIR}
>>> works and dangerous misstakes can be avoided.
>>> =20
>>> Reviewed by: bdrewery
>>>
>>> Modified:
>>> head/share/mk/auto.obj.mk
>>>
>>> Modified: head/share/mk/auto.obj.mk
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
>>> --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017(r32540
3)
>>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017(r32540
4)
>>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ=
DIR_UMA
>>> .endif
>>> # This causes make to use the specified directory as .OBJDIR
>>> .OBJDIR: ${__objdir}
>>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob=
jdir}/*} !=3D ""
>>> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA}
>>> +# we did not get what we want - do we care?
>>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D ""
>>> # watch out for __objdir being relative path
>>> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}=
/${__objdir}:L:tA})
>>> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR}
>>> .endif
>>> +.endif
>>> +# apparently we can live with it
>>> +# make sure we know what we have
>>> +.OBJDIR: ${.CURDIR}
>>> .endif
>>> .endif
>>> .endif
>>> ___
>>> svn-src-h...@freebsd.org mailing list
>>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.or=
g" =20
>>
>> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild=
with the error
>> shown below:
>>
>> [...]
>> =3D=3D=3D> src/nvidia (all) =20
>> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional=
>> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})=
make[7]: Fatal errors
>> encountered -- cannot continue
>> [...]
> =20
> The very same with emulators/virtualbox-ose-kmod:
> =20
> [...]
> kBuild:
> Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi=
rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src=
/vboxdrv/Makefile
> =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/=
mk/bsd.obj.mk" line 87:
> Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI=
R} =3D=3D /${RELDIR})
> make[6]: Fatal errors encountered -- cannot continue make[6]: stopped
> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv=
> *** Error code 1
> =20
> Stop.
> make[5]: stopped
> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src
> =3D=3D=3D> Compilation failed unexpected
Re: svn commit: r325404 - head/share/mk
On 11/4/2017 4:57 PM, Bryan Drewery wrote:
> On 11/4/2017 3:30 PM, Cy Schubert wrote:
>> In message <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>, Bryan
>> Drewery wr
>> ites:
>>> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
>>> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD
>>> Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h";
>>> protected-headers="v1"
>>> From: Bryan Drewery
>>> To: "O. Hartmann" , "Simon J. Gerraty"
>>>
>>> Cc: svn-src-h...@freebsd.org, svn-src-all@freebsd.org,
>>> src-committ...@freebsd.org
>>> Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>
>>> Subject: Re: svn commit: r325404 - head/share/mk
>>> References: <201711042102.va4l2rur063...@repo.freebsd.org>
>>> <20171104223133.00f5b...@thor.intern.walstatt.dynvpn.de>
>>> <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
>>> In-Reply-To: <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
>>>
>>> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h
>>> Content-Type: text/plain; charset=utf-8
>>> Content-Language: en-US
>>> Content-Transfer-Encoding: quoted-printable
>>>
>>> On 11/4/2017 2:36 PM, O. Hartmann wrote:
Am Sat, 4 Nov 2017 22:31:33 +0100
"O. Hartmann" schrieb:
=20
> Am Sat, 4 Nov 2017 21:02:27 + (UTC)
> "Simon J. Gerraty" schrieb:
>
>> Author: sjg
>> Date: Sat Nov 4 21:02:26 2017
>> New Revision: 325404
>> URL: https://svnweb.freebsd.org/changeset/base/325404
>>
>> Log:
>> Ensure .OBJDIR has known value
>> =20
>> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired
>> use .CURDIR so that at least the classic
>> .if ${.OBJDIR} !=3D ${.CURDIR}
>> works and dangerous misstakes can be avoided.
>> =20
>> Reviewed by: bdrewery
>>
>> Modified:
>> head/share/mk/auto.obj.mk
>>
>> Modified: head/share/mk/auto.obj.mk
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>>> =3D=3D=3D=3D=3D
>> --- head/share/mk/auto.obj.mkSat Nov 4 16:23:34 2017(r32540
>>> 3)
>> +++ head/share/mk/auto.obj.mkSat Nov 4 21:02:26 2017(r32540
>>> 4)
>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ=
>>> DIR_UMA
>> .endif
>> # This causes make to use the specified directory as .OBJDIR
>> .OBJDIR: ${__objdir}
>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob=
>>> jdir}/*} !=3D ""
>> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA}
>> +# we did not get what we want - do we care?
>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D ""
>> # watch out for __objdir being relative path
>> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}=
>>> /${__objdir}:L:tA})
>> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR}
>> .endif
>> +.endif
>> +# apparently we can live with it
>> +# make sure we know what we have
>> +.OBJDIR: ${.CURDIR}
>> .endif
>> .endif
>> .endif
>> ___
>> svn-src-h...@freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.or=
>>> g" =20
>
> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild=
>>> with the error
> shown below:
>
> [...]
> =3D=3D=3D> src/nvidia (all) =20
> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional=
>>>
> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})=
>>> make[7]: Fatal errors
> encountered -- cannot continue
> [...]
=20
The very same with emulators/virtualbox-ose-kmod:
=20
[...]
kBuild:
Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi=
>>> rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src=
>>> /vboxdrv/Makefile
=3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/=
>>> mk/bsd.obj.mk" line 87:
Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI=
>>> R} =3D=3D /${RELDIR})
make[6]: Fatal errors encountered -- cannot continue make[6]: stopped
in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
>>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv=
>>>
*** Error code 1
=20
Stop.
make[5]: stopped
in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
>>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src
=3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=
>>> =3Dyes and rebuild before
reporting the failure to the maintainer.
*** Error code 1
=20
=20
>>>
>>>
svn commit: r325413 - head
Author: bdrewery
Date: Sun Nov 5 00:11:55 2017
New Revision: 325413
URL: https://svnweb.freebsd.org/changeset/base/325413
Log:
Simplify location of bootstrap make.
Sponsored by: Dell EMC Isilon
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Sun Nov 5 00:11:51 2017(r325412)
+++ head/Makefile Sun Nov 5 00:11:55 2017(r325413)
@@ -209,7 +209,7 @@ WANT_MAKE_VERSION= 20160604
# 20160220 - support .dinclude for FAST_DEPEND.
WANT_MAKE_VERSION= 20160220
.endif
-MYMAKE=
${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
+MYMAKE=${OBJROOT}make.${MACHINE}/${WANT_MAKE}
.if defined(.PARSEDIR)
HAVE_MAKE= bmake
.else
@@ -407,10 +407,13 @@ upgrade_checks: .PHONY
# headers, libraries and tools. Also, allow the location of
# the system bsdmake-like utility to be overridden.
#
-MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
+MMAKEENV= \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
MMAKE= ${MMAKEENV} ${MAKE} \
+ OBJTOP=${MYMAKE:H}/obj \
+ OBJROOT='$${OBJTOP}/' \
+ MAKEOBJDIRPREFIX= \
MAN= -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR \
-DNO_SUBDIR \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325414 - head/share/mk
Author: bdrewery
Date: Sun Nov 5 00:11:58 2017
New Revision: 325414
URL: https://svnweb.freebsd.org/changeset/base/325414
Log:
AUTO_OBJ: Set .OBJDIR=.CURDIR earlier for NO_OBJ Makefiles.
auto.obj.mk is loaded before the Makefile which may have NO_OBJ set inside of
it. In that case we can't avoid creating the OBJDIR but we do need to avoid
using it. Fixing .OBJDIR in bsd.init.mk at least fixes all of the build .mk
files to have a proper .OBJDIR. It does not fix the Makefile itself but
usually if they have NO_OBJ set they are not inspecting ${.OBJDIR} anyhow.
It is ideal to only have this in bsd.init.mk and to remove it from bsd.obj.mk,
but then bsd.obj.mk would need to include bsd.init.mk. Doing something like
that would require more testing. It has been proposed that bsd.obj.mk not be
included directly but it has been possible for too long to do so to change it
at this point.
Note too that it may make sense to fix .OBJDIR even when AUTO_OBJ is not
enabled but the historical behavior has always been that NO_OBJ just avoids
running 'make obj', so .OBJDIR should already be .CURDIR.
Also while NO_OBJ seems like it should be removed at this point, it is not
always possible to fix Makefiles to properly use an .OBJDIR. The cost of
keeping NO_OBJ support is minimal.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/bsd.init.mk
head/share/mk/bsd.obj.mk
Modified: head/share/mk/bsd.init.mk
==
--- head/share/mk/bsd.init.mk Sun Nov 5 00:11:55 2017(r325413)
+++ head/share/mk/bsd.init.mk Sun Nov 5 00:11:58 2017(r325414)
@@ -10,6 +10,14 @@
:
.include
.-include "local.init.mk"
+
+.if ${MK_AUTO_OBJ} == "yes"
+# This is also done in bsd.obj.mk
+.if defined(NO_OBJ)
+.OBJDIR: ${.CURDIR}
+.endif
+.endif
+
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
Modified: head/share/mk/bsd.obj.mk
==
--- head/share/mk/bsd.obj.mkSun Nov 5 00:11:55 2017(r325413)
+++ head/share/mk/bsd.obj.mkSun Nov 5 00:11:58 2017(r325414)
@@ -47,6 +47,7 @@ :
objwarn:
obj:
CANONICALOBJDIR= ${.OBJDIR}
+# This is also done in bsd.init.mk
.if defined(NO_OBJ)
# but this makefile does not want it!
.OBJDIR: ${.CURDIR}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325418 - head/share/mk
Author: bdrewery
Date: Sun Nov 5 00:12:12 2017
New Revision: 325418
URL: https://svnweb.freebsd.org/changeset/base/325418
Log:
AUTO_OBJ: Allow 'make cleandir obj all' combinations.
The cleanobj target will not really remove the OBJDIR in this case,
it will only remove the OBJDIR if only clean targets are ran.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/bsd.dep.mk
head/share/mk/bsd.init.mk
head/share/mk/bsd.obj.mk
Modified: head/share/mk/bsd.dep.mk
==
--- head/share/mk/bsd.dep.mkSun Nov 5 00:12:09 2017(r325417)
+++ head/share/mk/bsd.dep.mkSun Nov 5 00:12:12 2017(r325418)
@@ -327,6 +327,10 @@ cleandepend:
.endif
.ORDER: cleandepend all
.ORDER: cleandepend depend
+.if ${MK_AUTO_OBJ} == "yes"
+.ORDER: cleanobj depend
+.ORDER: cleandir depend
+.endif
.if !target(checkdpadd) && (defined(DPADD) || defined(LDADD))
_LDADD_FROM_DPADD= ${DPADD:R:T:C;^lib(.*)$;-l\1;g}
Modified: head/share/mk/bsd.init.mk
==
--- head/share/mk/bsd.init.mk Sun Nov 5 00:12:09 2017(r325417)
+++ head/share/mk/bsd.init.mk Sun Nov 5 00:12:12 2017(r325418)
@@ -64,7 +64,8 @@ _SKIP_BUILD= not building at level 0
${.TARGETS:M*install*} == ${.TARGETS} || \
${.TARGETS:Mclean*} == ${.TARGETS} || \
${.TARGETS:Mdestroy*} == ${.TARGETS} || \
-make(obj) || make(analyze) || make(print-dir)
+${.TARGETS:Mobj} == ${.TARGETS} || \
+make(analyze) || make(print-dir)
# Skip building, but don't show a warning.
_SKIP_BUILD=
.endif
Modified: head/share/mk/bsd.obj.mk
==
--- head/share/mk/bsd.obj.mkSun Nov 5 00:12:09 2017(r325417)
+++ head/share/mk/bsd.obj.mkSun Nov 5 00:12:12 2017(r325418)
@@ -164,7 +164,8 @@ whereobj:
.endif
# Same check in bsd.progs.mk
-.if ${CANONICALOBJDIR} != ${.CURDIR} && exists(${CANONICALOBJDIR}/)
+.if ${CANONICALOBJDIR} != ${.CURDIR} && exists(${CANONICALOBJDIR}/) && \
+(${MK_AUTO_OBJ} == "no" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} == "")
cleanobj:
-rm -rf ${CANONICALOBJDIR}
.else
@@ -188,6 +189,10 @@ clean:
.endif
.endif
.ORDER: clean all
+.if ${MK_AUTO_OBJ} == "yes"
+.ORDER: cleanobj all
+.ORDER: cleandir all
+.endif
.include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325417 - head/share/mk
Author: bdrewery
Date: Sun Nov 5 00:12:09 2017
New Revision: 325417
URL: https://svnweb.freebsd.org/changeset/base/325417
Log:
Set the expected __objdir for auto.obj.mk to try.
This avoids some future discrepency that might cause auto.obj.mk to use the
wrong OBJDIR.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/src.sys.obj.mk
Modified: head/share/mk/src.sys.obj.mk
==
--- head/share/mk/src.sys.obj.mkSun Nov 5 00:12:05 2017
(r325416)
+++ head/share/mk/src.sys.obj.mkSun Nov 5 00:12:09 2017
(r325417)
@@ -94,9 +94,17 @@ OBJROOT:=${OBJTOP}/
.endif
.endif
-# Try to enable MK_AUTO_OBJ by default if we can write to the OBJROOT. Only
-# do this if AUTO_OBJ is not disabled by the user, not cleaning, and this
-# is the first make ran.
+# __objdir is the expected .OBJDIR we want to use and that auto.obj.mk will
+# try to create.
+.if !empty(MAKEOBJDIRPREFIX)
+__objdir:= ${MAKEOBJDIRPREFIX}${.CURDIR}
+.elif !empty(MAKEOBJDIR)
+__objdir:= ${MAKEOBJDIR}
+.endif
+
+# Try to enable MK_AUTO_OBJ by default if we can write to the __objdir. Only
+# do this if AUTO_OBJ is not disabled by the user, not cleaning, and this is
+# the first make ran.
.if 0 && ${.MAKE.LEVEL} == 0 && \
${MK_AUTO_OBJ} == "no" && empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) && \
!defined(WITHOUT_AUTO_OBJ) && !make(showconfig) && !make(print-dir) && \
@@ -138,15 +146,13 @@ CheckAutoObj() { \
echo no; \
fi; \
}
-.if !empty(MAKEOBJDIRPREFIX)
-WANTED_OBJDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}
-.else
-WANTED_OBJDIR= ${MAKEOBJDIR}
+.if !empty(__objdir)
+__objdir_writable!= \
+ ${CheckAutoObj}; CheckAutoObj "${__objdir}" || echo no
.endif
-OBJDIR_WRITABLE!= \
- ${CheckAutoObj}; CheckAutoObj "${WANTED_OBJDIR}" || echo no
+__objdir_writable?= no
# Export the decision to sub-makes.
-MK_AUTO_OBJ:= ${OBJDIR_WRITABLE}
+MK_AUTO_OBJ:= ${__objdir_writable}
.export MK_AUTO_OBJ
.elif make(showconfig)
# Need to export for showconfig internally running make -dg1. It is enabled
@@ -157,10 +163,8 @@ MK_AUTO_OBJ:= ${OBJDIR_WRITABLE}
# Assign this directory as .OBJDIR if possible.
#
# The expected OBJDIR already exists, set it as .OBJDIR.
-.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}${.CURDIR})
-.OBJDIR: ${MAKEOBJDIRPREFIX}${.CURDIR}
-.elif exists(${MAKEOBJDIR})
-.OBJDIR: ${MAKEOBJDIR}
+.if !empty(__objdir) && exists(${__objdir})
+.OBJDIR: ${__objdir}
# Special case to work around bmake bug. If the top-level .OBJDIR does not yet
# exist and MAKEOBJDIR is passed into environment and yield a blank value,
# bmake will incorrectly set .OBJDIR=${SRCTOP}/ rather than the expected
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325411 - head
Author: bdrewery
Date: Sun Nov 5 00:11:47 2017
New Revision: 325411
URL: https://svnweb.freebsd.org/changeset/base/325411
Log:
Set OBJROOT/OBJTOP as make arguments. Missed in r325329.
Sponsored by: Dell EMC Isilon
Modified:
head/Makefile.libcompat
Modified: head/Makefile.libcompat
==
--- head/Makefile.libcompat Sat Nov 4 23:28:02 2017(r325410)
+++ head/Makefile.libcompat Sun Nov 5 00:11:47 2017(r325411)
@@ -108,8 +108,6 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/inclu
# Yes, the flags are redundant.
LIBCOMPATWMAKEENV+= \
- OBJTOP=${LIBCOMPAT_OBJTOP} \
- OBJROOT='$${OBJTOP}/' \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \
SYSROOT=${LIBCOMPATTMP} \
@@ -129,6 +127,8 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
-DNO_LINT \
MK_TESTS=no
LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
+ OBJTOP=${LIBCOMPAT_OBJTOP} \
+ OBJROOT='$${OBJTOP}/' \
MK_MAN=no MK_HTML=no
LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
@@ -185,9 +185,9 @@ build${libcompat}: .PHONY
${_+_}cd ${.CURDIR}/${_dir}; \
WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
+ ${MAKE} SSP_CFLAGS= DESTDIR= \
OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
- ${MAKE} SSP_CFLAGS= DESTDIR= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
build-tools
.endfor
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325412 - in head: . targets/pseudo/bootstrap-tools
Author: bdrewery
Date: Sun Nov 5 00:11:51 2017
New Revision: 325412
URL: https://svnweb.freebsd.org/changeset/base/325412
Log:
Fix nested MAKEOBJDIRPREFIX breaking various release/buildworld/toolchain
targets.
This problem was caused by r325329 and r325350.
For the release(7) targets, some will run mm-mtree.sh which itself runs make
with a MAKEOBJDIRPREFIX. The execution of that script leaks OBJROOT,
MAKEOBJDIR, and MAKELEVEL=1 in the environment. This causes the mm-mtree
makes
to not do some basic setup of OBJROOT and only use this special
MAKEOBJDIRPREFIX case which fails to empty out MAKEOBJDIRPREFIX for further
nested makes, such as a tree walk. If that tree walk sets OBJROOT/OBJTOP such
as r325329 is doing, then the wrong OBJDIRs end up being used due to the
unemptied MAKEOBJDIRPREFIX being preferred over the proper MAKEOBJDIR.
Pointyhat to: bdrewery
Sponsored by: Dell EMC Isilon
Modified:
head/Makefile.inc1
head/Makefile.libcompat
head/targets/pseudo/bootstrap-tools/Makefile
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Nov 5 00:11:47 2017(r325411)
+++ head/Makefile.inc1 Sun Nov 5 00:11:51 2017(r325412)
@@ -523,6 +523,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
BSARGS=DESTDIR= \
OBJTOP='${WORLDTMP}/obj-tools' \
OBJROOT='$${OBJTOP}/' \
+ MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \
@@ -565,6 +566,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} \
DESTDIR= \
OBJTOP='${WORLDTMP}/obj-kernel-tools' \
OBJROOT='$${OBJTOP}/' \
+ MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
MK_HTML=no -DNO_LINT MK_MAN=no \
Modified: head/Makefile.libcompat
==
--- head/Makefile.libcompat Sun Nov 5 00:11:47 2017(r325411)
+++ head/Makefile.libcompat Sun Nov 5 00:11:51 2017(r325412)
@@ -129,6 +129,7 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
+ MAKEOBJDIRPREFIX= \
MK_MAN=no MK_HTML=no
LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
@@ -188,6 +189,7 @@ build${libcompat}: .PHONY
${MAKE} SSP_CFLAGS= DESTDIR= \
OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
+ MAKEOBJDIRPREFIX= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
build-tools
.endfor
Modified: head/targets/pseudo/bootstrap-tools/Makefile
==
--- head/targets/pseudo/bootstrap-tools/MakefileSun Nov 5 00:11:47
2017(r325411)
+++ head/targets/pseudo/bootstrap-tools/MakefileSun Nov 5 00:11:51
2017(r325412)
@@ -36,6 +36,7 @@ OSRELDATE?= 0
BSARGS=DESTDIR= \
OBJTOP='${WORLDTMP}/obj-tools' \
OBJROOT='$${OBJTOP}/' \
+ MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \
SSP_CFLAGS= \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325416 - head/share/mk
Author: bdrewery
Date: Sun Nov 5 00:12:05 2017
New Revision: 325416
URL: https://svnweb.freebsd.org/changeset/base/325416
Log:
Always try to set .OBJDIR, even if AUTO_OBJ is enabled, and fallback to
.CURDIR.
When AUTO_OBJ is enabled this change becomes redundant with the auto.obj.mk
check added in r325404. However, it is possible that new code is added
at some point between src.sys.obj.mk and auto.obj.mk that disables AUTO_OBJ.
That could leave make with a bogus and unsafe .OBJDIR in some cases.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/src.sys.obj.mk
Modified: head/share/mk/src.sys.obj.mk
==
--- head/share/mk/src.sys.obj.mkSun Nov 5 00:12:02 2017
(r325415)
+++ head/share/mk/src.sys.obj.mkSun Nov 5 00:12:05 2017
(r325416)
@@ -154,9 +154,8 @@ MK_AUTO_OBJ:= ${OBJDIR_WRITABLE}
.export MK_AUTO_OBJ
.endif # ${MK_AUTO_OBJ} == "no" && ...
-# Assign this directory as .OBJDIR if possible after determining if AUTO_OBJ
-# can be enabled by default.
-.if ${MK_AUTO_OBJ} == "no"
+# Assign this directory as .OBJDIR if possible.
+#
# The expected OBJDIR already exists, set it as .OBJDIR.
.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}${.CURDIR})
.OBJDIR: ${MAKEOBJDIRPREFIX}${.CURDIR}
@@ -169,5 +168,10 @@ MK_AUTO_OBJ:= ${OBJDIR_WRITABLE}
.elif ${MAKE_VERSION} <= 20170720 && \
${.CURDIR} == ${SRCTOP} && ${.OBJDIR} == ${SRCTOP}/
.OBJDIR: ${.CURDIR}
+.else
+# The OBJDIR we wanted does not yet exist, ensure we default to safe .CURDIR
+# in case make started with a bogus MAKEOBJDIR, that expanded before OBJTOP
+# was set, that happened to match some unexpected directory. Either
+# auto.obj.mk or bsd.obj.mk will create the directory and fix .OBJDIR later.
+.OBJDIR: ${.CURDIR}
.endif
-.endif # ${MK_AUTO_OBJ} == "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325415 - head/share/mk
Author: bdrewery
Date: Sun Nov 5 00:12:02 2017
New Revision: 325415
URL: https://svnweb.freebsd.org/changeset/base/325415
Log:
Validate MAKEOBJDIR after the MAKEOBJDIRPREFIX override.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/src.sys.obj.mk
Modified: head/share/mk/src.sys.obj.mk
==
--- head/share/mk/src.sys.obj.mkSun Nov 5 00:11:58 2017
(r325414)
+++ head/share/mk/src.sys.obj.mkSun Nov 5 00:12:02 2017
(r325415)
@@ -77,13 +77,6 @@ OBJTOP:= ${OBJROOT}${TARGET:D${TARGET}.${TARGET_ARCH}:
OBJTOP:= ${OBJROOT:H}
.endif # ${MK_UNIFIED_OBJDIR} == "yes"
-# Wait to validate MAKEOBJDIR until OBJTOP is set.
-.if defined(MAKEOBJDIR)
-.if ${MAKEOBJDIR:M/*} == ""
-.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get
default: MAKEOBJDIR='${_default_makeobjdir}'
-.endif
-.endif
-
# Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX but leave it alone
# for DIRDEPS_BUILD which really wants to know the absolute top at
# all times. This intenionally comes after adding TARGET.TARGET_ARCH
@@ -92,6 +85,13 @@ OBJTOP:= ${OBJROOT:H}
.if !empty(MAKEOBJDIRPREFIX) && ${MK_DIRDEPS_BUILD} == "no"
OBJTOP:= ${MAKEOBJDIRPREFIX}${SRCTOP}
OBJROOT:= ${OBJTOP}/
+.endif
+
+# Wait to validate MAKEOBJDIR until OBJTOP is set.
+.if defined(MAKEOBJDIR)
+.if ${MAKEOBJDIR:M/*} == ""
+.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get
default: MAKEOBJDIR='${_default_makeobjdir}'
+.endif
.endif
# Try to enable MK_AUTO_OBJ by default if we can write to the OBJROOT. Only
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325404 - head/share/mk
On 11/4/2017 3:30 PM, Cy Schubert wrote:
> In message <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>, Bryan
> Drewery wr
> ites:
>> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
>> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD
>> Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h";
>> protected-headers="v1"
>> From: Bryan Drewery
>> To: "O. Hartmann" , "Simon J. Gerraty"
>>
>> Cc: svn-src-h...@freebsd.org, svn-src-all@freebsd.org,
>> src-committ...@freebsd.org
>> Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>
>> Subject: Re: svn commit: r325404 - head/share/mk
>> References: <201711042102.va4l2rur063...@repo.freebsd.org>
>> <20171104223133.00f5b...@thor.intern.walstatt.dynvpn.de>
>> <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
>> In-Reply-To: <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
>>
>> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h
>> Content-Type: text/plain; charset=utf-8
>> Content-Language: en-US
>> Content-Transfer-Encoding: quoted-printable
>>
>> On 11/4/2017 2:36 PM, O. Hartmann wrote:
>>> Am Sat, 4 Nov 2017 22:31:33 +0100
>>> "O. Hartmann" schrieb:
>>> =20
Am Sat, 4 Nov 2017 21:02:27 + (UTC)
"Simon J. Gerraty" schrieb:
> Author: sjg
> Date: Sat Nov 4 21:02:26 2017
> New Revision: 325404
> URL: https://svnweb.freebsd.org/changeset/base/325404
>
> Log:
> Ensure .OBJDIR has known value
> =20
> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired
> use .CURDIR so that at least the classic
> .if ${.OBJDIR} !=3D ${.CURDIR}
> works and dangerous misstakes can be avoided.
> =20
> Reviewed by: bdrewery
>
> Modified:
> head/share/mk/auto.obj.mk
>
> Modified: head/share/mk/auto.obj.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
>> =3D=3D=3D=3D=3D
> --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017(r32540
>> 3)
> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017(r32540
>> 4)
> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ=
>> DIR_UMA
> .endif
> # This causes make to use the specified directory as .OBJDIR
> .OBJDIR: ${__objdir}
> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob=
>> jdir}/*} !=3D ""
> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA}
> +# we did not get what we want - do we care?
> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D ""
> # watch out for __objdir being relative path
> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}=
>> /${__objdir}:L:tA})
> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR}
> .endif
> +.endif
> +# apparently we can live with it
> +# make sure we know what we have
> +.OBJDIR: ${.CURDIR}
> .endif
> .endif
> .endif
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.or=
>> g" =20
With the recent patches, nvidia driver x11/nvidia-driver fails tobuild=
>> with the error
shown below:
[...]
=3D=3D=3D> src/nvidia (all) =20
make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional=
>>
(${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})=
>> make[7]: Fatal errors
encountered -- cannot continue
[...]
>>> =20
>>> The very same with emulators/virtualbox-ose-kmod:
>>> =20
>>> [...]
>>> kBuild:
>>> Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi=
>> rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src=
>> /vboxdrv/Makefile
>>> =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/=
>> mk/bsd.obj.mk" line 87:
>>> Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI=
>> R} =3D=3D /${RELDIR})
>>> make[6]: Fatal errors encountered -- cannot continue make[6]: stopped
>>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv=
>>
>>> *** Error code 1
>>> =20
>>> Stop.
>>> make[5]: stopped
>>> in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
>> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src
>>> =3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=
>> =3Dyes and rebuild before
>>> reporting the failure to the maintainer.
>>> *** Error code 1
>>> =20
>>> =20
>>
>> It was r325405 ... fixed in r325408.
>
>
> Not really, mergemaster output.
>
> *** Creating the temporary root environment in /tmp/temproot
> *** /tmp/temproot ready
svn commit: r325410 - head/sys/arm/allwinner
Author: gonzo
Date: Sat Nov 4 23:28:02 2017
New Revision: 325410
URL: https://svnweb.freebsd.org/changeset/base/325410
Log:
Increase TX_MAX_SEGS from 10 to 20 for the if_awg.c driver
Under certain traffic pattern awg driver does not recover from TX queue
full condition. The actual source of the problem is not identified yet
but jmcneill@ agreed that bumping TX_MAX_SEGS to 20 is OK as a workaround
for the problem (NetBSD has it set to 128).
Also add some diagnostic printfs to prevent silent failure of bus_dma
functions in the future
PR will be kept open until root cause of the issue is identified and fixed
PR: 219927
Submitted by: Tom Vijlbrief
Approved by: jmcneill
MFC after:2 weeks
Modified:
head/sys/arm/allwinner/if_awg.c
Modified: head/sys/arm/allwinner/if_awg.c
==
--- head/sys/arm/allwinner/if_awg.c Sat Nov 4 22:23:41 2017
(r325409)
+++ head/sys/arm/allwinner/if_awg.c Sat Nov 4 23:28:02 2017
(r325410)
@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$");
#defineTX_SKIP(n, o) (((n) + (o)) & (TX_DESC_COUNT - 1))
#defineRX_NEXT(n) (((n) + 1) & (RX_DESC_COUNT - 1))
-#defineTX_MAX_SEGS 10
+#defineTX_MAX_SEGS 20
#defineSOFT_RST_RETRY 1000
#defineMII_BUSY_RETRY 1000
@@ -192,6 +192,7 @@ struct awg_softc {
struct resource *res[_RES_NITEMS];
struct mtx mtx;
if_tifp;
+ device_tdev;
device_tmiibus;
struct callout stat_ch;
struct task link_task;
@@ -421,14 +422,18 @@ awg_setup_txbuf(struct awg_softc *sc, int index, struc
sc->tx.buf_map[index].map, m, segs, &nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
m = m_collapse(m, M_NOWAIT, TX_MAX_SEGS);
- if (m == NULL)
+ if (m == NULL) {
+ device_printf(sc->dev, "awg_setup_txbuf: m_collapse
failed\n");
return (0);
+ }
*mp = m;
error = bus_dmamap_load_mbuf_sg(sc->tx.buf_tag,
sc->tx.buf_map[index].map, m, segs, &nsegs, BUS_DMA_NOWAIT);
}
- if (error != 0)
+ if (error != 0) {
+ device_printf(sc->dev, "awg_setup_txbuf:
bus_dmamap_load_mbuf_sg failed\n");
return (0);
+ }
bus_dmamap_sync(sc->tx.buf_tag, sc->tx.buf_map[index].map,
BUS_DMASYNC_PREWRITE);
@@ -1613,6 +1618,7 @@ awg_attach(device_t dev)
int error;
sc = device_get_softc(dev);
+ sc->dev = dev;
sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
node = ofw_bus_get_node(dev);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325404 - head/share/mk
In message <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>, Bryan
Drewery wr
ites:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --dokLDw6wDnv1gUfKm3uwMSMnWeibN2RaD
> Content-Type: multipart/mixed; boundary="MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h";
> protected-headers="v1"
> From: Bryan Drewery
> To: "O. Hartmann" , "Simon J. Gerraty"
>
> Cc: svn-src-h...@freebsd.org, svn-src-all@freebsd.org,
> src-committ...@freebsd.org
> Message-ID: <0fc7e918-dcf8-0197-6b50-5936dee23...@freebsd.org>
> Subject: Re: svn commit: r325404 - head/share/mk
> References: <201711042102.va4l2rur063...@repo.freebsd.org>
> <20171104223133.00f5b...@thor.intern.walstatt.dynvpn.de>
> <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
> In-Reply-To: <20171104223650.77c06...@thor.intern.walstatt.dynvpn.de>
>
> --MKHGkKGfLlBFL1Vl1W5AEj2BccB14C28h
> Content-Type: text/plain; charset=utf-8
> Content-Language: en-US
> Content-Transfer-Encoding: quoted-printable
>
> On 11/4/2017 2:36 PM, O. Hartmann wrote:
> > Am Sat, 4 Nov 2017 22:31:33 +0100
> > "O. Hartmann" schrieb:
> >=20
> >> Am Sat, 4 Nov 2017 21:02:27 + (UTC)
> >> "Simon J. Gerraty" schrieb:
> >>
> >>> Author: sjg
> >>> Date: Sat Nov 4 21:02:26 2017
> >>> New Revision: 325404
> >>> URL: https://svnweb.freebsd.org/changeset/base/325404
> >>>
> >>> Log:
> >>> Ensure .OBJDIR has known value
> >>> =20
> >>> If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired
> >>> use .CURDIR so that at least the classic
> >>> .if ${.OBJDIR} !=3D ${.CURDIR}
> >>> works and dangerous misstakes can be avoided.
> >>> =20
> >>> Reviewed by: bdrewery
> >>>
> >>> Modified:
> >>> head/share/mk/auto.obj.mk
> >>>
> >>> Modified: head/share/mk/auto.obj.mk
> >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D
> >>> --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017(r32540
> 3)
> >>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017(r32540
> 4)
> >>> @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJ=
> DIR_UMA
> >>> .endif
> >>> # This causes make to use the specified directory as .OBJDIR
> >>> .OBJDIR: ${__objdir}
> >>> -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__ob=
> jdir}/*} !=3D ""
> >>> +.if ${.OBJDIR:tA} !=3D ${__objdir:tA}
> >>> +# we did not get what we want - do we care?
> >>> +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D ""
> >>> # watch out for __objdir being relative path
> >>> .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}=
> /${__objdir}:L:tA})
> >>> .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR}
> >>> .endif
> >>> +.endif
> >>> +# apparently we can live with it
> >>> +# make sure we know what we have
> >>> +.OBJDIR: ${.CURDIR}
> >>> .endif
> >>> .endif
> >>> .endif
> >>> ___
> >>> svn-src-h...@freebsd.org mailing list
> >>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> >>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.or=
> g" =20
> >>
> >> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild=
> with the error
> >> shown below:
> >>
> >> [...]
> >> =3D=3D=3D> src/nvidia (all) =20
> >> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional=
>
> >> (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR})=
> make[7]: Fatal errors
> >> encountered -- cannot continue
> >> [...]
> >=20
> > The very same with emulators/virtualbox-ose-kmod:
> >=20
> > [...]
> > kBuild:
> > Installing /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/vi=
> rtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src=
> /vboxdrv/Makefile
> > =3D=3D=3D Building 'vboxdrv' module =3D=3D=3D make[6]: "/usr/src/share/=
> mk/bsd.obj.mk" line 87:
> > Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDI=
> R} =3D=3D /${RELDIR})
> > make[6]: Fatal errors encountered -- cannot continue make[6]: stopped
> > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv=
>
> > *** Error code 1
> >=20
> > Stop.
> > make[5]: stopped
> > in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox=
> -ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src
> > =3D=3D=3D> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=
> =3Dyes and rebuild before
> > reporting the failure to the maintainer.
> > *** Error code 1
> >=20
> >=20
>
> It was r325405 ... fixed in r325408.
Not really, mergemaster output.
*** Creating the temporary root environment in /tmp/temproot
*** /tmp/temproot ready for use
*** Creating and populating directory structure in /tmp/temproot
make[3]: "/opt/src/svn-curren
svn commit: r325409 - stable/11/libexec/rtld-elf
Author: bdrewery Date: Sat Nov 4 22:23:41 2017 New Revision: 325409 URL: https://svnweb.freebsd.org/changeset/base/325409 Log: MFC r318432: Fix some nroff syntax in rtld.1. PR: 223420 Modified: stable/11/libexec/rtld-elf/rtld.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.1 == --- stable/11/libexec/rtld-elf/rtld.1 Sat Nov 4 21:59:54 2017 (r325408) +++ stable/11/libexec/rtld-elf/rtld.1 Sat Nov 4 22:23:41 2017 (r325409) @@ -193,7 +193,7 @@ the directories specified by will be searched first followed by the set of built-in standard directories. This variable is unset for set-user-ID and set-group-ID programs. -.Ev LD_LIBRARY_PATH_FDS +.It Ev LD_LIBRARY_PATH_FDS A colon separated list of file descriptor numbers for library directories. This is intended for use within .Xr capsicum 4 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325404 - head/share/mk
On 11/4/2017 2:36 PM, O. Hartmann wrote:
> Am Sat, 4 Nov 2017 22:31:33 +0100
> "O. Hartmann" schrieb:
>
>> Am Sat, 4 Nov 2017 21:02:27 + (UTC)
>> "Simon J. Gerraty" schrieb:
>>
>>> Author: sjg
>>> Date: Sat Nov 4 21:02:26 2017
>>> New Revision: 325404
>>> URL: https://svnweb.freebsd.org/changeset/base/325404
>>>
>>> Log:
>>> Ensure .OBJDIR has known value
>>>
>>> If for any reason we cannot set .OBJDIR==_objdir as desired
>>> use .CURDIR so that at least the classic
>>> .if ${.OBJDIR} != ${.CURDIR}
>>> works and dangerous misstakes can be avoided.
>>>
>>> Reviewed by: bdrewery
>>>
>>> Modified:
>>> head/share/mk/auto.obj.mk
>>>
>>> Modified: head/share/mk/auto.obj.mk
>>> ==
>>> --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017
>>> (r325403)
>>> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017
>>> (r325404)
>>> @@ -61,11 +61,17 @@ __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMA
>>> .endif
>>> # This causes make to use the specified directory as .OBJDIR
>>> .OBJDIR: ${__objdir}
>>> -.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*}
>>> != ""
>>> +.if ${.OBJDIR:tA} != ${__objdir:tA}
>>> +# we did not get what we want - do we care?
>>> +.if ${__objdir_made:Uno:M${__objdir}/*} != ""
>>> # watch out for __objdir being relative path
>>> .if !(${__objdir:M/*} == "" && ${.OBJDIR:tA} ==
>>> ${${.CURDIR}/${__objdir}:L:tA})
>>> .error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
>>> .endif
>>> +.endif
>>> +# apparently we can live with it
>>> +# make sure we know what we have
>>> +.OBJDIR: ${.CURDIR}
>>> .endif
>>> .endif
>>> .endif
>>> ___
>>> svn-src-h...@freebsd.org mailing list
>>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>>
>> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild with
>> the error
>> shown below:
>>
>> [...]
>> ===> src/nvidia (all)
>> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional
>> (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}) make[7]:
>> Fatal errors
>> encountered -- cannot continue
>> [...]
>
> The very same with emulators/virtualbox-ose-kmod:
>
> [...]
> kBuild:
> Installing
> /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv/Makefile
> === Building 'vboxdrv' module === make[6]: "/usr/src/share/mk/bsd.obj.mk"
> line 87:
> Malformed conditional (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} ==
> /${RELDIR})
> make[6]: Fatal errors encountered -- cannot continue make[6]: stopped
> in
> /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv
> *** Error code 1
>
> Stop.
> make[5]: stopped
> in
> /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src
> ===> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and
> rebuild before
> reporting the failure to the maintainer.
> *** Error code 1
>
>
It was r325405 ... fixed in r325408.
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
svn commit: r325408 - head/share/mk
Author: bdrewery
Date: Sat Nov 4 21:59:54 2017
New Revision: 325408
URL: https://svnweb.freebsd.org/changeset/base/325408
Log:
Follow-up r325405: Only enable assertion for in-tree src builds.
Pointyhat to: bdrewery
Reported by: O. Hartmann
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/bsd.obj.mk
Modified: head/share/mk/bsd.obj.mk
==
--- head/share/mk/bsd.obj.mkSat Nov 4 21:30:27 2017(r325407)
+++ head/share/mk/bsd.obj.mkSat Nov 4 21:59:54 2017(r325408)
@@ -84,7 +84,8 @@ OBJTOP?= ${MAKEOBJDIR}
CANONICALOBJDIR:=/usr/obj${.CURDIR}
.endif
-.if ${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}
+.if defined(SRCTOP) && \
+(${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR})
.error .OBJDIR incorrectly set to /${RELDIR}
.endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325404 - head/share/mk
Am Sat, 4 Nov 2017 22:31:33 +0100
"O. Hartmann" schrieb:
> Am Sat, 4 Nov 2017 21:02:27 + (UTC)
> "Simon J. Gerraty" schrieb:
>
> > Author: sjg
> > Date: Sat Nov 4 21:02:26 2017
> > New Revision: 325404
> > URL: https://svnweb.freebsd.org/changeset/base/325404
> >
> > Log:
> > Ensure .OBJDIR has known value
> >
> > If for any reason we cannot set .OBJDIR==_objdir as desired
> > use .CURDIR so that at least the classic
> > .if ${.OBJDIR} != ${.CURDIR}
> > works and dangerous misstakes can be avoided.
> >
> > Reviewed by: bdrewery
> >
> > Modified:
> > head/share/mk/auto.obj.mk
> >
> > Modified: head/share/mk/auto.obj.mk
> > ==
> > --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017
> > (r325403)
> > +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017
> > (r325404)
> > @@ -61,11 +61,17 @@ __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMA
> > .endif
> > # This causes make to use the specified directory as .OBJDIR
> > .OBJDIR: ${__objdir}
> > -.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*}
> > != ""
> > +.if ${.OBJDIR:tA} != ${__objdir:tA}
> > +# we did not get what we want - do we care?
> > +.if ${__objdir_made:Uno:M${__objdir}/*} != ""
> > # watch out for __objdir being relative path
> > .if !(${__objdir:M/*} == "" && ${.OBJDIR:tA} ==
> > ${${.CURDIR}/${__objdir}:L:tA})
> > .error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
> > .endif
> > +.endif
> > +# apparently we can live with it
> > +# make sure we know what we have
> > +.OBJDIR: ${.CURDIR}
> > .endif
> > .endif
> > .endif
> > ___
> > svn-src-h...@freebsd.org mailing list
> > https://lists.freebsd.org/mailman/listinfo/svn-src-head
> > To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
> With the recent patches, nvidia driver x11/nvidia-driver fails tobuild with
> the error
> shown below:
>
> [...]
> ===> src/nvidia (all)
> make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional
> (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}) make[7]: Fatal
> errors
> encountered -- cannot continue
> [...]
The very same with emulators/virtualbox-ose-kmod:
[...]
kBuild:
Installing
/usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv/Makefile
=== Building 'vboxdrv' module === make[6]: "/usr/src/share/mk/bsd.obj.mk" line
87:
Malformed conditional (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} ==
/${RELDIR})
make[6]: Fatal errors encountered -- cannot continue make[6]: stopped
in
/usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src/vboxdrv
*** Error code 1
Stop.
make[5]: stopped
in
/usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-5.2.0/out/freebsd.amd64/release/bin/src
===> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and
rebuild before
reporting the failure to the maintainer.
*** Error code 1
--
O. Hartmann
Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
pgpDd3HXGDohv.pgp
Description: OpenPGP digital signature
Re: svn commit: r325404 - head/share/mk
Am Sat, 4 Nov 2017 21:02:27 + (UTC)
"Simon J. Gerraty" schrieb:
> Author: sjg
> Date: Sat Nov 4 21:02:26 2017
> New Revision: 325404
> URL: https://svnweb.freebsd.org/changeset/base/325404
>
> Log:
> Ensure .OBJDIR has known value
>
> If for any reason we cannot set .OBJDIR==_objdir as desired
> use .CURDIR so that at least the classic
> .if ${.OBJDIR} != ${.CURDIR}
> works and dangerous misstakes can be avoided.
>
> Reviewed by: bdrewery
>
> Modified:
> head/share/mk/auto.obj.mk
>
> Modified: head/share/mk/auto.obj.mk
> ==
> --- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017(r325403)
> +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017(r325404)
> @@ -61,11 +61,17 @@ __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMA
> .endif
> # This causes make to use the specified directory as .OBJDIR
> .OBJDIR: ${__objdir}
> -.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*}
> != ""
> +.if ${.OBJDIR:tA} != ${__objdir:tA}
> +# we did not get what we want - do we care?
> +.if ${__objdir_made:Uno:M${__objdir}/*} != ""
> # watch out for __objdir being relative path
> .if !(${__objdir:M/*} == "" && ${.OBJDIR:tA} ==
> ${${.CURDIR}/${__objdir}:L:tA})
> .error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
> .endif
> +.endif
> +# apparently we can live with it
> +# make sure we know what we have
> +.OBJDIR: ${.CURDIR}
> .endif
> .endif
> .endif
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
With the recent patches, nvidia driver x11/nvidia-driver fails tobuild with the
error
shown below:
[...]
===> src/nvidia (all)
make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional
(${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}) make[7]: Fatal
errors
encountered -- cannot continue
[...]
--
O. Hartmann
Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
pgpA2S0r3Qn1x.pgp
Description: OpenPGP digital signature
svn commit: r325407 - stable/10/sys/fs/nfs
Author: rmacklem
Date: Sat Nov 4 21:30:27 2017
New Revision: 325407
URL: https://svnweb.freebsd.org/changeset/base/325407
Log:
MFC: r324506
Fix forced dismount when a pNFS mount is hung on a DS.
When a "pnfs" NFSv4.1 mount is hung because of an unresponsive DS,
a forced dismount wouldn't work, because the RPC socket for the DS
was not being closed. This patch fixes this.
This will only affect "pnfs" mounts where the pNFS server's DS
is unresponsive (crashed or network partitioned or...).
Found during testing of the pNFS server.
Modified:
stable/10/sys/fs/nfs/nfs_commonkrpc.c
stable/10/sys/fs/nfs/nfsclstate.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/fs/nfs/nfs_commonkrpc.c
==
--- stable/10/sys/fs/nfs/nfs_commonkrpc.c Sat Nov 4 21:06:39 2017
(r325406)
+++ stable/10/sys/fs/nfs/nfs_commonkrpc.c Sat Nov 4 21:30:27 2017
(r325407)
@@ -1120,9 +1120,29 @@ nfsmout:
int
newnfs_nmcancelreqs(struct nfsmount *nmp)
{
+ struct nfsclds *dsp;
+ struct __rpc_client *cl;
if (nmp->nm_sockreq.nr_client != NULL)
CLNT_CLOSE(nmp->nm_sockreq.nr_client);
+lookformore:
+ NFSLOCKMNT(nmp);
+ TAILQ_FOREACH(dsp, &nmp->nm_sess, nfsclds_list) {
+ NFSLOCKDS(dsp);
+ if (dsp != TAILQ_FIRST(&nmp->nm_sess) &&
+ (dsp->nfsclds_flags & NFSCLDS_CLOSED) == 0 &&
+ dsp->nfsclds_sockp != NULL &&
+ dsp->nfsclds_sockp->nr_client != NULL) {
+ dsp->nfsclds_flags |= NFSCLDS_CLOSED;
+ cl = dsp->nfsclds_sockp->nr_client;
+ NFSUNLOCKDS(dsp);
+ NFSUNLOCKMNT(nmp);
+ CLNT_CLOSE(cl);
+ goto lookformore;
+ }
+ NFSUNLOCKDS(dsp);
+ }
+ NFSUNLOCKMNT(nmp);
return (0);
}
Modified: stable/10/sys/fs/nfs/nfsclstate.h
==
--- stable/10/sys/fs/nfs/nfsclstate.h Sat Nov 4 21:06:39 2017
(r325406)
+++ stable/10/sys/fs/nfs/nfsclstate.h Sat Nov 4 21:30:27 2017
(r325407)
@@ -91,6 +91,7 @@ struct nfsclds {
#defineNFSCLDS_HASWRITEVERF0x0001
#defineNFSCLDS_MDS 0x0002
#defineNFSCLDS_DS 0x0004
+#defineNFSCLDS_CLOSED 0x0008
struct nfsclclient {
LIST_ENTRY(nfsclclient) nfsc_list;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325406 - head/share/mk
Author: bdrewery
Date: Sat Nov 4 21:06:39 2017
New Revision: 325406
URL: https://svnweb.freebsd.org/changeset/base/325406
Log:
AUTO_OBJ: Revert r325351 now that the fix is in auto.obj.mk in r325404.
Forcing MK_AUTO_OBJ to no is not really needed since bsd.obj.mk is protected
against 'rm -rf ${.CURDIR}' already. It was also flawed as if MK_AUTO_OBJ=yes
was in the .MAKEOVERRIDES already then it just remained on.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/sys.mk
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkSat Nov 4 21:05:03 2017(r325405)
+++ head/share/mk/sys.mkSat Nov 4 21:06:39 2017(r325406)
@@ -120,12 +120,6 @@ NO_META_IGNORE_HOST_HEADERS= 1
# is not expected.
.if !make(showconfig) && !make(print-dir)
.sinclude
-# The .OBJDIR was not set, disable MK_AUTO_OBJ so downstream checks won't
-# assume .OBJDIR is proper.
-.if defined(__objdir) && ${.OBJDIR} != ${__objdir}
-.MAKEOVERRIDES+= MK_AUTO_OBJ
-MK_AUTO_OBJ= no
-.endif
.endif
.endif # ${MK_AUTO_OBJ} == "yes"
.else # bmake
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325405 - head/share/mk
Author: bdrewery
Date: Sat Nov 4 21:05:03 2017
New Revision: 325405
URL: https://svnweb.freebsd.org/changeset/base/325405
Log:
Add an assertion to avoid the 'rm -rf /etc' case from cleanobj fixed in
r325404.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/bsd.obj.mk
Modified: head/share/mk/bsd.obj.mk
==
--- head/share/mk/bsd.obj.mkSat Nov 4 21:02:26 2017(r325404)
+++ head/share/mk/bsd.obj.mkSat Nov 4 21:05:03 2017(r325405)
@@ -84,6 +84,10 @@ OBJTOP?= ${MAKEOBJDIR}
CANONICALOBJDIR:=/usr/obj${.CURDIR}
.endif
+.if ${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}
+.error .OBJDIR incorrectly set to /${RELDIR}
+.endif
+
OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
#
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325404 - head/share/mk
Author: sjg
Date: Sat Nov 4 21:02:26 2017
New Revision: 325404
URL: https://svnweb.freebsd.org/changeset/base/325404
Log:
Ensure .OBJDIR has known value
If for any reason we cannot set .OBJDIR==_objdir as desired
use .CURDIR so that at least the classic
.if ${.OBJDIR} != ${.CURDIR}
works and dangerous misstakes can be avoided.
Reviewed by: bdrewery
Modified:
head/share/mk/auto.obj.mk
Modified: head/share/mk/auto.obj.mk
==
--- head/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017(r325403)
+++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017(r325404)
@@ -61,11 +61,17 @@ __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMA
.endif
# This causes make to use the specified directory as .OBJDIR
.OBJDIR: ${__objdir}
-.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} !=
""
+.if ${.OBJDIR:tA} != ${__objdir:tA}
+# we did not get what we want - do we care?
+.if ${__objdir_made:Uno:M${__objdir}/*} != ""
# watch out for __objdir being relative path
.if !(${__objdir:M/*} == "" && ${.OBJDIR:tA} == ${${.CURDIR}/${__objdir}:L:tA})
.error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
.endif
+.endif
+# apparently we can live with it
+# make sure we know what we have
+.OBJDIR: ${.CURDIR}
.endif
.endif
.endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325386 - head/sys/kern
This is a functional change, because MPASS (via KASSERT) is only
enabled on DEBUG kernels. Ideally we would have a kind of ASSERT that
worked on NODEBUG kernels.
Best,
Conrad
On Sat, Nov 4, 2017 at 3:49 AM, Konstantin Belousov wrote:
> Author: kib
> Date: Sat Nov 4 10:49:34 2017
> New Revision: 325386
> URL: https://svnweb.freebsd.org/changeset/base/325386
>
> Log:
> Convert explicit panic() call to assert.
>
> Based on github pull request: #113
> Submitted by: pmarillo@github
> MFC after:1 week
>
> Modified:
> head/sys/kern/kern_umtx.c
>
> Modified: head/sys/kern/kern_umtx.c
> ==
> --- head/sys/kern/kern_umtx.c Sat Nov 4 10:10:34 2017(r325385)
> +++ head/sys/kern/kern_umtx.c Sat Nov 4 10:49:34 2017(r325386)
> @@ -1579,8 +1579,7 @@ umtx_pi_setowner(struct umtx_pi *pi, struct thread *ow
>
> uq_owner = owner->td_umtxq;
> mtx_assert(&umtx_lock, MA_OWNED);
> - if (pi->pi_owner != NULL)
> - panic("pi_owner != NULL");
> + MPASS(pi->pi_owner == NULL);
> pi->pi_owner = owner;
> TAILQ_INSERT_TAIL(&uq_owner->uq_pi_contested, pi, pi_link);
> }
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r324853 - in head/sys: kern sys
On Sun, 22 Oct 2017, Konstantin Belousov wrote: Author: kib Date: Sun Oct 22 08:11:45 2017 New Revision: 324853 URL: https://svnweb.freebsd.org/changeset/base/324853 Log: Remove the support for mknod(S_IFMT), which created dummy vnodes with VBAD type. FFS ffs_write() VOP catches such vnodes and panics, other VOPs do not check for the type and their behaviour is really undefined. The comment claims that this support was done for 'badsect' to flag bad sectors, we do not have such facility in kernel anyway. badsect(8) is a utility and this commit breaks it by removing its kernel support. The panic for ffs is a user error (not running fsck after badsect, or not following the directions for using badsect, or using the privileged mknod(S_IFMT) operation in an unsafe way). The bugs for other file systems are not having a badsect utility and not even disallowing creation of the vnodes to support badsect. 64-bit dev_t made badsect work better than ever. It worked as well as possible (not very well) with at least old badsect and old fsck. Its man page has much more bitrot than its code, mostly due to removal of other utilities: X BADSECT(8) FreeBSD System Manager's Manual BADSECT(8) X X NAME X badsect - create files to contain bad sectors X X SYNOPSIS X badsect bbdir sector ... X X DESCRIPTION X The badsect utility makes a file to contain a bad sector. Normally, bad Thus has bad grammar and some technical bugs. "makes a file to contain a bad sector" should be something like "makes file[s] containing the specified bad sector[s]. "containing" needs further descripton. The containers are fragments which usually consist of multiple sectors. X sectors are made inaccessible by the standard formatter, which provides a X forwarding table for bad sectors to the driver. If a driver supports the Actually, bad sectors are normally made inaccessible by replacing the drive. The "standard" formatter was removed. X bad blocking standard it is much preferable to use that method to isolate X bad blocks, since the bad block forwarding makes the pack appear perfect, X and such packs can then be copied with dd(1). The technique used by this The bad blocking standard was bad144. It was removed, so using it is impossible. X program is also less general than bad block forwarding, as badsect cannot X make amends for bad blocks in the i-list of file systems or in swap X areas. badsect is much more primitive than bad144, but was usable for disks with just a few bad sectors. X X On some disks, adding a sector which is suddenly bad to the bad sector X table currently requires the running of the standard DEC formatter. Thus The standard DEC formatter never existed in FreeBSD. X to deal with a newly bad block or on disks where the drivers do not X support the bad-blocking standard badsect may be used to good effect. X X The badsect utility is used on a quiet file system in the following way: The file system must be quiet else you will get panics before fsck can be run to fix the file system. X First mount the file system, and change to its root directory. Make a X directory BAD there. Run badsect giving as argument the BAD directory X followed by all the bad sectors you wish to add. (The sector numbers X must be relative to the beginning of the file system, but this is not X hard as the system reports relative sector numbers in its console error X messages.) Then change back to the root directory, unmount the file This is now hard. Non-broken drivers in old versions of FreeBSD used diskerr(9) to report errors in a uniform way. This was dumbed down and renamed disk_err() which is only called by aac, xen/blkfront, virtio/block and mfi. This only prints absolute block numbers in unclear units. GEOM would have to be involved to print relative sector numbers and partition names, but I don't know of any GEOM function for this. I think CAM prints absolute block numbers (after an error) in a verbose format that is less useful execpt for SCSI debugging. I used lm's filelocks or mckusick's prtblknos utility to find block numbers. Since I don't have any disks with bad sectors handy, I used good sectors. These utilities print the (relative) ffs fragment number. This must be multiplied by fs_frag (default 8) to get the sector number for badsect. X system and run fsck(8) on the file system. The bad sectors should show X up in two files or in the bad sector files and the free list. Have X fsck(8) remove files containing the offending bad sectors, but do not X have it remove the BAD/n files. This will leave the bad sectors in X only the BAD files. fsck must be run twice, at least now. X X The badsect utility works by giving the specified sector numbers in a X mknod(2) system call, creating an illegal file whose first block
svn commit: r325403 - head/share/man/man9
Author: trasz Date: Sat Nov 4 16:23:34 2017 New Revision: 325403 URL: https://svnweb.freebsd.org/changeset/base/325403 Log: Add missing MLINKS for disk_add_alias(9). MFC after:2 weeks Modified: head/share/man/man9/Makefile Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileSat Nov 4 16:03:48 2017 (r325402) +++ head/share/man/man9/MakefileSat Nov 4 16:23:34 2017 (r325403) @@ -760,7 +760,8 @@ MLINKS+=devstat.9 devicestat.9 \ devstat.9 devstat_end_transaction.9 \ devstat.9 devstat_remove_entry.9 \ devstat.9 devstat_start_transaction.9 -MLINKS+=disk.9 disk_alloc.9 \ +MLINKS+=disk.9 disk_add_alias.9 \ + disk.9 disk_alloc.9 \ disk.9 disk_create.9 \ disk.9 disk_destroy.9 \ disk.9 disk_gone.9 \ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325402 - stable/11/sys/ufs/ffs
Author: markj Date: Sat Nov 4 16:03:48 2017 New Revision: 325402 URL: https://svnweb.freebsd.org/changeset/base/325402 Log: MFC r325051: Remove a stale and incorrect comment. Modified: stable/11/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/ufs/ffs/ffs_softdep.c == --- stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 16:03:06 2017 (r325401) +++ stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 16:03:48 2017 (r325402) @@ -14119,11 +14119,7 @@ getdirtybuf(bp, lock, waitfor) BUF_UNLOCK(bp); if (waitfor != MNT_WAIT) return (NULL); - /* -* The lock argument must be bp->b_vp's mutex in -* this case. -*/ -#ifdef DEBUG_VFS_LOCKS +#ifdef DEBUG_VFS_LOCKS if (bp->b_vp->v_type != VCHR) ASSERT_BO_WLOCKED(bp->b_bufobj); #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325401 - stable/11/sys/ufs/ffs
Author: markj Date: Sat Nov 4 16:03:06 2017 New Revision: 325401 URL: https://svnweb.freebsd.org/changeset/base/325401 Log: MFC r325050: Remove workqueue items after updating the workqueue tail pointer. Modified: stable/11/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/ufs/ffs/ffs_softdep.c == --- stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 15:52:16 2017 (r325400) +++ stable/11/sys/ufs/ffs/ffs_softdep.c Sat Nov 4 16:03:06 2017 (r325401) @@ -1535,10 +1535,10 @@ remove_from_worklist(wk) struct ufsmount *ump; ump = VFSTOUFS(wk->wk_mp); - WORKLIST_REMOVE(wk); if (ump->softdep_worklist_tail == wk) ump->softdep_worklist_tail = (struct worklist *)wk->wk_list.le_prev; + WORKLIST_REMOVE(wk); ump->softdep_on_worklist -= 1; } @@ -1836,11 +1836,11 @@ process_worklist_item(mp, target, flags) wake_worklist(wk); add_to_worklist(wk, WK_HEAD); } - LIST_REMOVE(&sentinel, wk_list); /* Sentinal could've become the tail from remove_from_worklist. */ if (ump->softdep_worklist_tail == &sentinel) ump->softdep_worklist_tail = (struct worklist *)sentinel.wk_list.le_prev; + LIST_REMOVE(&sentinel, wk_list); PRELE(curproc); return (matchcnt); } @@ -2894,7 +2894,6 @@ remove_from_journal(wk) if (ump->softdep_journal_tail == wk) ump->softdep_journal_tail = (struct worklist *)wk->wk_list.le_prev; - WORKLIST_REMOVE(wk); ump->softdep_on_journal -= 1; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325062 - in head/lib: . libcasper libcasper/libcasper libcasper/services libcasper/services/cap_dns libcasper/services/cap_dns/tests libcasper/services/cap_grp libcasper/services/cap_
On Wed, Nov 01, 2017 at 11:48:54AM +0100, Herbert J. Skuhra wrote: > On Sat, 28 Oct 2017 21:23:57 +0200, > Mariusz Zaborski wrote: > > > > Author: oshogbo > > Date: Sat Oct 28 19:23:57 2017 > > New Revision: 325062 > > URL: https://svnweb.freebsd.org/changeset/base/325062 > > > > Log: > > Introduce caspermocks. > > > > The idea behinds mocks is that we don't need to ifdef a lot of code in > > tools itself but those defines are hidden in the casper library. > > Right now the mocks are implemented as define/inlines functions. > > There was a very long discussion how this should be implemented. > > This approach has some advantages like we don't need to link to any > > additional > > libraries. Unfortunately there are also some disadvantages for example it > > is > > easy to get library out of sync between two versions of functions or that > > we > > need extra define to compile program with casper support. > > This isn't an ideal solution but it's good enough for now and should > > simplify > > capsicumizing programs. This also doesn't close us any other ways to do > > those > > mocks and this should evolve in time. > > > > Discussed with: pjd, emaste, ed, rwatson, bapt, cem, bdrewery > > Differential Revision:https://reviews.freebsd.org/D8753 > > Again, after this commit libcasper.so.0 is installed to /usr/lib and not > /lib: > > % ls -l /usr/lib/libcasper.so* > lrwxr-xr-x 1 root wheel 14 Oct 29 10:51 /usr/lib/libcasper.so -> > libcasper.so.0 > -r--r--r-- 1 root wheel 22424 Oct 29 10:51 /usr/lib/libcasper.so.0 > > But usr/lib/libcasper.so.0 is listed in ObsoleteFiles.inc: > > % grep -B 2 libcasper.so /usr/src/ObsoleteFiles.inc > # 20131202: libcapsicum and libcasper moved to /lib/ > OLD_LIBS+=usr/lib/libcapsicum.so.0 > OLD_LIBS+=usr/lib/libcasper.so.0 Thank you for reporting. Should be fixed in the r325399. Thanks, -- Mariusz Zaborski oshogbo//vx | http://oshogbo.vexillium.org FreeBSD commiter| https://freebsd.org Software developer | http://wheelsystems.com If it's not broken, let's fix it till it is!!1 signature.asc Description: PGP signature
svn commit: r325400 - head/etc/rc.d
Author: trasz Date: Sat Nov 4 15:52:16 2017 New Revision: 325400 URL: https://svnweb.freebsd.org/changeset/base/325400 Log: Make autofs(5) rc scripts run earlier, matching those for amd(8). This helps when you have some daemons that need to access automounted shares. PR: 221011 MFC after:2 weeks Modified: head/etc/rc.d/automount head/etc/rc.d/automountd head/etc/rc.d/autounmountd Modified: head/etc/rc.d/automount == --- head/etc/rc.d/automount Sat Nov 4 15:50:05 2017(r325399) +++ head/etc/rc.d/automount Sat Nov 4 15:52:16 2017(r325400) @@ -5,6 +5,7 @@ # PROVIDE: automount # REQUIRE: nfsclient automountd +# BEFORE: DAEMON # KEYWORD: nojail shutdown . /etc/rc.subr Modified: head/etc/rc.d/automountd == --- head/etc/rc.d/automountdSat Nov 4 15:50:05 2017(r325399) +++ head/etc/rc.d/automountdSat Nov 4 15:52:16 2017(r325400) @@ -4,7 +4,8 @@ # # PROVIDE: automountd -# REQUIRE: DAEMON +# REQUIRE: rpcbind ypset nfsclient FILESYSTEMS ldconfig +# BEFORE: DAEMON # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/autounmountd == --- head/etc/rc.d/autounmountd Sat Nov 4 15:50:05 2017(r325399) +++ head/etc/rc.d/autounmountd Sat Nov 4 15:52:16 2017(r325400) @@ -4,7 +4,8 @@ # # PROVIDE: autounmountd -# REQUIRE: DAEMON +# REQUIRE: FILESYSTEMS +# BEFORE: DAEMON # KEYWORD: nojail . /etc/rc.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325399 - in head: . lib/libcasper/libcasper lib/libcasper/services/cap_random
Author: oshogbo
Date: Sat Nov 4 15:50:05 2017
New Revision: 325399
URL: https://svnweb.freebsd.org/changeset/base/325399
Log:
The src.opts.mk sets default value for the SHLIBDIR, so our set was not
respected.
Please notice that libcasper is already in ObsoleteFiles so we don't add it
again.
Reported by: Herbert J. Skuhra
Reviewed by: bdrewery@
Differential Revision:https://reviews.freebsd.org/D12918
Modified:
head/ObsoleteFiles.inc
head/lib/libcasper/libcasper/Makefile
head/lib/libcasper/services/cap_random/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Sat Nov 4 15:47:18 2017(r325398)
+++ head/ObsoleteFiles.inc Sat Nov 4 15:50:05 2017(r325399)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20171104: libcap_random should be in /lib not in /usr/lib
+OLD_LIBS+=usr/lib/libcap_random.so.0
# 20171104: Casper can work only as shared library
OLD_FILES+=usr/lib/libcasper.a
OLD_FILES+=usr/lib/libcasper_p.a
Modified: head/lib/libcasper/libcasper/Makefile
==
--- head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:47:18 2017
(r325398)
+++ head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:50:05 2017
(r325399)
@@ -1,14 +1,14 @@
# $FreeBSD$
+SHLIBDIR?= /lib
+
.include
PACKAGE=${LIB}
-SHLIB_MAJOR= 0
-SHLIBDIR?= /lib
-
.if ${MK_CASPER} != "no"
SHLIB= casper
+SHLIB_MAJOR= 0
SRCS= libcasper.c
SRCS+= libcasper_impl.c
Modified: head/lib/libcasper/services/cap_random/Makefile
==
--- head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:47:18
2017(r325398)
+++ head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:50:05
2017(r325399)
@@ -1,11 +1,12 @@
# $FreeBSD$
+SHLIBDIR?= /lib/casper
+
.include
PACKAGE=libcasper
SHLIB_MAJOR= 0
-SHLIBDIR?= /lib/casper
INCSDIR?= ${INCLUDEDIR}/casper
.if ${MK_CASPER} != "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325398 - in head: . lib/libcasper/libcasper lib/libcasper/services/cap_dns lib/libcasper/services/cap_grp lib/libcasper/services/cap_pwd lib/libcasper/services/cap_random lib/libcasper...
Author: oshogbo
Date: Sat Nov 4 15:47:18 2017
New Revision: 325398
URL: https://svnweb.freebsd.org/changeset/base/325398
Log:
Casper work's only as shared library - disable building static ones.
Reviewed by: bdrewery@
Differential Revision:https://reviews.freebsd.org/D12917
Modified:
head/ObsoleteFiles.inc
head/lib/libcasper/libcasper/Makefile
head/lib/libcasper/services/cap_dns/Makefile
head/lib/libcasper/services/cap_grp/Makefile
head/lib/libcasper/services/cap_pwd/Makefile
head/lib/libcasper/services/cap_random/Makefile
head/lib/libcasper/services/cap_sysctl/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Sat Nov 4 15:41:08 2017(r325397)
+++ head/ObsoleteFiles.inc Sat Nov 4 15:47:18 2017(r325398)
@@ -38,6 +38,19 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20171104: Casper can work only as shared library
+OLD_FILES+=usr/lib/libcasper.a
+OLD_FILES+=usr/lib/libcasper_p.a
+OLD_FILES+=usr/lib/libcap_dns.a
+OLD_FILES+=usr/lib/libcap_dns_p.a
+OLD_FILES+=usr/lib/libcap_grp.a
+OLD_FILES+=usr/lib/libcap_grp_p.a
+OLD_FILES+=usr/lib/libcap_pwd.a
+OLD_FILES+=usr/lib/libcap_pwd_p.a
+OLD_FILES+=usr/lib/libcap_random.a
+OLD_FILES+=usr/lib/libcap_random_p.a
+OLD_FILES+=usr/lib/libcap_sysctl.a
+OLD_FILES+=usr/lib/libcap_sysctl_p.a
# 20171031: Removal of obsolete man files
OLD_FILES+=usr/share/man/man7/adding_user.7.gz
# 20171031: Disconnected libpathconv tests
Modified: head/lib/libcasper/libcasper/Makefile
==
--- head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:41:08 2017
(r325397)
+++ head/lib/libcasper/libcasper/Makefile Sat Nov 4 15:47:18 2017
(r325398)
@@ -8,7 +8,7 @@ SHLIB_MAJOR=0
SHLIBDIR?= /lib
.if ${MK_CASPER} != "no"
-LIB= casper
+SHLIB= casper
SRCS= libcasper.c
SRCS+= libcasper_impl.c
Modified: head/lib/libcasper/services/cap_dns/Makefile
==
--- head/lib/libcasper/services/cap_dns/MakefileSat Nov 4 15:41:08
2017(r325397)
+++ head/lib/libcasper/services/cap_dns/MakefileSat Nov 4 15:47:18
2017(r325398)
@@ -10,7 +10,7 @@ SHLIB_MAJOR= 0
INCSDIR?= ${INCLUDEDIR}/casper
.if ${MK_CASPER} != "no"
-LIB= cap_dns
+SHLIB= cap_dns
SRCS= cap_dns.c
.endif
Modified: head/lib/libcasper/services/cap_grp/Makefile
==
--- head/lib/libcasper/services/cap_grp/MakefileSat Nov 4 15:41:08
2017(r325397)
+++ head/lib/libcasper/services/cap_grp/MakefileSat Nov 4 15:47:18
2017(r325398)
@@ -10,7 +10,7 @@ SHLIB_MAJOR= 0
INCSDIR?= ${INCLUDEDIR}/casper
.if ${MK_CASPER} != "no"
-LIB= cap_grp
+SHLIB= cap_grp
SRCS= cap_grp.c
.endif
Modified: head/lib/libcasper/services/cap_pwd/Makefile
==
--- head/lib/libcasper/services/cap_pwd/MakefileSat Nov 4 15:41:08
2017(r325397)
+++ head/lib/libcasper/services/cap_pwd/MakefileSat Nov 4 15:47:18
2017(r325398)
@@ -10,7 +10,7 @@ SHLIB_MAJOR= 0
INCSDIR?= ${INCLUDEDIR}/casper
.if ${MK_CASPER} != "no"
-LIB= cap_pwd
+SHLIB= cap_pwd
SRCS= cap_pwd.c
.endif
Modified: head/lib/libcasper/services/cap_random/Makefile
==
--- head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:41:08
2017(r325397)
+++ head/lib/libcasper/services/cap_random/Makefile Sat Nov 4 15:47:18
2017(r325398)
@@ -9,7 +9,7 @@ SHLIBDIR?= /lib/casper
INCSDIR?= ${INCLUDEDIR}/casper
.if ${MK_CASPER} != "no"
-LIB= cap_random
+SHLIB= cap_random
SRCS= cap_random.c
.endif
Modified: head/lib/libcasper/services/cap_sysctl/Makefile
==
--- head/lib/libcasper/services/cap_sysctl/Makefile Sat Nov 4 15:41:08
2017(r325397)
+++ head/lib/libcasper/services/cap_sysctl/Makefile Sat Nov 4 15:47:18
2017(r325398)
@@ -10,7 +10,7 @@ SHLIB_MAJOR= 0
INCSDIR?= ${INCLUDEDIR}/casper
.if ${MK_CASPER} != "no"
-LIB= cap_sysctl
+SHLIB= cap_sysctl
SRCS= cap_sysctl.c
.endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325397 - head/sys/kern
Author: pfg
Date: Sat Nov 4 15:41:08 2017
New Revision: 325397
URL: https://svnweb.freebsd.org/changeset/base/325397
Log:
ANSI-fy exec_shell_imgact().
Fix a stray space while here.
PR: 223317
MFC after:3 days
Modified:
head/sys/kern/imgact_shell.c
Modified: head/sys/kern/imgact_shell.c
==
--- head/sys/kern/imgact_shell.cSat Nov 4 14:56:58 2017
(r325396)
+++ head/sys/kern/imgact_shell.cSat Nov 4 15:41:08 2017
(r325397)
@@ -97,8 +97,7 @@ CTASSERT(MAXSHELLCMDLEN >= MAXINTERP + 3);
* 6.x branch on May 28, 2005 (matching __FreeBSD_version 600029).
*/
int
-exec_shell_imgact(imgp)
- struct image_params *imgp;
+exec_shell_imgact(struct image_params *imgp)
{
const char *image_header = imgp->image_header;
const char *ihp, *interpb, *interpe, *maxp, *optb, *opte, *fname;
@@ -125,7 +124,7 @@ exec_shell_imgact(imgp)
* However, we don't know how far into the page the contents are
* valid -- the actual file might be much shorter than the page.
* So find out the file size.
-*/
+*/
error = VOP_GETATTR(imgp->vp, &vattr, imgp->proc->p_ucred);
if (error)
return (error);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325116 - head
On 11/4/2017 12:08 AM, Ngie Cooper (yaneurabeya) wrote: > I just ran into this with bash on universe12a.freebsd.org by doing ^d. > I think the change should be reverted. > Thanks, > -Ngie > > $ exit > *** Error code 130 > > Stop. > make[1]: stopped in /scratch/tmp/ngie/svn > *** Error code 1 > > Stop. > make: stopped in /scratch/tmp/ngie/svn > When you first go into buildenv check 'echo $?'. My problem was a construct like '[ -f xxx ] && . xxx' at the end of one of my profile scripts. It needs to be 'if [ -f xxx ]; then . xxx; fi' to avoid the bad status. It's really unrelated to buildenv. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
svn commit: r325396 - stable/10/usr.sbin/bsnmpd/modules/snmp_hostres
Author: pfg
Date: Sat Nov 4 14:56:58 2017
New Revision: 325396
URL: https://svnweb.freebsd.org/changeset/base/325396
Log:
MFC r325067:
bsnmpd: Only refresh devtree if devd event is a new or removed device.
It makes sense to refresh the tree only when a device is inserted or
removed, otherwise bsnmpd needlessly wastes lots of CPU.
PR: 209368
Modified:
stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
==
--- stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov
4 14:49:22 2017(r325395)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov
4 14:56:58 2017(r325396)
@@ -479,7 +479,9 @@ again:
} else {
if (read_len == sizeof(buf))
goto again;
- refresh_device_tbl(1);
+ /* Only refresh device table on a device add or remove event. */
+ if (buf[0] == '+' || buf[0] == '-')
+ refresh_device_tbl(1);
}
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325116 - head
On Sat, Nov 4, 2017 at 8:35 AM, Warner Losh wrote: > > > On Nov 4, 2017 1:08 AM, "Ngie Cooper (yaneurabeya)" > wrote: > > I just ran into this with bash on universe12a.freebsd.org by > doing ^d. I think the change should be reverted. > Thanks, > -Ngie > > $ exit > *** Error code 130 > > Stop. > make[1]: stopped in /scratch/tmp/ngie/svn > *** Error code 1 > > Stop. > make: stopped in /scratch/tmp/ngie/svn > > > No. Figure out what is doing the bad exit and fix that. Without the > change, buildenv is useless in scripts. I'm not backing it out over a vague > "this looks bad" without a real root cause. This report is completely > unactionable. > 8:45am zooty:[335]> make buildenv BUILDENV_SHELL=/usr/local/bin/bash Entering world for amd64:amd64 [imp@zooty /usr/home/imp/git/head/sys/boot]$ exit 8:45am zooty:[336]> So it's something in your setup, since bash works fine for me. Warner ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325395 - stable/11/usr.sbin/bsnmpd/modules/snmp_hostres
Author: pfg
Date: Sat Nov 4 14:49:22 2017
New Revision: 325395
URL: https://svnweb.freebsd.org/changeset/base/325395
Log:
MFC r325067:
bsnmpd: Only refresh devtree if devd event is a new or removed device.
It makes sense to refresh the tree only when a device is inserted or
removed, otherwise bsnmpd needlessly wastes lots of CPU.
PR: 209368
Modified:
stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
==
--- stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov
4 14:45:36 2017(r325394)
+++ stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c Sat Nov
4 14:49:22 2017(r325395)
@@ -479,7 +479,9 @@ again:
} else {
if (read_len == sizeof(buf))
goto again;
- refresh_device_tbl(1);
+ /* Only refresh device table on a device add or remove event. */
+ if (buf[0] == '+' || buf[0] == '-')
+ refresh_device_tbl(1);
}
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325394 - stable/10/lib/libc/regex
Author: pfg Date: Sat Nov 4 14:45:36 2017 New Revision: 325394 URL: https://svnweb.freebsd.org/changeset/base/325394 Log: MFC r325066: Fix out-of-bounds read in libc/regex. The bug is an out-of-bounds read detected with address sanitizer that happens when 'sp' in p_b_coll_elems() includes NUL byte[s], e.g. if it's equal to "GS\x00". In that case len will be equal to 4, and the strncmp(cp->name, sp, len) call will succeed when cp->name is "GS" but the cp->name[len] == '\0' comparison will cause the read to go out-of-bounds. Checking the length using strlen() instead eliminates the issue. The bug was found in LLVM with oss-fuzz: https://reviews.llvm.org/D39380 Obtained from:Vlad Tsyrklevich through posting on openbsd-tech Modified: stable/10/lib/libc/regex/regcomp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/regex/regcomp.c == --- stable/10/lib/libc/regex/regcomp.c Sat Nov 4 14:44:07 2017 (r325393) +++ stable/10/lib/libc/regex/regcomp.c Sat Nov 4 14:45:36 2017 (r325394) @@ -922,7 +922,7 @@ p_b_coll_elem(struct parse *p, } len = p->next - sp; for (cp = cnames; cp->name != NULL; cp++) - if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0') + if (strncmp(cp->name, sp, len) == 0 && strlen(cp->name) == len) return(cp->code); /* known name */ memset(&mbs, 0, sizeof(mbs)); if ((clen = mbrtowc(&wc, sp, len, &mbs)) == len) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325393 - stable/11/lib/libc/regex
Author: pfg Date: Sat Nov 4 14:44:07 2017 New Revision: 325393 URL: https://svnweb.freebsd.org/changeset/base/325393 Log: MFC r325066: Fix out-of-bounds read in libc/regex. The bug is an out-of-bounds read detected with address sanitizer that happens when 'sp' in p_b_coll_elems() includes NUL byte[s], e.g. if it's equal to "GS\x00". In that case len will be equal to 4, and the strncmp(cp->name, sp, len) call will succeed when cp->name is "GS" but the cp->name[len] == '\0' comparison will cause the read to go out-of-bounds. Checking the length using strlen() instead eliminates the issue. The bug was found in LLVM with oss-fuzz: https://reviews.llvm.org/D39380 Obtained from:Vlad Tsyrklevich through posting on openbsd-tech Modified: stable/11/lib/libc/regex/regcomp.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/regex/regcomp.c == --- stable/11/lib/libc/regex/regcomp.c Sat Nov 4 14:38:00 2017 (r325392) +++ stable/11/lib/libc/regex/regcomp.c Sat Nov 4 14:44:07 2017 (r325393) @@ -921,7 +921,7 @@ p_b_coll_elem(struct parse *p, } len = p->next - sp; for (cp = cnames; cp->name != NULL; cp++) - if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0') + if (strncmp(cp->name, sp, len) == 0 && strlen(cp->name) == len) return(cp->code); /* known name */ memset(&mbs, 0, sizeof(mbs)); if ((clen = mbrtowc(&wc, sp, len, &mbs)) == len) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325392 - head/etc/autofs
Author: trasz
Date: Sat Nov 4 14:38:00 2017
New Revision: 325392
URL: https://svnweb.freebsd.org/changeset/base/325392
Log:
Add NIS automounter map, which supports rewriting of self-hosted locations
to make them nullfs.
PR: 221010
Submitted by: G. Paul Ziemba
MFC after:2 weeks
Added:
head/etc/autofs/include_nis (contents, props changed)
Modified:
head/etc/autofs/Makefile
Modified: head/etc/autofs/Makefile
==
--- head/etc/autofs/MakefileSat Nov 4 14:35:01 2017(r325391)
+++ head/etc/autofs/MakefileSat Nov 4 14:38:00 2017(r325392)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= include_ldap special_hosts special_media special_noauto
special_null
+FILES= include_ldap include_nis special_hosts special_media
special_noauto special_null
NO_OBJ=
FILESDIR= /etc/autofs
Added: head/etc/autofs/include_nis
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/autofs/include_nis Sat Nov 4 14:38:00 2017(r325392)
@@ -0,0 +1,180 @@
+#!/usr/bin/awk -f
+#-
+# Copyright (c) 2017 G. Paul Ziemba
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+#
+# /etc/autofs/include_nis
+#
+# automountd Directory Services script for NIS
+#
+# SYNOPSIS
+# include_nis
+#
+# include_nis
+#
+# DESCRIPTION
+#
+# This script provides a Directory Services map for automountd
+# based on NIS. Please see auto_master(5) for general information.
+#
+# The first form, with one argument, emits the entire named NIS map.
+# The second form, with two arguments, emits the map entry for the
+# key given in the second argument.
+#
+# This script attempts to determine the names and IP addresses
+# of the local host. Map entries matching the local host are
+# rewritten to specify nullfs mounts (instead of the default
+# NFS) to reduce access overhead in the kernel.
+#
+# If a map entry contains multiple location fields, it is not changed.
+#
+
+
+# Populate list of names and IP addrs thet mean "this host"
+# into myhostnames array
+BEGIN {
+#
+# Set self hostnames
+#
+
+"hostname -s" | getline;
+myhostnames[$0] = 1;
+
+"hostname -f" | getline;
+myhostnames[$0] = 1;
+
+myhostnames["localhost"] = 1
+
+"hostname -f" | getline;
+localdomain=$0
+myhostnames["localhost."localdomain] = 1
+
+while ("ifconfig" | getline) {
+ if ($1 == "inet") {
+ myhostnames[$2] = 1;
+ }
+}
+
+# debug
+#print "--- hostname list start "
+#for (i in myhostnames) {
+#print i
+#}
+#print "--- hostname list end "
+
+if (ARGC == 2) {
+ # mapname only
+ while ("ypcat -k " ARGV[1] | getline) {
+ proc_mapline(1)
+ }
+}
+if (ARGC == 3) {
+ # mapname and keyname
+ while ("ypmatch " ARGV[2] " " ARGV[1] | getline) {
+ proc_mapline(0)
+ }
+}
+exit 0
+}
+
+function is_self(hostname)
+{
+if (myhostnames[hostname]) {
+ return 1
+}
+return 0
+}
+
+#
+# Lines are of the form [key] [-opts] location1 [... locationN]
+#
+# indicate index of key field with first positional parameter
+# 1 means keyfield is the first field
+# 0 means keyfield is not present
+#
+function proc_mapline(keyfield)
+{
+optionsfield = 0
+locationfield = 0
+locationcount = 0
+
+for (i=keyfield+1; i <= NF; ++i) {
+ if (!optionsfield) {
+ if ($i ~ /^
Re: svn commit: r325116 - head
On Nov 4, 2017 1:08 AM, "Ngie Cooper (yaneurabeya)" wrote: I just ran into this with bash on universe12a.freebsd.org by doing ^d. I think the change should be reverted. Thanks, -Ngie $ exit *** Error code 130 Stop. make[1]: stopped in /scratch/tmp/ngie/svn *** Error code 1 Stop. make: stopped in /scratch/tmp/ngie/svn No. Figure out what is doing the bad exit and fix that. Without the change, buildenv is useless in scripts. I'm not backing it out over a vague "this looks bad" without a real root cause. This report is completely unactionable. Warner ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325391 - stable/11/lib/libedit
Author: pfg
Date: Sat Nov 4 14:35:01 2017
New Revision: 325391
URL: https://svnweb.freebsd.org/changeset/base/325391
Log:
MFC r323547, r323598:
libedit: add missing bracket.
We never hit this because we always build with widechar support.
Raise the warning level to 3.
Modified:
stable/11/lib/libedit/Makefile
stable/11/lib/libedit/chartype.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libedit/Makefile
==
--- stable/11/lib/libedit/Makefile Sat Nov 4 14:13:58 2017
(r325390)
+++ stable/11/lib/libedit/Makefile Sat Nov 4 14:35:01 2017
(r325391)
@@ -7,6 +7,8 @@ LIB=edit
SHLIB_MAJOR= 7
SHLIBDIR?= /lib
+WARNS?=3
+
OSRCS= chared.c common.c el.c eln.c emacs.c fcns.c filecomplete.c help.c \
hist.c keymacro.c map.c chartype.c \
parse.c prompt.c read.c refresh.c search.c sig.c terminal.c tty.c vi.c
@@ -40,8 +42,6 @@ CLEANFILES+= tokenizern.c historyn.c
CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/edit -DWIDECHAR
#CFLAGS+= -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
#CFLAGS+= -DDEBUG_PASTE -DDEBUG_EDIT
-
-WARNS?=1
SUBDIR= edit/readline
Modified: stable/11/lib/libedit/chartype.c
==
--- stable/11/lib/libedit/chartype.cSat Nov 4 14:13:58 2017
(r325390)
+++ stable/11/lib/libedit/chartype.cSat Nov 4 14:35:01 2017
(r325391)
@@ -223,6 +223,7 @@ ct_mbrtowc(wchar_t *wc, const char *s, size_t n)
size_t
ct_mbrtowc(wchar_t *wc, const char *s, size_t n)
+{
if (s == NULL)
return 0;
if (n == 0)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325390 - head/usr.sbin/ctld
Author: trasz
Date: Sat Nov 4 14:13:58 2017
New Revision: 325390
URL: https://svnweb.freebsd.org/changeset/base/325390
Log:
Use proper naming in a debug message.
MFC after:2 weeks
Modified:
head/usr.sbin/ctld/login.c
Modified: head/usr.sbin/ctld/login.c
==
--- head/usr.sbin/ctld/login.c Sat Nov 4 10:52:58 2017(r325389)
+++ head/usr.sbin/ctld/login.c Sat Nov 4 14:13:58 2017(r325390)
@@ -435,7 +435,7 @@ login_chap(struct connection *conn, struct auth_group
* Yay, authentication succeeded!
*/
log_debugx("authentication succeeded for user \"%s\"; "
- "transitioning to Negotiation Phase", auth->a_user);
+ "transitioning to operational parameter negotiation", auth->a_user);
login_send_chap_success(request, auth);
pdu_delete(request);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325378 - head/sys/dev/ipmi
On 11/4/17, Xin Li wrote: > > > On 11/3/17 20:01, Warner Losh wrote: >> Author: imp >> Date: Sat Nov 4 03:01:58 2017 >> New Revision: 325378 >> URL: https://svnweb.freebsd.org/changeset/base/325378 >> >> Log: >> Make the startup timeout 0 seconds by default rathern than 420s. This >> makes the default fail safe when watchdogd is disabled (which is also >> the default). > > I'm not sure if this is good: what if watchdogd is enabled, but the > system get stuck before watchdogd starts? Like boot into single user mode? ;) > > Cheers, > > ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325389 - head/lib/libc/stdlib
Author: kib
Date: Sat Nov 4 10:52:58 2017
New Revision: 325389
URL: https://svnweb.freebsd.org/changeset/base/325389
Log:
C++17 requires quick_exit(3) to be async-signal safe.
Make it safe, and update man page with the useful information.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/lib/libc/stdlib/quick_exit.3
head/lib/libc/stdlib/quick_exit.c
Modified: head/lib/libc/stdlib/quick_exit.3
==
--- head/lib/libc/stdlib/quick_exit.3 Sat Nov 4 10:51:52 2017
(r325388)
+++ head/lib/libc/stdlib/quick_exit.3 Sat Nov 4 10:52:58 2017
(r325389)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 13, 2014
+.Dd November 4, 2017
.Dt QUICK_EXIT 3
.Os
.Sh NAME
@@ -44,6 +44,17 @@ with
.Xr at_quick_exit 3
but not any C++ destructors or cleanup code registered with
.Xr atexit 3 .
+The
+.Xr stdio 3
+file buffers are not flushed.
+.Pp
+The function
+.Fn quick_exit
+is
+.Em async-signal safe
+when the functions registered with
+.Xr at_quick_exit 3
+are.
.Sh RETURN VALUES
The
.Fn quick_exit
Modified: head/lib/libc/stdlib/quick_exit.c
==
--- head/lib/libc/stdlib/quick_exit.c Sat Nov 4 10:51:52 2017
(r325388)
+++ head/lib/libc/stdlib/quick_exit.c Sat Nov 4 10:52:58 2017
(r325389)
@@ -26,6 +26,8 @@
* $FreeBSD$
*/
+#include
+#include
#include
#include
@@ -60,6 +62,7 @@ at_quick_exit(void (*func)(void))
h->cleanup = func;
pthread_mutex_lock(&atexit_mutex);
h->next = handlers;
+ __compiler_membar();
handlers = h;
pthread_mutex_unlock(&atexit_mutex);
return (0);
@@ -74,7 +77,9 @@ quick_exit(int status)
* XXX: The C++ spec requires us to call std::terminate if there is an
* exception here.
*/
- for (h = handlers; NULL != h; h = h->next)
+ for (h = handlers; NULL != h; h = h->next) {
+ __compiler_membar();
h->cleanup();
+ }
_Exit(status);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325388 - in head/sys: amd64/amd64 i386/i386
Author: kib Date: Sat Nov 4 10:51:52 2017 New Revision: 325388 URL: https://svnweb.freebsd.org/changeset/base/325388 Log: x86: Do not emit unused TD_TID symbols. Sponsored by: The FreeBSD Foundation MFC after:1 week Modified: head/sys/amd64/amd64/genassym.c head/sys/i386/i386/genassym.c Modified: head/sys/amd64/amd64/genassym.c == --- head/sys/amd64/amd64/genassym.c Sat Nov 4 10:50:47 2017 (r325387) +++ head/sys/amd64/amd64/genassym.c Sat Nov 4 10:51:52 2017 (r325388) @@ -81,7 +81,6 @@ ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); -ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); Modified: head/sys/i386/i386/genassym.c == --- head/sys/i386/i386/genassym.c Sat Nov 4 10:50:47 2017 (r325387) +++ head/sys/i386/i386/genassym.c Sat Nov 4 10:51:52 2017 (r325388) @@ -88,7 +88,6 @@ ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_MD, offsetof(struct thread, td_md)); -ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325387 - head/sys/i386/i386
Author: kib Date: Sat Nov 4 10:50:47 2017 New Revision: 325387 URL: https://svnweb.freebsd.org/changeset/base/325387 Log: Eliminate unused load. Based on github pull request: #117 Submitted by: Wuyang-Chung@github MFC after:1 week Modified: head/sys/i386/i386/swtch.s Modified: head/sys/i386/i386/swtch.s == --- head/sys/i386/i386/swtch.s Sat Nov 4 10:49:34 2017(r325386) +++ head/sys/i386/i386/swtch.s Sat Nov 4 10:50:47 2017(r325387) @@ -258,7 +258,6 @@ sw1: movl%eax,(%esp) movl%edx, PCPU(CURPCB) - movlTD_TID(%ecx),%eax movl%ecx, PCPU(CURTHREAD) /* into next thread */ /* ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325386 - head/sys/kern
Author: kib
Date: Sat Nov 4 10:49:34 2017
New Revision: 325386
URL: https://svnweb.freebsd.org/changeset/base/325386
Log:
Convert explicit panic() call to assert.
Based on github pull request: #113
Submitted by: pmarillo@github
MFC after:1 week
Modified:
head/sys/kern/kern_umtx.c
Modified: head/sys/kern/kern_umtx.c
==
--- head/sys/kern/kern_umtx.c Sat Nov 4 10:10:34 2017(r325385)
+++ head/sys/kern/kern_umtx.c Sat Nov 4 10:49:34 2017(r325386)
@@ -1579,8 +1579,7 @@ umtx_pi_setowner(struct umtx_pi *pi, struct thread *ow
uq_owner = owner->td_umtxq;
mtx_assert(&umtx_lock, MA_OWNED);
- if (pi->pi_owner != NULL)
- panic("pi_owner != NULL");
+ MPASS(pi->pi_owner == NULL);
pi->pi_owner = owner;
TAILQ_INSERT_TAIL(&uq_owner->uq_pi_contested, pi, pi_link);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325385 - stable/11/sys/vm
Author: kib
Date: Sat Nov 4 10:10:34 2017
New Revision: 325385
URL: https://svnweb.freebsd.org/changeset/base/325385
Log:
MFC r324824:
Check that the page which is freed as zeroed, indeed has all-zero content.
Modified:
stable/11/sys/vm/vm_page.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/vm/vm_page.c
==
--- stable/11/sys/vm/vm_page.c Sat Nov 4 07:05:21 2017(r325384)
+++ stable/11/sys/vm/vm_page.c Sat Nov 4 10:10:34 2017(r325385)
@@ -2767,6 +2767,16 @@ bool
vm_page_free_prep(vm_page_t m, bool pagequeue_locked)
{
+#if defined(DIAGNOSTIC) && defined(PHYS_TO_DMAP)
+ if ((m->flags & PG_ZERO) != 0) {
+ uint64_t *p;
+ int i;
+ p = (uint64_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m));
+ for (i = 0; i < PAGE_SIZE / sizeof(uint64_t); i++, p++)
+ KASSERT(*p == 0, ("vm_page_free_prep %p PG_ZERO %d %jx",
+ m, i, (uintmax_t)*p));
+ }
+#endif
if ((m->oflags & VPO_UNMANAGED) == 0) {
vm_page_lock_assert(m, MA_OWNED);
KASSERT(!pmap_page_is_mapped(m),
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r325358 - head/tools/tools/locale/etc
On Fri, Nov 03, 2017 at 09:51:37AM -0700, Conrad Meyer wrote: > On Fri, Nov 3, 2017 at 6:38 AM, Baptiste Daroussin wrote: > > Author: bapt > > Date: Fri Nov 3 13:38:45 2017 > > New Revision: 325358 > > URL: https://svnweb.freebsd.org/changeset/base/325358 > > > > Log: > > In preparation for update of cldr to version 32 and unicode to version 10 > > Add a character mapping for a missing character in ISO8859-2 > > > > Modified: > > head/tools/tools/locale/etc/charmaps.xml > > > > Modified: head/tools/tools/locale/etc/charmaps.xml > > == > > --- head/tools/tools/locale/etc/charmaps.xmlFri Nov 3 13:08:29 2017 > > (r325357) > > +++ head/tools/tools/locale/etc/charmaps.xmlFri Nov 3 13:38:45 2017 > > (r325358) > > @@ -200,7 +200,7 @@ > > > > > > Are these distinct characters in ISO-8859-2 that both translate most > closely to Unicode Hyphen-minus? > Exactly. Actually those are "not" dictinct characters but different definitions which then should be converted to a character in each encoding. Those characters could be the same but that dependens on the combinaison locale/encoding. The mapping continue to be extended for the unicode version, but not anymore for other encodings of a given locale. In this case we need to find a mapping to say "hey those 2 definitions actually mean the same character for this given encoding". Best regards, Bapt signature.asc Description: PGP signature
Re: svn commit: r325116 - head
I just ran into this with bash on universe12a.freebsd.org by doing ^d. I think the change should be reverted. Thanks, -Ngie $ exit *** Error code 130 Stop. make[1]: stopped in /scratch/tmp/ngie/svn *** Error code 1 Stop. make: stopped in /scratch/tmp/ngie/svn signature.asc Description: Message signed with OpenPGP using GPGMail
