svn commit: r216016 - head/sys/sparc64/include
Author: fjoe Date: Sun Nov 28 19:26:20 2010 New Revision: 216016 URL: http://svn.freebsd.org/changeset/base/216016 Log: Define VM_KMEM_SIZE_MAX on sparc64. Otherwise kernel built with DEBUG_MEMGUARD panics early in kmeminit() with the message "kmem_suballoc: bad status return of 1" because of zero "size" argument passed to kmem_suballoc() due to "vm_kmem_size_max" being zero. The problem also exists on ia64. Modified: head/sys/sparc64/include/vmparam.h Modified: head/sys/sparc64/include/vmparam.h == --- head/sys/sparc64/include/vmparam.h Sun Nov 28 18:59:52 2010 (r216015) +++ head/sys/sparc64/include/vmparam.h Sun Nov 28 19:26:20 2010 (r216016) @@ -237,6 +237,14 @@ #endif /* + * Ceiling on amount of kmem_map kva space. + */ +#ifndef VM_KMEM_SIZE_MAX +#defineVM_KMEM_SIZE_MAX((VM_MAX_KERNEL_ADDRESS - \ +VM_MIN_KERNEL_ADDRESS + 1) * 3 / 5) +#endif + +/* * Initial pagein size of beginning of executable file. */ #ifndefVM_INITIAL_PAGEIN ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r216016 - head/sys/sparc64/include
Marius, On Mon, Nov 29, 2010 at 1:45 AM, Marius Strobl wrote: On Sun, Nov 28, 2010 at 07:26:20PM +, Max Khon wrote: > > Author: fjoe > > Date: Sun Nov 28 19:26:20 2010 > > New Revision: 216016 > > URL: http://svn.freebsd.org/changeset/base/216016 > > > > Log: > > Define VM_KMEM_SIZE_MAX on sparc64. Otherwise kernel built with > > DEBUG_MEMGUARD panics early in kmeminit() with the message > > "kmem_suballoc: bad status return of 1" because of zero "size" argument > > passed to kmem_suballoc() due to "vm_kmem_size_max" being zero. > > > > The problem also exists on ia64. > > > > Modified: > > head/sys/sparc64/include/vmparam.h > > > > Modified: head/sys/sparc64/include/vmparam.h > > > == > > --- head/sys/sparc64/include/vmparam.hSun Nov 28 18:59:52 2010 > (r216015) > > +++ head/sys/sparc64/include/vmparam.hSun Nov 28 19:26:20 2010 > (r216016) > > @@ -237,6 +237,14 @@ > > #endif > > > > /* > > + * Ceiling on amount of kmem_map kva space. > > + */ > > +#ifndef VM_KMEM_SIZE_MAX > > +#define VM_KMEM_SIZE_MAX((VM_MAX_KERNEL_ADDRESS - \ > > +VM_MIN_KERNEL_ADDRESS + 1) * 3 / 5) > > +#endif > > + > > +/* > > * Initial pagein size of beginning of executable file. > > */ > > #ifndef VM_INITIAL_PAGEIN > > How was that value determined? > I've just copied it from amd64 to be non-zero for now. Do you have a better idea of what it should look like? Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r216080 - head/sys/sparc64/include
Author: fjoe Date: Tue Nov 30 16:49:06 2010 New Revision: 216080 URL: http://svn.freebsd.org/changeset/base/216080 Log: Change VM_KMEM_SIZE_MAX to be just (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) Suggested by: marius Modified: head/sys/sparc64/include/vmparam.h Modified: head/sys/sparc64/include/vmparam.h == --- head/sys/sparc64/include/vmparam.h Tue Nov 30 16:46:15 2010 (r216079) +++ head/sys/sparc64/include/vmparam.h Tue Nov 30 16:49:06 2010 (r216080) @@ -240,8 +240,7 @@ * Ceiling on amount of kmem_map kva space. */ #ifndef VM_KMEM_SIZE_MAX -#defineVM_KMEM_SIZE_MAX((VM_MAX_KERNEL_ADDRESS - \ -VM_MIN_KERNEL_ADDRESS + 1) * 3 / 5) +#defineVM_KMEM_SIZE_MAX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) #endif /* ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r216016 - head/sys/sparc64/include
Marius, On Tue, Nov 30, 2010 at 1:24 AM, Marius Strobl wrote: > > > On Sun, Nov 28, 2010 at 07:26:20PM +0000, Max Khon wrote: > > > > > Author: fjoe > > > > > Date: Sun Nov 28 19:26:20 2010 > > > > > New Revision: 216016 > > > > > URL: http://svn.freebsd.org/changeset/base/216016 > > > > > > > > > > Log: > > > > > Define VM_KMEM_SIZE_MAX on sparc64. Otherwise kernel built with > > > > > DEBUG_MEMGUARD panics early in kmeminit() with the message > > > > > "kmem_suballoc: bad status return of 1" because of zero "size" > argument > > > > > passed to kmem_suballoc() due to "vm_kmem_size_max" being zero. > > > > > > > > > > The problem also exists on ia64. > > > > > > > > > > Modified: > > > > > head/sys/sparc64/include/vmparam.h > > > > > > > > > > Modified: head/sys/sparc64/include/vmparam.h > > > > > > > > > > == > > > > > --- head/sys/sparc64/include/vmparam.hSun Nov 28 18:59:52 > 2010 > > > > (r216015) > > > > > +++ head/sys/sparc64/include/vmparam.hSun Nov 28 19:26:20 > 2010 > > > > (r216016) > > > > > @@ -237,6 +237,14 @@ > > > > > #endif > > > > > > > > > > /* > > > > > + * Ceiling on amount of kmem_map kva space. > > > > > + */ > > > > > +#ifndef VM_KMEM_SIZE_MAX > > > > > +#define VM_KMEM_SIZE_MAX((VM_MAX_KERNEL_ADDRESS - \ > > > > > +VM_MIN_KERNEL_ADDRESS + 1) * 3 / 5) > > > > > +#endif > > > > > + > > > > > +/* > > > > > * Initial pagein size of beginning of executable file. > > > > > */ > > > > > #ifndef VM_INITIAL_PAGEIN > > > > > > > > How was that value determined? > > > > > > > > > > I've just copied it from amd64 to be non-zero for now. Do you have a > better > > > idea of what it should look like? > > > > Well, on sparc64 VM_MAX_KERNEL_ADDRESS already is dynamically adjusted > > to the maximum appropriate for the specific CPU during the early cycles > > of the kernel so I'd think one could just use VM_MAX_KERNEL_ADDRESS - > > VM_MIN_KERNEL_ADDRESS for VM_KMEM_SIZE_MAX there, I'm not sure what > > the intention of the ceiling provided by that macro actually is though > Ok, this sounds reasonable. I changed it to be just (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) > In any case, the commit message of r180210 which changed the amd64 > > version to the current one talks about limiting the kmem map to 3.6GB > > and while it also fails to explain where that value comes from it > > looks rather amd64 specific and the formula used by the macro will > > result in a different ceiling on sparc64 and thus inappropriate. I've > > CC'ed alc@ who hopefully can shed some light on this. > > Apart from this the actual bug here seems to be that memguard_fudge() > > can't deal with a km_max being zero or that zero is passed to it as > > kmeminit() allows for VM_KMEM_SIZE_MAX not being defined. > I thought about fixing memguard_fudge() too, but defining VM_KMEM_SIZE_MAX seemed to be less intrusive change to me. Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236742 - stable/9/usr.bin/make
Author: fjoe
Date: Fri Jun 8 10:03:37 2012
New Revision: 236742
URL: http://svn.freebsd.org/changeset/base/236742
Log:
MFC: r231544
Include target names in diagnostic output.
Submitted by: Garrett Cooper
Modified:
stable/9/usr.bin/make/job.c
Directory Properties:
stable/9/ (props changed)
stable/9/usr.bin/ (props changed)
stable/9/usr.bin/make/ (props changed)
Modified: stable/9/usr.bin/make/job.c
==
--- stable/9/usr.bin/make/job.c Fri Jun 8 09:51:57 2012(r236741)
+++ stable/9/usr.bin/make/job.c Fri Jun 8 10:03:37 2012(r236742)
@@ -954,17 +954,19 @@ JobFinish(Job *job, int *status)
lastNode = job->node;
}
fprintf(out,
- "*** Completed successfully\n");
+ "*** [%s] Completed successfully\n",
+ job->node->name);
}
} else {
if (usePipes && job->node != lastNode) {
MESSAGE(out, job->node);
lastNode = job->node;
}
- fprintf(out, "*** Error code %d%s\n",
+ fprintf(out, "*** [%s] Error code %d%s\n",
+ job->node->name,
WEXITSTATUS(*status),
(job->flags & JOB_IGNERR) ?
- "(ignored)" : "");
+ " (ignored)" : "");
if (job->flags & JOB_IGNERR) {
*status = 0;
@@ -1005,7 +1007,8 @@ JobFinish(Job *job, int *status)
MESSAGE(out, job->node);
lastNode = job->node;
}
- fprintf(out, "*** Continued\n");
+ fprintf(out, "*** [%s] Continued\n",
+ job->node->name);
}
if (!(job->flags & JOB_CONTINUING)) {
DEBUGF(JOB, ("Warning: process %jd was
not "
@@ -1029,7 +1032,8 @@ JobFinish(Job *job, int *status)
lastNode = job->node;
}
fprintf(out,
- "*** Signal %d\n", WTERMSIG(*status));
+ "*** [%s] Signal %d\n", job->node->name,
+ WTERMSIG(*status));
fflush(out);
}
}
@@ -1056,7 +1060,8 @@ JobFinish(Job *job, int *status)
MESSAGE(out, job->node);
lastNode = job->node;
}
- fprintf(out, "*** Stopped -- signal %d\n", WSTOPSIG(*status));
+ fprintf(out, "*** [%s] Stopped -- signal %d\n",
+ job->node->name, WSTOPSIG(*status));
job->flags |= JOB_RESUME;
TAILQ_INSERT_TAIL(&stoppedJobs, job, link);
fflush(out);
@@ -3042,13 +3047,15 @@ Compat_RunCommand(char *cmd, GNode *gn)
if (status == 0) {
return (0);
} else {
- printf("*** Error code %d", status);
+ printf("*** [%s] Error code %d",
+ gn->name, status);
}
} else if (WIFSTOPPED(reason)) {
status = WSTOPSIG(reason);
} else {
status = WTERMSIG(reason);
- printf("*** Signal %d", status);
+ printf("*** [%s] Signal %d",
+ gn->name, status);
}
if (ps.errCheck) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r237350 - head/sys/dev/puc
Author: fjoe
Date: Thu Jun 21 03:10:48 2012
New Revision: 237350
URL: http://svn.freebsd.org/changeset/base/237350
Log:
Add support for the following Moxa PCIe multiport serial boards:
- CP102E
- CP102EL
- CP132EL
- CP114EL
- CP118EL-A
- CP168EL-A
MFC after:1 week
Modified:
head/sys/dev/puc/puc_cfg.h
head/sys/dev/puc/pucdata.c
Modified: head/sys/dev/puc/puc_cfg.h
==
--- head/sys/dev/puc/puc_cfg.h Thu Jun 21 02:48:49 2012(r237349)
+++ head/sys/dev/puc/puc_cfg.h Thu Jun 21 03:10:48 2012(r237350)
@@ -79,7 +79,7 @@ struct puc_cfg {
int8_t ports;
int8_t rid;/* Rid of first port */
int8_t d_rid; /* Delta rid of next ports */
- int8_t d_ofs; /* Delta offset of next ports */
+ int16_t d_ofs; /* Delta offset of next ports */
puc_config_f*config_function;
};
Modified: head/sys/dev/puc/pucdata.c
==
--- head/sys/dev/puc/pucdata.c Thu Jun 21 02:48:49 2012(r237349)
+++ head/sys/dev/puc/pucdata.c Thu Jun 21 03:10:48 2012(r237350)
@@ -507,6 +507,18 @@ const struct puc_cfg puc_pci_devices[] =
.config_function = puc_config_quatech
},
+ { 0x1393, 0x1024, 0x, 0,
+ "Moxa Technologies, Smartio CP-102E/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x14, 0, 0x200
+ },
+
+ { 0x1393, 0x1025, 0x, 0,
+ "Moxa Technologies, Smartio CP-102EL/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x14, 0, 0x200,
+ },
+
{ 0x1393, 0x1040, 0x, 0,
"Moxa Technologies, Smartio C104H/PCI",
DEFAULT_RCLK * 8,
@@ -550,6 +562,25 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_4S, 0x18, 0, 8,
},
+ { 0x1393, 0x1144, 0x, 0,
+ "Moxa Technologies, Smartio CP-114EL/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
+ },
+
+ { 0x1393, 0x1182, 0x, 0,
+ "Moxa Technologies, Smartio CP-118EL-A/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, 0x14, 0, 0x200,
+ },
+
+ { 0x1393, 0x1322, 0x, 0,
+ "Moxa Technologies, Smartio CP-132EL/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x14, 0, 0x200,
+ },
+
{ 0x1393, 0x1680, 0x, 0,
"Moxa Technologies, C168H/PCI",
DEFAULT_RCLK * 8,
@@ -568,6 +599,12 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_8S, 0x18, 0, 8,
},
+ { 0x1393, 0x1683, 0x, 0,
+ "Moxa Technologies, Smartio CP-168EL-A/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, 0x14, 0, 0x200,
+ },
+
{ 0x13a8, 0x0152, 0x, 0,
"Exar XR17C/D152",
DEFAULT_RCLK * 8,
@@ -1127,9 +1164,7 @@ static int
puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
intptr_t *res)
{
- const struct puc_cfg *cfg = sc->sc_cfg;
-
- if (cmd == PUC_CFG_GET_OFS && cfg->device == 0x1045) {
+ if (cmd == PUC_CFG_GET_OFS) {
*res = ((port == 3) ? 7 : port) * 0x200;
return 0;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r237357 - head/sys/dev/puc
Author: fjoe
Date: Thu Jun 21 04:57:59 2012
New Revision: 237357
URL: http://svn.freebsd.org/changeset/base/237357
Log:
Remove Moxa CP-132EL definition (RS422/485-only board).
Modified:
head/sys/dev/puc/pucdata.c
Modified: head/sys/dev/puc/pucdata.c
==
--- head/sys/dev/puc/pucdata.c Thu Jun 21 04:52:26 2012(r237356)
+++ head/sys/dev/puc/pucdata.c Thu Jun 21 04:57:59 2012(r237357)
@@ -575,12 +575,6 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_8S, 0x14, 0, 0x200,
},
- { 0x1393, 0x1322, 0x, 0,
- "Moxa Technologies, Smartio CP-132EL/PCIe",
- DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200,
- },
-
{ 0x1393, 0x1680, 0x, 0,
"Moxa Technologies, C168H/PCI",
DEFAULT_RCLK * 8,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r237703 - stable/9/sys/dev/puc
Author: fjoe
Date: Thu Jun 28 11:15:48 2012
New Revision: 237703
URL: http://svn.freebsd.org/changeset/base/237703
Log:
MFC: r237350, r237357
Add support for the following Moxa PCIe multiport serial boards:
- CP102E
- CP102EL
- CP114EL
- CP118EL-A
- CP168EL-A
Modified:
stable/9/sys/dev/puc/puc_cfg.h
stable/9/sys/dev/puc/pucdata.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/puc/puc_cfg.h
==
--- stable/9/sys/dev/puc/puc_cfg.h Thu Jun 28 10:40:57 2012
(r237702)
+++ stable/9/sys/dev/puc/puc_cfg.h Thu Jun 28 11:15:48 2012
(r237703)
@@ -79,7 +79,7 @@ struct puc_cfg {
int8_t ports;
int8_t rid;/* Rid of first port */
int8_t d_rid; /* Delta rid of next ports */
- int8_t d_ofs; /* Delta offset of next ports */
+ int16_t d_ofs; /* Delta offset of next ports */
puc_config_f*config_function;
};
Modified: stable/9/sys/dev/puc/pucdata.c
==
--- stable/9/sys/dev/puc/pucdata.c Thu Jun 28 10:40:57 2012
(r237702)
+++ stable/9/sys/dev/puc/pucdata.c Thu Jun 28 11:15:48 2012
(r237703)
@@ -507,6 +507,18 @@ const struct puc_cfg puc_pci_devices[] =
.config_function = puc_config_quatech
},
+ { 0x1393, 0x1024, 0x, 0,
+ "Moxa Technologies, Smartio CP-102E/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x14, 0, 0x200
+ },
+
+ { 0x1393, 0x1025, 0x, 0,
+ "Moxa Technologies, Smartio CP-102EL/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x14, 0, 0x200,
+ },
+
{ 0x1393, 0x1040, 0x, 0,
"Moxa Technologies, Smartio C104H/PCI",
DEFAULT_RCLK * 8,
@@ -550,6 +562,19 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_4S, 0x18, 0, 8,
},
+ { 0x1393, 0x1144, 0x, 0,
+ "Moxa Technologies, Smartio CP-114EL/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
+ },
+
+ { 0x1393, 0x1182, 0x, 0,
+ "Moxa Technologies, Smartio CP-118EL-A/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, 0x14, 0, 0x200,
+ },
+
{ 0x1393, 0x1680, 0x, 0,
"Moxa Technologies, C168H/PCI",
DEFAULT_RCLK * 8,
@@ -568,6 +593,12 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_8S, 0x18, 0, 8,
},
+ { 0x1393, 0x1683, 0x, 0,
+ "Moxa Technologies, Smartio CP-168EL-A/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, 0x14, 0, 0x200,
+ },
+
{ 0x13a8, 0x0152, 0x, 0,
"Exar XR17C/D152",
DEFAULT_RCLK * 8,
@@ -1121,9 +1152,7 @@ static int
puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
intptr_t *res)
{
- const struct puc_cfg *cfg = sc->sc_cfg;
-
- if (cmd == PUC_CFG_GET_OFS && cfg->device == 0x1045) {
+ if (cmd == PUC_CFG_GET_OFS) {
*res = ((port == 3) ? 7 : port) * 0x200;
return 0;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r238775 - stable/8/sys/dev/puc
Author: fjoe
Date: Wed Jul 25 17:42:57 2012
New Revision: 238775
URL: http://svn.freebsd.org/changeset/base/238775
Log:
MFC: r227457, r237350, r237357
Add support for the following Moxa PCIe multiport serial boards:
- CP102E
- CP102EL
- CP104EL-A
- CP104JU
- CP114EL
- CP118EL-A
- CP168EL-A
Modified:
stable/8/sys/dev/puc/puc_cfg.h
stable/8/sys/dev/puc/pucdata.c
Directory Properties:
stable/8/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
Modified: stable/8/sys/dev/puc/puc_cfg.h
==
--- stable/8/sys/dev/puc/puc_cfg.h Wed Jul 25 17:25:44 2012
(r238774)
+++ stable/8/sys/dev/puc/puc_cfg.h Wed Jul 25 17:42:57 2012
(r238775)
@@ -79,7 +79,7 @@ struct puc_cfg {
int8_t ports;
int8_t rid;/* Rid of first port */
int8_t d_rid; /* Delta rid of next ports */
- int8_t d_ofs; /* Delta offset of next ports */
+ int16_t d_ofs; /* Delta offset of next ports */
puc_config_f*config_function;
};
Modified: stable/8/sys/dev/puc/pucdata.c
==
--- stable/8/sys/dev/puc/pucdata.c Wed Jul 25 17:25:44 2012
(r238774)
+++ stable/8/sys/dev/puc/pucdata.c Wed Jul 25 17:42:57 2012
(r238775)
@@ -51,6 +51,7 @@ static puc_config_f puc_config_amc;
static puc_config_f puc_config_diva;
static puc_config_f puc_config_exar;
static puc_config_f puc_config_icbook;
+static puc_config_f puc_config_moxa;
static puc_config_f puc_config_oxford_pcie;
static puc_config_f puc_config_quatech;
static puc_config_f puc_config_syba;
@@ -506,6 +507,18 @@ const struct puc_cfg puc_pci_devices[] =
.config_function = puc_config_quatech
},
+ { 0x1393, 0x1024, 0x, 0,
+ "Moxa Technologies, Smartio CP-102E/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x14, 0, 0x200
+ },
+
+ { 0x1393, 0x1025, 0x, 0,
+ "Moxa Technologies, Smartio CP-102EL/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x14, 0, 0x200,
+ },
+
{ 0x1393, 0x1040, 0x, 0,
"Moxa Technologies, Smartio C104H/PCI",
DEFAULT_RCLK * 8,
@@ -518,12 +531,25 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_4S, 0x18, 0, 8,
},
+ { 0x1393, 0x1042, 0x, 0,
+ "Moxa Technologies, Smartio CP-104JU/PCI",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S, 0x18, 0, 8,
+ },
+
{ 0x1393, 0x1043, 0x, 0,
"Moxa Technologies, Smartio CP-104EL/PCIe",
DEFAULT_RCLK * 8,
PUC_PORT_4S, 0x18, 0, 8,
},
+ { 0x1393, 0x1045, 0x, 0,
+ "Moxa Technologies, Smartio CP-104EL-A/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
+ },
+
{ 0x1393, 0x1120, 0x, 0,
"Moxa Technologies, CP-112UL",
DEFAULT_RCLK * 8,
@@ -536,6 +562,19 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_4S, 0x18, 0, 8,
},
+ { 0x1393, 0x1144, 0x, 0,
+ "Moxa Technologies, Smartio CP-114EL/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
+ },
+
+ { 0x1393, 0x1182, 0x, 0,
+ "Moxa Technologies, Smartio CP-118EL-A/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, 0x14, 0, 0x200,
+ },
+
{ 0x1393, 0x1680, 0x, 0,
"Moxa Technologies, C168H/PCI",
DEFAULT_RCLK * 8,
@@ -554,6 +593,12 @@ const struct puc_cfg puc_pci_devices[] =
PUC_PORT_8S, 0x18, 0, 8,
},
+ { 0x1393, 0x1683, 0x, 0,
+ "Moxa Technologies, Smartio CP-168EL-A/PCIe",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, 0x14, 0, 0x200,
+ },
+
{ 0x13a8, 0x0152, 0x, 0,
"Exar XR17C/D152",
DEFAULT_RCLK * 8,
@@ -1104,6 +1149,17 @@ puc_config_icbook(struct puc_softc *sc,
}
static int
+puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
+intptr_t *res)
+{
+ if (cmd == PUC_CFG_GET_OFS) {
+ *res = ((port == 3) ? 7 : port) * 0x200;
+ return 0;
+ }
+ return (ENXIO);
+}
+
+static int
puc_config_quatech(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
intptr_t *res)
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227130 - head/sys/netgraph
Author: fjoe
Date: Sun Nov 6 05:20:27 2011
New Revision: 227130
URL: http://svn.freebsd.org/changeset/base/227130
Log:
Constify "address" argument of ng_address_path().
Modified:
head/sys/netgraph/netgraph.h
head/sys/netgraph/ng_base.c
Modified: head/sys/netgraph/netgraph.h
==
--- head/sys/netgraph/netgraph.hSun Nov 6 03:18:50 2011
(r227129)
+++ head/sys/netgraph/netgraph.hSun Nov 6 05:20:27 2011
(r227130)
@@ -1135,7 +1135,7 @@ SYSCTL_DECL(_net_graph);
*/
intng_address_ID(node_p here, item_p item, ng_ID_t ID, ng_ID_t retaddr);
intng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr);
-intng_address_path(node_p here, item_p item, char *address, ng_ID_t raddr);
+intng_address_path(node_p here, item_p item, const char *address, ng_ID_t
raddr);
intng_bypass(hook_p hook1, hook_p hook2);
hook_p ng_findhook(node_p node, const char *name);
struct ng_type *ng_findtype(const char *type);
Modified: head/sys/netgraph/ng_base.c
==
--- head/sys/netgraph/ng_base.c Sun Nov 6 03:18:50 2011(r227129)
+++ head/sys/netgraph/ng_base.c Sun Nov 6 05:20:27 2011(r227130)
@@ -3515,7 +3515,7 @@ ng_address_hook(node_p here, item_p item
}
int
-ng_address_path(node_p here, item_p item, char *address, ng_ID_t retaddr)
+ng_address_path(node_p here, item_p item, const char *address, ng_ID_t retaddr)
{
node_p dest = NULL;
hook_p hook = NULL;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227131 - head/sys/netgraph
Author: fjoe
Date: Sun Nov 6 05:23:42 2011
New Revision: 227131
URL: http://svn.freebsd.org/changeset/base/227131
Log:
Fix potential double mbuf free: M_PREPEND may free mbuf chain and return
NULL but item will still have the reference ot the mbuf chain and will free
it upon destruction.
Modified:
head/sys/netgraph/ng_cisco.c
Modified: head/sys/netgraph/ng_cisco.c
==
--- head/sys/netgraph/ng_cisco.cSun Nov 6 05:20:27 2011
(r227130)
+++ head/sys/netgraph/ng_cisco.cSun Nov 6 05:23:42 2011
(r227131)
@@ -359,12 +359,13 @@ cisco_rcvdata(hook_p hook, item_p item)
/* OK so it came from a protocol, heading out. Prepend general data
packet header. For now, IP,IPX only */
- m = NGI_M(item); /* still associated with item */
+ NGI_GET_M(item, m);
M_PREPEND(m, CISCO_HEADER_LEN, M_DONTWAIT);
if (!m) {
error = ENOBUFS;
goto out;
}
+ NGI_M(item) = m;
h = mtod(m, struct cisco_header *);
h->address = CISCO_UNICAST;
h->control = 0;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227132 - head/sys/netgraph
Author: fjoe
Date: Sun Nov 6 05:24:54 2011
New Revision: 227132
URL: http://svn.freebsd.org/changeset/base/227132
Log:
- Fix potential double mbuf free: M_PREPEND may free mbuf chain and return
NULL but item will still have the reference ot the mbuf chain and will free
it upon destruction.
- Fix memory leak (unfree'd item on error path).
Modified:
head/sys/netgraph/ng_atmllc.c
Modified: head/sys/netgraph/ng_atmllc.c
==
--- head/sys/netgraph/ng_atmllc.c Sun Nov 6 05:23:42 2011
(r227131)
+++ head/sys/netgraph/ng_atmllc.c Sun Nov 6 05:24:54 2011
(r227132)
@@ -153,7 +153,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p it
int error;
priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
- m = NGI_M(item);
+ NGI_GET_M(item, m);
outhook = NULL;
padding = 0;
@@ -170,6 +170,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p it
if (m->m_len < sizeof(struct atmllc) + ETHER_HDR_LEN) {
m = m_pullup(m, sizeof(struct atmllc) + ETHER_HDR_LEN);
if (m == NULL) {
+ NG_FREE_ITEM(item);
return (ENOMEM);
}
}
@@ -236,6 +237,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p it
}
if (outhook == NULL) {
+ NG_FREE_M(m);
NG_FREE_ITEM(item);
return (0);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227151 - in head/sys: conf kern
Author: fjoe
Date: Sun Nov 6 08:10:41 2011
New Revision: 227151
URL: http://svn.freebsd.org/changeset/base/227151
Log:
Add KLD_DEBUG option.
Modified:
head/sys/conf/options
head/sys/kern/kern_linker.c
Modified: head/sys/conf/options
==
--- head/sys/conf/options Sun Nov 6 08:03:33 2011(r227150)
+++ head/sys/conf/options Sun Nov 6 08:10:41 2011(r227151)
@@ -59,6 +59,7 @@ GDB
KDBopt_global.h
KDB_TRACE opt_kdb.h
KDB_UNATTENDED opt_kdb.h
+KLD_DEBUG opt_kld.h
SYSCTL_DEBUG opt_sysctl.h
# Miscellaneous options.
Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Sun Nov 6 08:03:33 2011(r227150)
+++ head/sys/kern/kern_linker.c Sun Nov 6 08:10:41 2011(r227151)
@@ -28,6 +28,7 @@
__FBSDID("$FreeBSD$");
#include "opt_ddb.h"
+#include "opt_kld.h"
#include "opt_hwpmc_hooks.h"
#include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227205 - stable/8/sys/kern
Author: fjoe
Date: Sun Nov 6 09:27:40 2011
New Revision: 227205
URL: http://svn.freebsd.org/changeset/base/227205
Log:
Fix the build with KLD_DEBUG defined.
Modified:
stable/8/sys/kern/kern_linker.c
Modified: stable/8/sys/kern/kern_linker.c
==
--- stable/8/sys/kern/kern_linker.c Sun Nov 6 09:17:48 2011
(r227204)
+++ stable/8/sys/kern/kern_linker.c Sun Nov 6 09:27:40 2011
(r227205)
@@ -632,7 +632,7 @@ linker_file_unload(linker_file_t file, i
*/
if ((error = module_unload(mod)) != 0) {
KLD_DPF(FILE, ("linker_file_unload: module %s"
- " failed unload\n", mod));
+ " failed unload\n", module_getname(mod)));
return (error);
}
MOD_XLOCK;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227902 - head/usr.sbin/sade
Author: fjoe
Date: Wed Nov 23 19:06:30 2011
New Revision: 227902
URL: http://svn.freebsd.org/changeset/base/227902
Log:
- Remove unused old libdialog includes
- Remove unused functions
Modified:
head/usr.sbin/sade/misc.c
head/usr.sbin/sade/sade.h
Modified: head/usr.sbin/sade/misc.c
==
--- head/usr.sbin/sade/misc.c Wed Nov 23 18:38:08 2011(r227901)
+++ head/usr.sbin/sade/misc.c Wed Nov 23 19:06:30 2011(r227902)
@@ -226,51 +226,6 @@ root_bias(char *path)
return tmp;
}
-/*
- * These next routines are kind of specialized just for building item lists
- * for dialog_menu().
- */
-
-/* Add an item to an item list */
-dialogMenuItem *
-item_add(dialogMenuItem *list, char *prompt, char *title,
-int (*checked)(dialogMenuItem *self),
-int (*fire)(dialogMenuItem *self),
-void (*selected)(dialogMenuItem *self, int is_selected),
-void *data, int *aux, int *curr, int *max)
-{
-dialogMenuItem *d;
-
-if (*curr == *max) {
- *max += 20;
- list = (dialogMenuItem *)safe_realloc(list, sizeof(dialogMenuItem) *
*max);
-}
-d = &list[(*curr)++];
-bzero(d, sizeof(*d));
-d->prompt = prompt ? strdup(prompt) : NULL;
-d->title = title ? strdup(title) : NULL;
-d->checked = checked;
-d->fire = fire;
-d->selected = selected;
-d->data = data;
-d->aux = (long)aux;
-return list;
-}
-
-/* Toss the items out */
-void
-items_free(dialogMenuItem *list, int *curr, int *max)
-{
-int i;
-
-for (i = 0; list[i].prompt; i++) {
- safe_free(list[i].prompt);
- safe_free(list[i].title);
-}
-safe_free(list);
-*curr = *max = 0;
-}
-
int
Mkdir(char *ipath)
{
@@ -311,12 +266,6 @@ Mkdir(char *ipath)
}
int
-Mkdir_command(char *key, void *dir)
-{
-return (Mkdir((char*)dir));
-}
-
-int
Mount(char *mountp, void *dev)
{
struct ufs_args ufsargs;
@@ -353,126 +302,6 @@ Mount(char *mountp, void *dev)
}
WINDOW *
-openLayoutDialog(char *helpfile, char *title, int x, int y, int width, int
height)
-{
-WINDOW *win;
-static charhelp[FILENAME_MAX];
-
-/* We need a curses window */
-win = newwin(LINES, COLS, 0, 0);
-if (win) {
- /* Say where our help comes from */
- if (helpfile) {
- use_helpline("Press F1 for more information on this screen.");
- use_helpfile(systemHelpFile(helpfile, help));
- }
- /* Setup a nice screen for us to splat stuff onto */
- draw_box(win, y, x, height, width, dialog_attr, border_attr);
- wattrset(win, dialog_attr);
- mvwaddstr(win, y, x + (COLS - strlen(title)) / 2, title);
-}
-return win;
-}
-
-ComposeObj *
-initLayoutDialog(WINDOW *win, Layout *layout, int x, int y, int *max)
-{
-ComposeObj *obj = NULL, *first;
-int n;
-
-/* Loop over the layout list, create the objects, and add them
- onto the chain of objects that dialog uses for traversal*/
-
-n = 0;
-while (layout[n].help != NULL) {
- int t = TYPE_OF_OBJ(layout[n].type);
-
- switch (t) {
- case STRINGOBJ:
- layout[n].obj = NewStringObj(win, layout[n].prompt, layout[n].var,
-layout[n].y + y, layout[n].x + x,
layout[n].len, layout[n].maxlen);
- ((StringObj *)layout[n].obj)->attr_mask =
ATTR_OF_OBJ(layout[n].type);
- break;
-
- case BUTTONOBJ:
- layout[n].obj = NewButtonObj(win, layout[n].prompt, layout[n].var,
layout[n].y + y, layout[n].x + x);
- break;
-
- default:
- msgFatal("Don't support this object yet!");
- }
- AddObj(&obj, t, (void *) layout[n].obj);
- n++;
-}
-*max = n - 1;
-/* Find the first object in the list */
-for (first = obj; first->prev; first = first->prev);
-return first;
-}
-
-int
-layoutDialogLoop(WINDOW *win, Layout *layout, ComposeObj **obj, int *n, int
max, int *cbutton, int *cancel)
-{
-char help_line[80];
-int ret, i, len = strlen(layout[*n].help);
-
-/* Display the help line at the bottom of the screen */
-for (i = 0; i < 79; i++)
- help_line[i] = (i < len) ? layout[*n].help[i] : ' ';
-help_line[i] = '\0';
-use_helpline(help_line);
-display_helpline(win, LINES - 1, COLS - 1);
-wrefresh(win);
-
-/* Ask for libdialog to do its stuff */
-ret = PollObj(obj);
-/* Handle special case stuff that libdialog misses. Sigh */
-switch (ret) {
-case SEL_ESC: /* Bail out */
- *cancel = TRUE;
- return FALSE;
-
- /* This doesn't work for list dialogs. Oh well. Perhaps
- should special case the move from the OK button ``up''
- to make it go to the interface list, but then it gets
- awkward for the user to go back and correct screw up's
- in the per-inte
svn commit: r227903 - head/usr.sbin/sade
Author: fjoe
Date: Wed Nov 23 19:11:03 2011
New Revision: 227903
URL: http://svn.freebsd.org/changeset/base/227903
Log:
Remove unused functions.
Modified:
head/usr.sbin/sade/misc.c
head/usr.sbin/sade/sade.h
Modified: head/usr.sbin/sade/misc.c
==
--- head/usr.sbin/sade/misc.c Wed Nov 23 19:06:30 2011(r227902)
+++ head/usr.sbin/sade/misc.c Wed Nov 23 19:11:03 2011(r227903)
@@ -56,27 +56,6 @@ file_readable(char *fname)
return FALSE;
}
-/* Quick check to see if a file is executable */
-Boolean
-file_executable(char *fname)
-{
-if (!access(fname, X_OK))
- return TRUE;
-return FALSE;
-}
-
-/* Concatenate two strings into static storage */
-char *
-string_concat(char *one, char *two)
-{
-static char tmp[FILENAME_MAX];
-
-/* Yes, we're deliberately cavalier about not checking for overflow */
-strcpy(tmp, one);
-strcat(tmp, two);
-return tmp;
-}
-
/* sane strncpy() function */
char *
sstrncpy(char *dst, const char *src, int size)
@@ -85,19 +64,6 @@ sstrncpy(char *dst, const char *src, int
return strncpy(dst, src, size);
}
-/* Concatenate three strings into static storage */
-char *
-string_concat3(char *one, char *two, char *three)
-{
-static char tmp[FILENAME_MAX];
-
-/* Yes, we're deliberately cavalier about not checking for overflow */
-strcpy(tmp, one);
-strcat(tmp, two);
-strcat(tmp, three);
-return tmp;
-}
-
/* Clip the whitespace off the end of a string */
char *
string_prune(char *str)
@@ -118,29 +84,6 @@ string_skipwhite(char *str)
return str;
}
-/* copy optionally and allow second arg to be null */
-char *
-string_copy(char *s1, char *s2)
-{
-if (!s1)
- return NULL;
-if (!s2)
- s1[0] = '\0';
-else
- strcpy(s1, s2);
-return s1;
-}
-
-/* convert an integer to a string, using a static buffer */
-char *
-itoa(int value)
-{
-static char buf[13];
-
-snprintf(buf, 12, "%d", value);
-return buf;
-}
-
Boolean
directory_exists(const char *dirname)
{
@@ -159,22 +102,6 @@ directory_exists(const char *dirname)
return (TRUE);
}
-char *
-pathBaseName(const char *path)
-{
-char *pt;
-char *ret = (char *)path;
-
-pt = strrchr(path,(int)'/');
-
-if (pt != 0) /* if there is a slash */
-{
- ret = ++pt; /* start the file after it */
-}
-
-return(ret);
-}
-
/* A free guaranteed to take NULL ptrs */
void
safe_free(void *ptr)
@@ -198,34 +125,6 @@ safe_malloc(size_t size)
return ptr;
}
-/* A realloc that checks errors */
-void *
-safe_realloc(void *orig, size_t size)
-{
-void *ptr;
-
-if (size <= 0)
- msgFatal("Invalid realloc size of %ld!", (long)size);
-ptr = reallocf(orig, size);
-if (!ptr)
- msgFatal("Out of memory!");
-return ptr;
-}
-
-/* Create a path biased from the VAR_INSTALL_ROOT variable (if not /) */
-char *
-root_bias(char *path)
-{
-static char tmp[FILENAME_MAX];
-char *cp = variable_get(VAR_INSTALL_ROOT);
-
-if (!strcmp(cp, "/"))
- return path;
-strcpy(tmp, variable_get(VAR_INSTALL_ROOT));
-strcat(tmp, path);
-return tmp;
-}
-
int
Mkdir(char *ipath)
{
Modified: head/usr.sbin/sade/sade.h
==
--- head/usr.sbin/sade/sade.h Wed Nov 23 19:06:30 2011(r227902)
+++ head/usr.sbin/sade/sade.h Wed Nov 23 19:11:03 2011(r227903)
@@ -387,19 +387,11 @@ extern intdiskLabelCommit(dialogMenuIte
/* misc.c */
extern Boolean file_readable(char *fname);
-extern Boolean file_executable(char *fname);
extern Boolean directory_exists(const char *dirname);
-extern char*root_bias(char *path);
-extern char*itoa(int value);
-extern char*string_concat(char *p1, char *p2);
-extern char*string_concat3(char *p1, char *p2, char *p3);
extern char*string_prune(char *str);
extern char*string_skipwhite(char *str);
-extern char*string_copy(char *s1, char *s2);
-extern char*pathBaseName(const char *path);
extern voidsafe_free(void *ptr);
extern void*safe_malloc(size_t size);
-extern void*safe_realloc(void *orig, size_t size);
extern int Mkdir(char *);
extern int Mount(char *, void *data);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227928 - head/usr.sbin/sade
Author: fjoe Date: Thu Nov 24 08:56:24 2011 New Revision: 227928 URL: http://svn.freebsd.org/changeset/base/227928 Log: Remove unused code. Deleted: head/usr.sbin/sade/config.c Modified: head/usr.sbin/sade/Makefile head/usr.sbin/sade/sade.h Modified: head/usr.sbin/sade/Makefile == --- head/usr.sbin/sade/Makefile Thu Nov 24 07:39:01 2011(r227927) +++ head/usr.sbin/sade/Makefile Thu Nov 24 08:56:24 2011(r227928) @@ -6,7 +6,7 @@ _wizard=wizard.c PROG= sade MAN= sade.8 -SRCS= command.c config.c devices.c \ +SRCS= command.c devices.c \ disks.c dispatch.c dmenu.c \ globals.c install.c \ label.c main.c menus.c misc.c \ Modified: head/usr.sbin/sade/sade.h == --- head/usr.sbin/sade/sade.h Thu Nov 24 07:39:01 2011(r227927) +++ head/usr.sbin/sade/sade.h Thu Nov 24 08:56:24 2011(r227928) @@ -301,13 +301,6 @@ extern voidcommand_execute(void); extern voidcommand_shell_add(char *key, const char *fmt, ...) __printflike(2, 3); extern voidcommand_func_add(char *key, commandFunc func, void *data); -/* config.c */ -extern voidconfigEnvironmentRC_conf(void); -extern voidconfigRC_conf(void); -extern int configFstab(dialogMenuItem *self); -extern int configRC(dialogMenuItem *self); -extern int configWriteRC_conf(dialogMenuItem *self); - /* devices.c */ extern DMenu *deviceCreateMenu(DMenu *menu, DeviceType type, int (*hook)(dialogMenuItem *d), int (*check)(dialogMenuItem *d)); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227929 - head/usr.sbin/sade
Author: fjoe Date: Thu Nov 24 10:08:22 2011 New Revision: 227929 URL: http://svn.freebsd.org/changeset/base/227929 Log: Remove unused code. Deleted: head/usr.sbin/sade/dispatch.c Modified: head/usr.sbin/sade/Makefile Modified: head/usr.sbin/sade/Makefile == --- head/usr.sbin/sade/Makefile Thu Nov 24 08:56:24 2011(r227928) +++ head/usr.sbin/sade/Makefile Thu Nov 24 10:08:22 2011(r227929) @@ -7,7 +7,7 @@ _wizard=wizard.c PROG= sade MAN= sade.8 SRCS= command.c devices.c \ - disks.c dispatch.c dmenu.c \ + disks.c dmenu.c \ globals.c install.c \ label.c main.c menus.c misc.c \ msg.c system.c termcap.c \ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227934 - head/usr.sbin/tzsetup
Author: fjoe
Date: Thu Nov 24 13:24:06 2011
New Revision: 227934
URL: http://svn.freebsd.org/changeset/base/227934
Log:
Port to new libdialog.
Modified:
head/usr.sbin/tzsetup/Makefile
head/usr.sbin/tzsetup/tzsetup.c
Modified: head/usr.sbin/tzsetup/Makefile
==
--- head/usr.sbin/tzsetup/Makefile Thu Nov 24 13:18:58 2011
(r227933)
+++ head/usr.sbin/tzsetup/Makefile Thu Nov 24 13:24:06 2011
(r227934)
@@ -3,11 +3,11 @@
PROG= tzsetup
MAN= tzsetup.8
-CFLAGS+= -I${.CURDIR}/../../gnu/lib/libodialog -I.
+CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I.
WARNS?=3
-DPADD= ${LIBODIALOG} ${LIBNCURSES}
-LDADD= -lodialog -lncurses
+DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM}
+LDADD= -ldialog -lncursesw -lm
.include
Modified: head/usr.sbin/tzsetup/tzsetup.c
==
--- head/usr.sbin/tzsetup/tzsetup.c Thu Nov 24 13:18:58 2011
(r227933)
+++ head/usr.sbin/tzsetup/tzsetup.c Thu Nov 24 13:24:06 2011
(r227934)
@@ -35,7 +35,6 @@
#include
__FBSDID("$FreeBSD$");
-#include
#include
#include
#include
@@ -49,6 +48,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
+
#define_PATH_ZONETAB "/usr/share/zoneinfo/zone.tab"
#define_PATH_ISO3166 "/usr/share/misc/iso3166"
#define_PATH_ZONEINFO "/usr/share/zoneinfo"
@@ -56,8 +57,92 @@ __FBSDID("$FreeBSD$");
#define_PATH_DB"/var/db/zoneinfo"
#define_PATH_WALL_CMOS_CLOCK "/etc/wall_cmos_clock"
+/* special return codes for `fire' actions */
+#define DITEM_FAILURE 1
+
+/* flags - returned in upper 16 bits of return status */
+#define DITEM_LEAVE_MENU(1 << 16)
+#define DITEM_RECREATE (1 << 18)
+
+/* for use in describing more exotic behaviors */
+typedef struct dialogMenuItem {
+ char *prompt;
+ char *title;
+ int (*fire)(struct dialogMenuItem *self);
+ void *data;
+} dialogMenuItem;
+
+static int
+xdialog_menu(const char *title, const char *cprompt, int height, int width,
+int menu_height, int item_no, dialogMenuItem *ditems)
+{
+ int i, result, choice;
+ DIALOG_LISTITEM *listitems;
+ DIALOG_VARS save_vars;
+
+ dlg_save_vars(&save_vars);
+
+ /* initialize list items */
+ listitems = dlg_calloc(DIALOG_LISTITEM, item_no);
+ assert_ptr(listitems, "xdialog_menu");
+ for (i = 0; i < item_no; i++) {
+ listitems[i].name = ditems[i].prompt;
+ listitems[i].text = ditems[i].title;
+ }
+
+ /* calculate width */
+ if (width < 0) {
+ int tag_x = 0;
+
+ for (i = 0; i < item_no; i++) {
+ int j, l;
+
+ l = strlen(listitems[i].name);
+ for (j = 0; j < item_no; j++) {
+ int k = strlen(listitems[j].text);
+ tag_x = MAX(tag_x, l + k + 2);
+ }
+ }
+ width = MAX(dlg_count_columns(cprompt), title != NULL ?
dlg_count_columns(title) : 0);
+ width = MAX(width, tag_x + 4) + 4;
+ }
+ width = MAX(width, 24);
+ if (width > COLS)
+ width = COLS;
+
+again:
+ dialog_vars.default_item = ditems[choice].prompt;
+ result = dlg_menu(title, cprompt, height, width,
+ menu_height, item_no, listitems, &choice, NULL);
+ switch (result) {
+ case DLG_EXIT_ESC:
+ result = -1;
+ break;
+ case DLG_EXIT_OK:
+ if (ditems[choice].fire != NULL) {
+ int status;
+
+ status = ditems[choice].fire(ditems + choice);
+ if (status & DITEM_RECREATE) {
+ dlg_clear();
+ goto again;
+ }
+ }
+ result = 0;
+ break;
+ case DLG_EXIT_CANCEL:
+ default:
+ result = 1;
+ break;
+ }
+
+ free(listitems);
+ dlg_restore_vars(&save_vars);
+ return result;
+}
+
static charpath_zonetab[MAXPATHLEN], path_iso3166[MAXPATHLEN],
- path_zoneinfo[MAXPATHLEN], path_localtime[MAXPATHLEN],
+ path_zoneinfo[MAXPATHLEN], path_localtime[MAXPATHLEN],
path_db[MAXPATHLEN], path_wall_cmos_clock[MAXPATHLEN];
static int reallydoit = 1;
@@ -77,8 +162,6 @@ static int set_zone_utc(void);
struct continent {
dialogMenuItem *menu;
int nitems;
- int ch;
- int sc;
};
static struct continentafrica, america, antarctica, arctic, asia,
atlantic;
@@ -98,7 +181,7 @@ static struct continent_names {
{ "Eu
svn commit: r227935 - head/tools
Author: fjoe Date: Thu Nov 24 14:16:01 2011 New Revision: 227935 URL: http://svn.freebsd.org/changeset/base/227935 Log: Utility script to build specific parts of the source tree on all arches Added: head/tools/tinder.sh (contents, props changed) Added: head/tools/tinder.sh == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tinder.shThu Nov 24 14:16:01 2011(r227935) @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Copyright (c) 2011 Max Khon, The FreeBSD Project +# 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$ +# + +# +# Utility script to build specific parts of the source tree on all arches +# +# Example: +# +# cd /usr/src +# make toolchains # build toolchain for all arches +# sh tools/tinder.sh gnu/lib/libdialog usr.sbin/sade NO_CLEAN=yes +# # build libdialog and sade for all architectures +# # without making clean +# + +if [ $# -eq 0 ]; then + echo 1>&2 "Usage: `basename $0` [MAKEVAR=value...] path..." + exit 1 +fi + +# MAKE_ARGS is intentionally not reset to allow caller to specify additional MAKE_ARGS +SUBDIR= +for i in "$@"; do + case "$i" in + *=*) + MAKE_ARGS="$MAKE_ARGS $i" + ;; + *) + SUBDIR="$SUBDIR $i" + esac +done +make tinderbox UNIVERSE_TARGET="_cleanobj _obj _depend everything" $MAKE_ARGS SUBDIR_OVERRIDE="$SUBDIR" ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227936 - head/gnu/usr.bin/dialog
Author: fjoe
Date: Thu Nov 24 14:17:04 2011
New Revision: 227936
URL: http://svn.freebsd.org/changeset/base/227936
Log:
Use ${VAR} instead of $(VAR) consistently.
Modified:
head/gnu/usr.bin/dialog/Makefile
Modified: head/gnu/usr.bin/dialog/Makefile
==
--- head/gnu/usr.bin/dialog/MakefileThu Nov 24 14:16:01 2011
(r227935)
+++ head/gnu/usr.bin/dialog/MakefileThu Nov 24 14:17:04 2011
(r227936)
@@ -3,7 +3,7 @@
DIALOG=${.CURDIR}/../../../contrib/dialog
PROG= dialog
-DPADD= $(LIBDIALOG) $(LIBNCURSES) $(LIBM)
+DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBM}
LDADD= -ldialog -lncursesw -lm
CFLAGS+= -I${.CURDIR} -I${DIALOG}
.PATH: ${DIALOG}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227937 - head/tools
Author: fjoe Date: Thu Nov 24 14:22:05 2011 New Revision: 227937 URL: http://svn.freebsd.org/changeset/base/227937 Log: Add missing ;; Modified: head/tools/tinder.sh Modified: head/tools/tinder.sh == --- head/tools/tinder.shThu Nov 24 14:17:04 2011(r227936) +++ head/tools/tinder.shThu Nov 24 14:22:05 2011(r227937) @@ -53,6 +53,7 @@ for i in "$@"; do ;; *) SUBDIR="$SUBDIR $i" + ;; esac done make tinderbox UNIVERSE_TARGET="_cleanobj _obj _depend everything" $MAKE_ARGS SUBDIR_OVERRIDE="$SUBDIR" ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227939 - head/usr.sbin/sade
Author: fjoe
Date: Thu Nov 24 15:47:01 2011
New Revision: 227939
URL: http://svn.freebsd.org/changeset/base/227939
Log:
Disk selection dialog is now a normal menu, not a checkboxed menu:
checkboxed menu is confusing and also can not be implemented
in new libdialog.
Modified:
head/usr.sbin/sade/devices.c
head/usr.sbin/sade/disks.c
head/usr.sbin/sade/install.c
head/usr.sbin/sade/label.c
head/usr.sbin/sade/menus.c
head/usr.sbin/sade/sade.h
Modified: head/usr.sbin/sade/devices.c
==
--- head/usr.sbin/sade/devices.cThu Nov 24 15:12:57 2011
(r227938)
+++ head/usr.sbin/sade/devices.cThu Nov 24 15:47:01 2011
(r227939)
@@ -122,7 +122,7 @@ deviceTry(struct _devname dev, char *try
/* Register a new device in the devices array */
Device *
-deviceRegister(char *name, char *desc, char *devname, DeviceType type, Boolean
enabled,
+deviceRegister(char *name, char *desc, char *devname, DeviceType type,
Boolean (*init)(Device *), FILE * (*get)(Device *, char *,
Boolean),
void (*shutdown)(Device *), void *private)
{
@@ -135,7 +135,6 @@ deviceRegister(char *name, char *desc, c
newdev->description = desc;
newdev->devname = devname;
newdev->type = type;
- newdev->enabled = enabled;
newdev->init = init ? init : dummyInit;
newdev->get = get ? get : dummyGet;
newdev->shutdown = shutdown ? shutdown : dummyShutdown;
@@ -223,7 +222,7 @@ deviceGetAll(void)
continue;
}
- deviceRegister(names[i], names[i], d->name, DEVICE_TYPE_DISK, FALSE,
+ deviceRegister(names[i], names[i], d->name, DEVICE_TYPE_DISK,
dummyInit, dummyGet, dummyShutdown, d);
if (isDebug())
msgDebug("Found a disk device named %s\n", names[i]);
@@ -237,7 +236,7 @@ deviceGetAll(void)
/* Got one! */
snprintf(devname, sizeof devname, "/dev/%s", c1->name);
- dev = deviceRegister(c1->name, c1->name, strdup(devname),
DEVICE_TYPE_DOS, TRUE,
+ dev = deviceRegister(c1->name, c1->name, strdup(devname),
DEVICE_TYPE_DOS,
mediaInitDOS, mediaGetDOS, mediaShutdownDOS, NULL);
dev->private = c1;
if (isDebug())
@@ -314,7 +313,7 @@ deviceCount(Device **devs)
* menu is cloned.
*/
DMenu *
-deviceCreateMenu(DMenu *menu, DeviceType type, int (*hook)(dialogMenuItem *d),
int (*check)(dialogMenuItem *d))
+deviceCreateMenu(DMenu *menu, DeviceType type, int (*hook)(dialogMenuItem *d))
{
Device **devs;
int numdevs;
@@ -338,7 +337,6 @@ deviceCreateMenu(DMenu *menu, DeviceType
if (j == numDevs)
tmp->items[i].title = "";
tmp->items[i].fire = hook;
- tmp->items[i].checked = check;
}
tmp->items[i].title = NULL;
return tmp;
Modified: head/usr.sbin/sade/disks.c
==
--- head/usr.sbin/sade/disks.c Thu Nov 24 15:12:57 2011(r227938)
+++ head/usr.sbin/sade/disks.c Thu Nov 24 15:47:01 2011(r227939)
@@ -305,25 +305,6 @@ getBootMgr(char *dname, u_char **bootCod
#endif
#endif /* WITH_SLICES */
-int
-diskGetSelectCount(Device ***devs)
-{
-int i, cnt, enabled;
-char *cp;
-Device **dp;
-
-cp = variable_get(VAR_DISK);
-dp = *devs = deviceFind(cp, DEVICE_TYPE_DISK);
-cnt = deviceCount(dp);
-if (!cnt)
- return -1;
-for (i = 0, enabled = 0; i < cnt; i++) {
- if (dp[i]->enabled)
- ++enabled;
-}
-return enabled;
-}
-
#ifdef WITH_SLICES
void
diskPartition(Device *dev)
@@ -641,7 +622,7 @@ diskPartition(Device *dev)
Set_Boot_Mgr(d, mbrContents, mbrSize);
#endif
- if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS)
+ if (DITEM_STATUS(diskPartitionWrite(dev)) != DITEM_SUCCESS)
msgConfirm("Disk partition write returned an error
status!");
else
msgConfirm("Wrote FDISK partition information out
successfully.");
@@ -770,7 +751,7 @@ bootalloc(char *name, size_t *size)
}
#endif /* !__ia64__ */
-#ifdef WITH_SLICES
+#ifdef WITH_SLICES
static int
partitionHook(dialogMenuItem *selected)
{
@@ -781,58 +762,28 @@ partitionHook(dialogMenuItem *selected)
msgConfirm("Unable to find disk %s!", selected->prompt);
return DITEM_FAILURE;
}
-/* Toggle enabled status? */
-if (!devs[0]->enabled) {
- devs[0]->enabled = TRUE;
- diskPartition(devs[0]);
-}
-else
- devs[0]->enabled = FALSE;
+diskPartition(devs[0]);
return DITEM_SUCCESS;
}
-static int
-partitionCheck(dialogMenuItem *selected)
-{
-Device **devs = NULL;
-
-devs = deviceFind(selected->prompt, DEVICE_TYPE_DISK);
-if
svn commit: r227944 - head/usr.sbin/sade
Author: fjoe
Date: Thu Nov 24 18:37:16 2011
New Revision: 227944
URL: http://svn.freebsd.org/changeset/base/227944
Log:
Port to new libdialog.
Modified:
head/usr.sbin/sade/Makefile
head/usr.sbin/sade/devices.c
head/usr.sbin/sade/disks.c
head/usr.sbin/sade/dmenu.c
head/usr.sbin/sade/install.c
head/usr.sbin/sade/label.c
head/usr.sbin/sade/main.c
head/usr.sbin/sade/menus.c
head/usr.sbin/sade/misc.c
head/usr.sbin/sade/msg.c
head/usr.sbin/sade/sade.h
head/usr.sbin/sade/system.c
Modified: head/usr.sbin/sade/Makefile
==
--- head/usr.sbin/sade/Makefile Thu Nov 24 17:58:14 2011(r227943)
+++ head/usr.sbin/sade/Makefile Thu Nov 24 18:37:16 2011(r227944)
@@ -19,9 +19,10 @@ WARNS?= 3
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
-CFLAGS+= -I${.CURDIR}/../../gnu/lib/libodialog -I.
+CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I.
+DEBUG_FLAGS= -O0 -g
-DPADD= ${LIBODIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK}
-LDADD= -lodialog -lncurses -lutil -ldisk
+DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} ${LIBUTIL} ${LIBDISK}
+LDADD= -ldialog -lncursesw -lm -lutil -ldisk
.include
Modified: head/usr.sbin/sade/devices.c
==
--- head/usr.sbin/sade/devices.cThu Nov 24 17:58:14 2011
(r227943)
+++ head/usr.sbin/sade/devices.cThu Nov 24 18:37:16 2011
(r227944)
@@ -29,7 +29,6 @@
*
*/
-#include "sade.h"
#include
#include
#include
@@ -40,6 +39,8 @@
#include
#include
+#include "sade.h"
+
/* how much to bias minor number for a given /dev/s slice */
#define SLICE_DELTA(0x1)
@@ -247,7 +248,7 @@ deviceGetAll(void)
}
free(names);
}
-dialog_clear_norefresh();
+dlg_clear();
}
/* Rescan all devices, after closing previous set - convenience function */
Modified: head/usr.sbin/sade/disks.c
==
--- head/usr.sbin/sade/disks.c Thu Nov 24 17:58:14 2011(r227943)
+++ head/usr.sbin/sade/disks.c Thu Nov 24 18:37:16 2011(r227944)
@@ -113,7 +113,7 @@ check_geometry(Disk *d)
if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64)
#endif
{
- dialog_clear_norefresh();
+ dlg_clear();
sg = msgYesNo("WARNING: It is safe to use a geometry of %lu/%lu/%lu
for %s on\n"
"computers with modern BIOS versions. If this disk is to
be used\n"
"on an old machine it is recommended that it does not
have more\n"
@@ -223,21 +223,21 @@ getBootMgr(char *dname, u_char **bootipl
char *cp;
int i = 0;
+dlg_clr_result();
cp = variable_get(VAR_BOOTMGR);
if (!cp) {
/* Figure out what kind of IPL the user wants */
sprintf(str, "Install Boot Manager for drive %s?", dname);
MenuIPLType.title = str;
- i = dmenuOpenSimple(&MenuIPLType, FALSE);
+ i = dmenuOpen(&MenuIPLType);
} else {
if (!strncmp(cp, "boot", 4))
- BootMgr = 0;
+dlg_add_result(MenuIPLType.items[0].prompt);
else
- BootMgr = 1;
+dlg_add_result(MenuIPLType.items[1].prompt);
}
if (cp || i) {
- switch (BootMgr) {
- case 0:
+if (!strcmp(dialog_vars.input_result, MenuIPLType.items[0].prompt)) {
if (!boot0) boot0 = bootalloc("boot0", &boot0_size);
*bootipl = boot0;
*bootipl_size = boot0_size;
@@ -245,10 +245,7 @@ getBootMgr(char *dname, u_char **bootipl
*bootmenu = boot05;
*bootmenu_size = boot05_size;
return;
- case 1:
- default:
- break;
- }
+}
}
*bootipl = NULL;
*bootipl_size = 0;
@@ -266,36 +263,33 @@ getBootMgr(char *dname, u_char **bootCod
char *cp;
int i = 0;
+dlg_clr_result();
cp = variable_get(VAR_BOOTMGR);
if (!cp) {
/* Figure out what kind of MBR the user wants */
sprintf(str, "Install Boot Manager for drive %s?", dname);
MenuMBRType.title = str;
- i = dmenuOpenSimple(&MenuMBRType, FALSE);
+ i = dmenuOpen(&MenuMBRType);
}
else {
+ if (!strcmp(cp, "standard"))
+dlg_add_result(MenuMBRType.items[0].prompt);
if (!strncmp(cp, "boot", 4))
- BootMgr = 0;
- else if (!strcmp(cp, "standard"))
- BootMgr = 1;
+dlg_add_result(MenuMBRType.items[1].prompt);
else
- BootMgr = 2;
+dlg_add_result(MenuMBRType.items[2].prompt);
}
if (cp || i) {
- switch (BootMgr) {
- case 0:
- if (!boot0) boot0 = bootalloc("boot0", &boot0_size);
- *bootCode = boot0;
- *bootCodeSize = boot0_size;
- return;
- case 1:
+if (!strcmp(dialog_vars.input_result, MenuMBRType.items[0].
svn commit: r227947 - head/usr.sbin/tzsetup
Author: fjoe
Date: Thu Nov 24 18:45:23 2011
New Revision: 227947
URL: http://svn.freebsd.org/changeset/base/227947
Log:
calloc +1 DIALOG_LISTITEM to prevent possible wild pointer access
in dlg_default_listitem().
Modified:
head/usr.sbin/tzsetup/tzsetup.c
Modified: head/usr.sbin/tzsetup/tzsetup.c
==
--- head/usr.sbin/tzsetup/tzsetup.c Thu Nov 24 18:44:14 2011
(r227946)
+++ head/usr.sbin/tzsetup/tzsetup.c Thu Nov 24 18:45:23 2011
(r227947)
@@ -76,14 +76,14 @@ static int
xdialog_menu(const char *title, const char *cprompt, int height, int width,
int menu_height, int item_no, dialogMenuItem *ditems)
{
- int i, result, choice;
+ int i, result, choice = 0;
DIALOG_LISTITEM *listitems;
DIALOG_VARS save_vars;
dlg_save_vars(&save_vars);
/* initialize list items */
- listitems = dlg_calloc(DIALOG_LISTITEM, item_no);
+ listitems = dlg_calloc(DIALOG_LISTITEM, item_no + 1);
assert_ptr(listitems, "xdialog_menu");
for (i = 0; i < item_no; i++) {
listitems[i].name = ditems[i].prompt;
@@ -111,7 +111,7 @@ xdialog_menu(const char *title, const ch
width = COLS;
again:
- dialog_vars.default_item = ditems[choice].prompt;
+ dialog_vars.default_item = listitems[choice].name;
result = dlg_menu(title, cprompt, height, width,
menu_height, item_no, listitems, &choice, NULL);
switch (result) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227951 - in head: . gnu/lib share/mk
Author: fjoe
Date: Thu Nov 24 20:31:06 2011
New Revision: 227951
URL: http://svn.freebsd.org/changeset/base/227951
Log:
libodialog: disconnect from the build and obsolete.
Modified:
head/ObsoleteFiles.inc
head/gnu/lib/Makefile
head/share/mk/bsd.libnames.mk
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Thu Nov 24 19:02:04 2011(r227950)
+++ head/ObsoleteFiles.inc Thu Nov 24 20:31:06 2011(r227951)
@@ -38,6 +38,17 @@
# xargs -n1 | sort | uniq -d;
# done
+# 2025: libodialog removed
+OLD_FILES+=usr/lib/libodialog.a
+OLD_FILES+=usr/lib/libodialog.so
+OLD_LIBS+=usr/lib/libodialog.so.7
+OLD_FILES+=usr/lib/libodialog_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libodialog.a
+OLD_FILES+=usr/lib32/libodialog.so
+OLD_LIBS+=usr/lib32/libodialog.so.7
+OLD_FILES+=usr/lib32/libodialog_p.a
+.endif
# 20110930: sysinstall removed
OLD_FILES+=usr/sbin/sysinstall
OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
Modified: head/gnu/lib/Makefile
==
--- head/gnu/lib/Makefile Thu Nov 24 19:02:04 2011(r227950)
+++ head/gnu/lib/Makefile Thu Nov 24 20:31:06 2011(r227951)
@@ -2,8 +2,7 @@
.include
-SUBDIR= csu libgcc libgcov libdialog libgomp libodialog libregex libreadline \
- libssp
+SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp
# libsupc++ uses libstdc++ headers, although 'make includes' should
# have taken care of that already.
Modified: head/share/mk/bsd.libnames.mk
==
--- head/share/mk/bsd.libnames.mk Thu Nov 24 19:02:04 2011
(r227950)
+++ head/share/mk/bsd.libnames.mk Thu Nov 24 20:31:06 2011
(r227951)
@@ -100,7 +100,6 @@ LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncu
LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a
LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a
LIBNVPAIR?=${DESTDIR}${LIBDIR}/libnvpair.a
-LIBODIALOG?= ${DESTDIR}${LIBDIR}/libodialog.a
LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a
# The static PAM library doesn't know its secondary dependencies,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227953 - head/gnu/lib/libodialog
Author: fjoe Date: Thu Nov 24 20:34:50 2011 New Revision: 227953 URL: http://svn.freebsd.org/changeset/base/227953 Log: libodialog: Remove no longer used library. Deleted: head/gnu/lib/libodialog/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r227962 - head/usr.sbin/sade
Author: fjoe
Date: Fri Nov 25 07:10:59 2011
New Revision: 227962
URL: http://svn.freebsd.org/changeset/base/227962
Log:
Remove DEBUG_FLAGS.
Modified:
head/usr.sbin/sade/Makefile
Modified: head/usr.sbin/sade/Makefile
==
--- head/usr.sbin/sade/Makefile Fri Nov 25 04:03:37 2011(r227961)
+++ head/usr.sbin/sade/Makefile Fri Nov 25 07:10:59 2011(r227962)
@@ -20,7 +20,6 @@ WARNS?= 3
CFLAGS+= -DPC98
.endif
CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I.
-DEBUG_FLAGS= -O0 -g
DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} ${LIBUTIL} ${LIBDISK}
LDADD= -ldialog -lncursesw -lm -lutil -ldisk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r227953 - head/gnu/lib/libodialog
Doug, On Fri, Nov 25, 2011 at 4:12 AM, Doug Barton wrote: > Author: fjoe > > Date: Thu Nov 24 20:34:50 2011 > > New Revision: 227953 > > URL: http://svn.freebsd.org/changeset/base/227953 > > > > Log: > > libodialog: Remove no longer used library. > > > > Deleted: > > head/gnu/lib/libodialog/ > > I'm curious ... I asked Nathan to please bring back sysinstall until we > have a suitable replacement for the post-install configuration role that > it plays. Is your change here going to make that more difficult? I did not know about that. If we ever would want to resurrect it 1) I would insist on removing (or merging in) sade functionality 2) I would remove all installation and scripting functionality, leaving only post-configuration 3) Given 1) and 2) I can help porting it to the new libdialog Aside from that, I'd better implement new post-install configuration tool. Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228065 - head/lib/libpam/modules/pam_unix
Author: fjoe Date: Mon Nov 28 14:01:17 2011 New Revision: 228065 URL: http://svn.freebsd.org/changeset/base/228065 Log: .include instead of The former allows common settings from ../Makefile.inc to be used. Modified: head/lib/libpam/modules/pam_unix/Makefile Modified: head/lib/libpam/modules/pam_unix/Makefile == --- head/lib/libpam/modules/pam_unix/Makefile Mon Nov 28 13:42:59 2011 (r228064) +++ head/lib/libpam/modules/pam_unix/Makefile Mon Nov 28 14:01:17 2011 (r228065) @@ -34,9 +34,7 @@ # # $FreeBSD$ -NO_PROFILE= -NO_INSTALLLIB= -.include +.include LIB= pam_unix SRCS= pam_unix.c ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228066 - head/tools
Author: fjoe Date: Mon Nov 28 14:03:36 2011 New Revision: 228066 URL: http://svn.freebsd.org/changeset/base/228066 Log: Add a comment that shows how to limit the build to the specific list of arches. Modified: head/tools/tinder.sh Modified: head/tools/tinder.sh == --- head/tools/tinder.shMon Nov 28 14:01:17 2011(r228065) +++ head/tools/tinder.shMon Nov 28 14:03:36 2011(r228066) @@ -37,6 +37,8 @@ # sh tools/tinder.sh gnu/lib/libdialog usr.sbin/sade NO_CLEAN=yes # # build libdialog and sade for all architectures # # without making clean +# sh tools/tinder.sh gnu/lib/libdialog usr.sbin/sade TARGETS="amd64 i386" +# # build libdialog and sade only for amd64 and i386 # if [ $# -eq 0 ]; then ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228074 - head/rescue/rescue
Author: fjoe
Date: Mon Nov 28 15:44:04 2011
New Revision: 228074
URL: http://svn.freebsd.org/changeset/base/228074
Log:
-lpthread is required by -lzfs so should be later in LIBS list.
There were no "undefined symbol pthread_xxx" errors during the link before
this fix only because of STATIC_LIB_REQUIRE() declarations in
lib/libthr/thread/thr_init.c.
Modified:
head/rescue/rescue/Makefile
Modified: head/rescue/rescue/Makefile
==
--- head/rescue/rescue/Makefile Mon Nov 28 15:09:31 2011(r228073)
+++ head/rescue/rescue/Makefile Mon Nov 28 15:44:04 2011(r228074)
@@ -123,7 +123,7 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ld
CRUNCH_LIBS+= -lipx
.endif
.if ${MK_ZFS} != "no"
-CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem
+CRUNCH_LIBS+= -lavl -lnvpair -lzfs -lpthread -luutil -lumem
.endif
CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228112 - head/rescue/rescue
Author: fjoe
Date: Tue Nov 29 03:27:09 2011
New Revision: 228112
URL: http://svn.freebsd.org/changeset/base/228112
Log:
-lreadline is not required anymore.
Modified:
head/rescue/rescue/Makefile
Modified: head/rescue/rescue/Makefile
==
--- head/rescue/rescue/Makefile Tue Nov 29 02:07:07 2011(r228111)
+++ head/rescue/rescue/Makefile Tue Nov 29 03:27:09 2011(r228112)
@@ -125,7 +125,7 @@ CRUNCH_LIBS+= -lipx
.if ${MK_ZFS} != "no"
CRUNCH_LIBS+= -lavl -lnvpair -lzfs -lpthread -luutil -lumem
.endif
-CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs -lz
.if ${MACHINE_CPUARCH} == "i386"
CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228113 - in head/kerberos5: usr.bin/kadmin usr.sbin/ktutil
Author: fjoe
Date: Tue Nov 29 03:49:03 2011
New Revision: 228113
URL: http://svn.freebsd.org/changeset/base/228113
Log:
Link with -ledit instead of -lreadline.
Modified:
head/kerberos5/usr.bin/kadmin/Makefile
head/kerberos5/usr.sbin/ktutil/Makefile
Modified: head/kerberos5/usr.bin/kadmin/Makefile
==
--- head/kerberos5/usr.bin/kadmin/Makefile Tue Nov 29 03:27:09 2011
(r228112)
+++ head/kerberos5/usr.bin/kadmin/Makefile Tue Nov 29 03:49:03 2011
(r228113)
@@ -29,11 +29,11 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DI
DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
+ ${LIBEDIT} ${LIBNCURSES} ${LDAPDPADD}
LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
${LIBSL} -lroken ${LIBVERS} -lasn1 \
-lcrypto -lcrypt -lcom_err \
- -lreadline -lncurses ${LDAPLDADD}
+ -ledit -lncurses ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include
Modified: head/kerberos5/usr.sbin/ktutil/Makefile
==
--- head/kerberos5/usr.sbin/ktutil/Makefile Tue Nov 29 03:27:09 2011
(r228112)
+++ head/kerberos5/usr.sbin/ktutil/Makefile Tue Nov 29 03:49:03 2011
(r228113)
@@ -18,10 +18,10 @@ SRCS= add.c \
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I.
DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBHX509} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBREADLINE} ${LIBNCURSES}
+ ${LIBEDIT} ${LIBNCURSES}
LDADD= -lkadm5clnt -lkrb5 -lhx509 ${LIBSL} -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err \
- -lreadline -lncurses
+ -ledit -lncurses
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228114 - head/lib/libedit/edit/readline
Author: fjoe
Date: Tue Nov 29 04:50:57 2011
New Revision: 228114
URL: http://svn.freebsd.org/changeset/base/228114
Log:
- Hide _rl_qsort_string_compare() that should be private to libreadline()
implementation.
- Add symlink /usr/include/edit/readline/tilde.h -> readline.h
All this makes it possible to build and link gdb with -ledit.
Modified:
head/lib/libedit/edit/readline/Makefile
head/lib/libedit/edit/readline/readline.h
Modified: head/lib/libedit/edit/readline/Makefile
==
--- head/lib/libedit/edit/readline/Makefile Tue Nov 29 03:49:03 2011
(r228113)
+++ head/lib/libedit/edit/readline/Makefile Tue Nov 29 04:50:57 2011
(r228114)
@@ -2,6 +2,7 @@
# $FreeBSD$
INCS= readline.h history.h
+SYMLINKS= readline.h ${INCLUDEDIR}/edit/readline/tilde.h
INCSDIR= ${INCLUDEDIR}/edit/readline
Modified: head/lib/libedit/edit/readline/readline.h
==
--- head/lib/libedit/edit/readline/readline.h Tue Nov 29 03:49:03 2011
(r228113)
+++ head/lib/libedit/edit/readline/readline.h Tue Nov 29 04:50:57 2011
(r228114)
@@ -200,7 +200,6 @@ void rl_get_screen_size(int *, int *);
voidrl_set_screen_size(int, int);
char *rl_filename_completion_function (const char *, int);
int _rl_abort_internal(void);
-int _rl_qsort_string_compare(char **, char **);
char **rl_completion_matches(const char *, rl_compentry_func_t *);
voidrl_forced_update_display(void);
int rl_set_prompt(const char *);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228116 - head/lib/libedit/edit/readline
Author: fjoe
Date: Tue Nov 29 06:21:01 2011
New Revision: 228116
URL: http://svn.freebsd.org/changeset/base/228116
Log:
Use INCSLINKS so that "make installincludes" installs links during buildworld.
Modified:
head/lib/libedit/edit/readline/Makefile
Modified: head/lib/libedit/edit/readline/Makefile
==
--- head/lib/libedit/edit/readline/Makefile Tue Nov 29 06:12:19 2011
(r228115)
+++ head/lib/libedit/edit/readline/Makefile Tue Nov 29 06:21:01 2011
(r228116)
@@ -2,7 +2,7 @@
# $FreeBSD$
INCS= readline.h history.h
-SYMLINKS= readline.h ${INCLUDEDIR}/edit/readline/tilde.h
+INCSLINKS= readline.h ${INCSDIR}/tilde.h
INCSDIR= ${INCLUDEDIR}/edit/readline
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228120 - head/share/mk
Author: fjoe
Date: Tue Nov 29 08:20:23 2011
New Revision: 228120
URL: http://svn.freebsd.org/changeset/base/228120
Log:
Allow NO_FOO to override WITH_FOO that could be specified in /etc/src.conf.
This is required to override knobs (e.g. WITH_PROFILE) during buildworld
stages in Makefile.inc1 (otherwise the build is stopped due to both WITH_FOO
and WITHOUT_FOO defined).
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkTue Nov 29 08:16:14 2011(r228119)
+++ head/share/mk/bsd.own.mkTue Nov 29 08:20:23 2011(r228120)
@@ -207,6 +207,9 @@ COMPRESS_EXT?= .gz
MAN \
PROFILE
.if defined(NO_${var})
+.if defined(WITH_${var})
+.undef WITH_${var}
+.endif
WITHOUT_${var}=
.endif
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228121 - head/sys/conf
Author: fjoe Date: Tue Nov 29 08:21:54 2011 New Revision: 228121 URL: http://svn.freebsd.org/changeset/base/228121 Log: Fix typo in comments (conversation -> conversion). Modified: head/sys/conf/kern.mk Modified: head/sys/conf/kern.mk == --- head/sys/conf/kern.mk Tue Nov 29 08:20:23 2011(r228120) +++ head/sys/conf/kern.mk Tue Nov 29 08:21:54 2011(r228121) @@ -128,7 +128,7 @@ CFLAGS+=-fstack-protector .endif # -# Enable CTF conversation on request +# Enable CTF conversion on request # .if defined(WITH_CTF) .undef NO_CTF ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228124 - in head: share/mk sys/conf
Author: fjoe
Date: Tue Nov 29 08:38:47 2011
New Revision: 228124
URL: http://svn.freebsd.org/changeset/base/228124
Log:
Conditionalize ctfconvert/ctfmerge runs on make level (.if/.endif) instead
of executing a shell on every object or executable/library file.
This shaves off more than 30,000 shell invocations during buildworld.
Modified:
head/share/mk/bsd.lib.mk
head/share/mk/bsd.prog.mk
head/share/mk/sys.mk
head/sys/conf/kern.post.mk
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Nov 29 08:33:40 2011(r228123)
+++ head/share/mk/bsd.lib.mkTue Nov 29 08:38:47 2011(r228124)
@@ -75,15 +75,15 @@ PO_FLAG=-pg
.c.po:
${CC} ${PO_FLAG} ${STATIC_CFLAGS} ${PO_CFLAGS} -c ${.IMPSRC} -o
${.TARGET}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.c.So:
${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o
${.TARGET}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.cc.o:
${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@@ -96,47 +96,47 @@ PO_FLAG=-pg
.f.po:
${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.f.So:
${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.s.po .s.So:
${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.asm.po:
${CC} -x assembler-with-cpp -DPROF ${PO_CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.asm.So:
${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.S.po:
${CC} -DPROF ${PO_CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.S.So:
${CC} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
all: objwarn
@@ -211,9 +211,9 @@ ${SHLIB_NAME}: ${SOBJS}
-o ${.TARGET} -Wl,-soname,${SONAME} \
`NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
.endif
- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
+.if !defined(NO_CTF)
+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+.endif
.endif
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) &&
${MK_TOOLCHAIN} != "no"
Modified: head/share/mk/bsd.prog.mk
==
--- head/share/mk/bsd.prog.mk Tue Nov 29 08:33:40 2011(r228123)
+++ head/share/mk/bsd.prog.mk Tue Nov 29 08:38:47 2011(r228124)
@@ -60,9 +60,9 @@ ${PROG}: ${OBJS}
.else
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
.endif
- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] |
Re: svn commit: r228114 - head/lib/libedit/edit/readline
David, On Tue, Nov 29, 2011 at 6:28 PM, David Chisnall wrote: > All this makes it possible to build and link gdb with -ledit. > > When I had a quick look a couple of days ago, kadmin and [k]gdb were the > only things that linked against readline in base. With them now linking > against libedit, can we remove readline from base? Yes, I am working on it. Stay tuned. Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228137 - in head: share/mk sys/conf
Author: fjoe
Date: Tue Nov 29 16:34:44 2011
New Revision: 228137
URL: http://svn.freebsd.org/changeset/base/228137
Log:
- fix WITH_CTF when specified in /etc/src.conf [1]
- CTFCONVERT_CMD=... is a hack (should be defined to empty string instead):
make(1) should be taught to ignore empty commands silently in compat mode
(as it does in !compat mode, GNU make also silently ignores empty commands)
and to skip printing empty commands in !compat mode
- config(8) should generate ${NORMAL_CTFCONVERT} invocation without '@':
this will allow to simplify kern.pre.mk even more and lessen the number
of shell invocations during kernel build when CTF is turned off
- WITH_CTF can now be converted to usual MK_CTF=yes/no infrastructure
Pointy hat to:fjoe [1]
Modified:
head/share/mk/bsd.lib.mk
head/share/mk/bsd.own.mk
head/share/mk/bsd.prog.mk
head/share/mk/sys.mk
head/sys/conf/kern.mk
head/sys/conf/kern.post.mk
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Nov 29 15:24:19 2011(r228136)
+++ head/share/mk/bsd.lib.mkTue Nov 29 16:34:44 2011(r228137)
@@ -33,15 +33,10 @@ CFLAGS+= -DNDEBUG
NO_WERROR=
.endif
-# Enable CTF conversion on request.
-.if defined(WITH_CTF)
-.undef NO_CTF
-.endif
-
.if defined(DEBUG_FLAGS)
CFLAGS+= ${DEBUG_FLAGS}
-.if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "")
+.if defined(WITH_CTF) && (${DEBUG_FLAGS:M-g} != "")
CTFFLAGS+= -g
.endif
.endif
@@ -69,21 +64,15 @@ PO_FLAG=-pg
.c.o:
${CC} ${STATIC_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
- @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+ ${CTFCONVERT_CMD}
.c.po:
${CC} ${PO_FLAG} ${STATIC_CFLAGS} ${PO_CFLAGS} -c ${.IMPSRC} -o
${.TARGET}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.c.So:
${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o
${.TARGET}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.cc.o:
${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@@ -96,47 +85,33 @@ PO_FLAG=-pg
.f.po:
${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.f.So:
${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.s.po .s.So:
${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.asm.po:
${CC} -x assembler-with-cpp -DPROF ${PO_CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.asm.So:
${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.S.po:
${CC} -DPROF ${PO_CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
.S.So:
${CC} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-.if !defined(NO_CTF)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${CTFCONVERT_CMD}
all: objwarn
@@ -211,7 +186,7 @@ ${SHLIB_NAME}: ${SOBJS}
-o ${.TARGET} -Wl,-soname,${SONAME} \
`NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
.endif
-.if !defined(NO_CTF)
+.if defined(WITH_CTF)
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
.endif
.endif
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkTue Nov 29 15:24:19 2011(r228136)
+++ head/share/mk/bsd.own.mkTue Nov 29 16:34:44 2011(r228137)
@@ -189,6 +189,12 @@ STRIP?=-s
COMPRESS_CMD?= gzip -cn
COMPRESS_EXT?= .gz
+.if defined(WITH_CTF)
+CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.else
+CTFCONVERT_CMD=...
+.endif
+
.if !defined(_WITHOUT_SRCCONF)
#
# Define MK_* variables (which are either "yes" or "no") for users
Modified: head/share/mk/bsd.prog.mk
==
--- head/share/mk/bsd.prog.mk Tue Nov 29 15:24:19 2011(r228136)
+++ head/share/mk/bsd.prog.mk Tue Nov 29 16:34:44 2011(r228137)
@@ -15,16 +15,11 @@ CFLAGS+= -DNDEBUG
NO_WERROR=
.endif
-# Enable CTF conversion on
Re: svn commit: r228124 - in head: share/mk sys/conf
Alexander, On Tue, Nov 29, 2011 at 9:00 PM, Alexander Kabaev wrote: > Author: fjoe > > Date: Tue Nov 29 08:38:47 2011 > > New Revision: 228124 > > URL: http://svn.freebsd.org/changeset/base/228124 > > > > Log: > > Conditionalize ctfconvert/ctfmerge runs on make level (.if/.endif) > > instead of executing a shell on every object or executable/library > > file. > > This shaves off more than 30,000 shell invocations during > > buildworld. > > Have you looked as to _why_ it was done through shell invocation in the > first place before removing it? You now have broken CTF support in > cases where WITH_CTF is set not on make command line or in environment, > but say in each individual Makefile. I tested all the use-cases mentioned in the original commit but it looks like I specified the location of modified share/mk incorrectly when I did WITH_CTF userland tests. Should be fixed now. Sorry for the breakage. Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228140 - head/sys/conf
Author: fjoe
Date: Tue Nov 29 18:52:02 2011
New Revision: 228140
URL: http://svn.freebsd.org/changeset/base/228140
Log:
Do not echo ${CTFCONVERT} command: config(8) will be fixed to not
emit '@' for ${NORMAL_CTFCONVERT} invocation.
Modified:
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Tue Nov 29 18:23:08 2011(r228139)
+++ head/sys/conf/kern.pre.mk Tue Nov 29 18:52:02 2011(r228140)
@@ -124,8 +124,7 @@ NORMAL_M= ${AWK} -f $S/tools/makeobjops.
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
.if defined(WITH_CTF)
-CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-NORMAL_CTFCONVERT= ${ECHO} ${CTFCONVERT_CMD} && ${CTFCONVERT_CMD}
+NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.else
NORMAL_CTFCONVERT= :
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228141 - head/sys/conf
Author: fjoe
Date: Tue Nov 29 19:13:01 2011
New Revision: 228141
URL: http://svn.freebsd.org/changeset/base/228141
Log:
Call CTFMERGE only when WITH_CTF is defined.
Modified:
head/sys/conf/kmod.mk
Modified: head/sys/conf/kmod.mk
==
--- head/sys/conf/kmod.mk Tue Nov 29 18:52:02 2011(r228140)
+++ head/sys/conf/kmod.mk Tue Nov 29 19:13:01 2011(r228141)
@@ -201,7 +201,7 @@ ${KMOD}.kld: ${OBJS}
${FULLPROG}: ${OBJS}
.endif
${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
-.if !defined(NO_CTF)
+.if defined(WITH_CTF)
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
.endif
.if defined(EXPORT_SYMS)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228143 - in head: . share/mk tools/build/options
Author: fjoe
Date: Tue Nov 29 19:46:17 2011
New Revision: 228143
URL: http://svn.freebsd.org/changeset/base/228143
Log:
Turn off profiled libs build by default.
Can be enabled back using WITH_PROFILE=yes in /etc/src.conf
Added:
head/tools/build/options/WITH_PROFILE
- copied, changed from r227900, head/tools/build/options/WITHOUT_PROFILE
Deleted:
head/tools/build/options/WITHOUT_PROFILE
Modified:
head/Makefile.inc1
head/share/mk/bsd.own.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Nov 29 19:45:58 2011(r228142)
+++ head/Makefile.inc1 Tue Nov 29 19:46:17 2011(r228143)
@@ -239,7 +239,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
- -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
+ -DNO_PIC -DNO_PROFILE -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
# build-tools stage
@@ -438,7 +438,7 @@ _libraries:
@echo "--"
${_+_}cd ${.CURDIR}; \
${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DWITHOUT_PROFILE libraries
+ -DWITHOUT_MAN -DNO_PROFILE libraries
_depend:
@echo
@echo "--"
@@ -1321,8 +1321,8 @@ ${_lib}__PL: .PHONY
cd ${.CURDIR}/${_lib}; \
${MAKE} DIRPRFX=${_lib}/ obj; \
${MAKE} DIRPRFX=${_lib}/ depend; \
- ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
- ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+ ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
+ ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1555,7 +1555,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
.endif
NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
+ -DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
CPUTYPE=${XDEV_CPUTYPE}
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkTue Nov 29 19:45:58 2011(r228142)
+++ head/share/mk/bsd.own.mkTue Nov 29 19:46:17 2011(r228143)
@@ -388,7 +388,6 @@ __DEFAULT_YES_OPTIONS = \
PMC \
PORTSNAP \
PPP \
-PROFILE \
QUOTAS \
RCMDS \
RCS \
@@ -423,7 +422,8 @@ __DEFAULT_NO_OPTIONS = \
ICONV \
IDEA \
LIBCPLUSPLUS \
-OFED
+OFED \
+PROFILE
#
# Default behaviour of some options depends on the architecture. Unfortunately
Copied and modified: head/tools/build/options/WITH_PROFILE (from r227900,
head/tools/build/options/WITHOUT_PROFILE)
==
--- head/tools/build/options/WITHOUT_PROFILEWed Nov 23 18:15:49 2011
(r227900, copy source)
+++ head/tools/build/options/WITH_PROFILE Tue Nov 29 19:46:17 2011
(r228143)
@@ -1,2 +1,2 @@
.\" $FreeBSD$
-Set to avoid compiling profiled libraries.
+Set to build profiled libraries.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228147 - head/share/mk
Author: fjoe
Date: Tue Nov 29 20:06:27 2011
New Revision: 228147
URL: http://svn.freebsd.org/changeset/base/228147
Log:
CTFCONVERT_CMD=... hack does not work sufficiently well in parallel builds.
Put a bandaid until make(1) is taught to ignore empty commands.
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkTue Nov 29 19:49:11 2011(r228146)
+++ head/share/mk/bsd.own.mkTue Nov 29 20:06:27 2011(r228147)
@@ -192,7 +192,7 @@ COMPRESS_EXT?= .gz
.if defined(WITH_CTF)
CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.else
-CTFCONVERT_CMD=...
+CTFCONVERT_CMD=@:
.endif
.if !defined(_WITHOUT_SRCCONF)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228149 - in head/tools/regression/usr.bin/make/execution: . ellipsis empty plus
Author: fjoe
Date: Wed Nov 30 05:49:17 2011
New Revision: 228149
URL: http://svn.freebsd.org/changeset/base/228149
Log:
Add three execution tests for make(1):
- plus: execute "+command" when run with -jX -n
- ellipsis: ellipsis ("...") from variable
- empty: empty command (from variable)
Currently make(1) fails all three tests:
- plus: segmentation fault due to incorrect command list handling
- ellipsis: works in compat mode but fails in job (-jX) mode
- empty:
- compat mode: prints error message
- job mode: works but prints empty string
Added:
head/tools/regression/usr.bin/make/execution/
head/tools/regression/usr.bin/make/execution/ellipsis/
head/tools/regression/usr.bin/make/execution/ellipsis/Makefile (contents,
props changed)
head/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/ellipsis/test.t (contents,
props changed)
head/tools/regression/usr.bin/make/execution/empty/
head/tools/regression/usr.bin/make/execution/empty/Makefile (contents,
props changed)
head/tools/regression/usr.bin/make/execution/empty/expected.status.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/empty/expected.stderr.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/empty/expected.stdout.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/empty/test.t (contents, props
changed)
head/tools/regression/usr.bin/make/execution/plus/
head/tools/regression/usr.bin/make/execution/plus/Makefile (contents, props
changed)
head/tools/regression/usr.bin/make/execution/plus/expected.status.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/plus/expected.stderr.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/plus/expected.stdout.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/plus/test.t (contents, props
changed)
Added: head/tools/regression/usr.bin/make/execution/ellipsis/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/ellipsis/Makefile Wed Nov
30 05:49:17 2011(r228149)
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+ELLIPSIS= ...
+
+check-ellipsis:
+ @${MAKE} -f ${MAKEFILE} do-$@
+ @${MAKE} -f ${MAKEFILE} -j2 do-$@
+ @${MAKE} -f ${MAKEFILE} -j2 -B do-$@
+
+do-check-ellipsis: do-check-ellipsis-1 do-check-ellipsis-2
+.ORDER: do-check-ellipsis-1 do-check-ellipsis-2
+
+do-check-ellipsis-1:
+ @echo before $@
+ ${ELLIPSIS}
+ @echo after $@
+
+do-check-ellipsis-2:
+ @echo before $@
+ ${ELLIPSIS}
+ @echo after $@
Added: head/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1
Wed Nov 30 05:49:17 2011(r228149)
@@ -0,0 +1 @@
+0
Added: head/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1
==
Added: head/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1
Wed Nov 30 05:49:17 2011(r228149)
@@ -0,0 +1,12 @@
+before do-check-ellipsis-1
+before do-check-ellipsis-2
+after do-check-ellipsis-1
+after do-check-ellipsis-2
+before do-check-ellipsis-1
+before do-check-ellipsis-2
+after do-check-ellipsis-1
+after do-check-ellipsis-2
+before do-check-ellipsis-1
+before do-check-ellipsis-2
+after do-check-ellipsis-1
+after do-check-ellipsis-2
Added: head/tools/regression/usr.bin/make/execution/ellipsis/test.t
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/ellipsis/test.tWed Nov
30 05:49:17 2011(r228149)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+cd `dirname $0`
+. ../../common.sh
+
+# Description
+DESC="Ellipsis command from variable"
+
+# Run
+TEST_N=1
+TEST_1=
+
+eval_cmd $*
Added: head/tools/regression/usr.bin/make/execution/empty/Makefile
==
--- /dev/null 00:00:00 1970 (empty,
svn commit: r228153 - head/usr.sbin/config
Author: fjoe
Date: Wed Nov 30 13:33:09 2011
New Revision: 228153
URL: http://svn.freebsd.org/changeset/base/228153
Log:
Generate ${NORMAL_CTFCONVERT} invocation without '@' modifier:
- ${NORMAL_CC} is also invoked without '@'
- Userland CTF support was changed previously to echo ctfconvert invocations
too
Modified:
head/usr.sbin/config/mkmakefile.c
Modified: head/usr.sbin/config/mkmakefile.c
==
--- head/usr.sbin/config/mkmakefile.c Wed Nov 30 12:47:36 2011
(r228152)
+++ head/usr.sbin/config/mkmakefile.c Wed Nov 30 13:33:09 2011
(r228153)
@@ -774,7 +774,7 @@ do_rules(FILE *f)
fprintf(f, "\t%s\n", compilewith);
if (!(ftp->f_flags & NO_OBJ))
- fprintf(f, "\t@${NORMAL_CTFCONVERT}\n\n");
+ fprintf(f, "\t${NORMAL_CTFCONVERT}\n\n");
else
fprintf(f, "\n");
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r228143 - in head: . share/mk tools/build/options
John, On Wed, Nov 30, 2011 at 3:36 AM, John Baldwin wrote: > Author: fjoe > > Date: Tue Nov 29 19:46:17 2011 > > New Revision: 228143 > > URL: http://svn.freebsd.org/changeset/base/228143 > > > > Log: > > Turn off profiled libs build by default. > > Can be enabled back using WITH_PROFILE=yes in /etc/src.conf > > Hmm, was discussed anywhere? (I haven't seen it if so, but am a bit > behind on > a few lists from last week still.) It was discussed in -current. Probably should have been discussed somewhere else. > Also, it seems you are hacking on several > build-related things currently, is there a larger project you are working > on > to reduce build world times or some such? > Yes, I want to reduce build world times. Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228157 - head/usr.bin/make
Author: fjoe
Date: Wed Nov 30 18:07:38 2011
New Revision: 228157
URL: http://svn.freebsd.org/changeset/base/228157
Log:
- Fix segmentation fault when running "+command" when run with -jX -n due
to Compat_RunCommand() being called with `cmd' that is not on the
node->commands
list
- Make ellipsis ("..." command) handling consistent: check for "..." command
in job make after variables expansion to match compat make behavior
- Fix empty command handling (after variables expansion and @+- modifiers
are processed): now empty commands are ignored in compat make and are not
printed in job make case
- Bump MAKE_VERSION to 5-2011-11-30-0
Modified:
head/usr.bin/make/Makefile
head/usr.bin/make/job.c
Modified: head/usr.bin/make/Makefile
==
--- head/usr.bin/make/Makefile Wed Nov 30 17:39:00 2011(r228156)
+++ head/usr.bin/make/Makefile Wed Nov 30 18:07:38 2011(r228157)
@@ -10,7 +10,9 @@ SRCS= arch.c buf.c cond.c dir.c for.c ha
NO_SHARED?=YES
-CFLAGS+=-DMAKE_VERSION=\"5200408120\"
+# Version has the RMMDDX format, where R is from RELENG_
+CFLAGS+=-DMAKE_VERSION=\"520300\"
+
# There is no obvious performance improvement currently.
# CFLAGS+=-DUSE_KQUEUE
Modified: head/usr.bin/make/job.c
==
--- head/usr.bin/make/job.c Wed Nov 30 17:39:00 2011(r228156)
+++ head/usr.bin/make/job.c Wed Nov 30 18:07:38 2011(r228157)
@@ -381,7 +381,7 @@ static int JobStart(GNode *, int, Job *)
static void JobDoOutput(Job *, Boolean);
static void JobInterrupt(int, int);
static void JobRestartJobs(void);
-static int Compat_RunCommand(char *, struct GNode *);
+static int Compat_RunCommand(LstNode *, struct GNode *);
static GNode *curTarg = NULL;
static GNode *ENDNode;
@@ -647,7 +647,7 @@ JobPassSig(int signo)
* numCommands is incremented if the command is actually printed.
*/
static int
-JobPrintCommand(char *cmd, Job *job)
+JobPrintCommand(LstNode *cmdNode, Job *job)
{
Boolean noSpecials; /* true if we shouldn't worry about
* inserting special commands into
@@ -658,40 +658,30 @@ JobPrintCommand(char *cmd, Job *job)
* off before printing the command
* and need to turn it back on */
const char *cmdTemplate;/* Template to use when printing the command */
- char*cmdStart; /* Start of expanded command */
- LstNode *cmdNode; /* Node for replacing the command */
+ char*cmd; /* Expanded command */
noSpecials = (noExecute && !(job->node->type & OP_MAKE));
- if (strcmp(cmd, "...") == 0) {
- job->node->type |= OP_SAVE_CMDS;
- if ((job->flags & JOB_IGNDOTS) == 0) {
- job->tailCmds =
- Lst_Succ(Lst_Member(&job->node->commands, cmd));
- return (1);
- }
- return (0);
- }
-
#defineDBPRINTF(fmt, arg) \
DEBUGF(JOB, (fmt, arg));\
fprintf(job->cmdFILE, fmt, arg);\
fflush(job->cmdFILE);
- numCommands += 1;
-
/*
* For debugging, we replace each command with the result of expanding
* the variables in the command.
*/
- cmdNode = Lst_Member(&job->node->commands, cmd);
-
- cmd = Buf_Peel(Var_Subst(cmd, job->node, FALSE));
- cmdStart = cmd;
-
- Lst_Replace(cmdNode, cmdStart);
-
- cmdTemplate = "%s\n";
+ cmd = Buf_Peel(Var_Subst(Lst_Datum(cmdNode), job->node, FALSE));
+ if (strcmp(cmd, "...") == 0) {
+ free(cmd);
+ job->node->type |= OP_SAVE_CMDS;
+ if ((job->flags & JOB_IGNDOTS) == 0) {
+ job->tailCmds = Lst_Succ(cmdNode);
+ return (1);
+ }
+ return (0);
+ }
+ Lst_Replace(cmdNode, cmd);
/*
* Check for leading @', -' or +'s to control echoing, error checking,
@@ -715,7 +705,7 @@ JobPrintCommand(char *cmd, Job *job)
* but this one needs to be - use compat mode
* just for it.
*/
- Compat_RunCommand(cmd, job->node);
+ Compat_RunCommand(cmdNode, job->node);
return (0);
}
break;
@@ -726,6 +716,16 @@ JobPrintCommand(char *cmd, Job *job)
while (isspace((unsigned char)*cmd))
cmd++;
+ /*
+* Ignore empty commands
+*/
+ if (*cmd == '\0') {
+ return (0);
+ }
+
+ cmdTemplate = "%s\n";
+ numC
svn commit: r228158 - in head: . share/mk sys/conf
Author: fjoe
Date: Wed Nov 30 18:11:49 2011
New Revision: 228158
URL: http://svn.freebsd.org/changeset/base/228158
Log:
- CTF knob is now implemented using common scheme: MK_CTF=yes/no is
defined based on WITH/WITHOUT_CTF settings, default is WITHOUT_CTF,
NO_CTF overrides WITH_CTF (used by Makefile.inc1)
- CTFCONVERT_CMD/NORMAL_CTFCONVERT are now defined to empty string
if make(1) can handle empty commands
Modified:
head/Makefile.inc1
head/share/mk/bsd.lib.mk
head/share/mk/bsd.own.mk
head/share/mk/bsd.prog.mk
head/sys/conf/kern.post.mk
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Wed Nov 30 18:07:38 2011(r228157)
+++ head/Makefile.inc1 Wed Nov 30 18:11:49 2011(r228158)
@@ -59,8 +59,6 @@ SUBDIR+=games
.endif
.if ${MK_CDDL} != "no"
SUBDIR+=cddl
-.else
-NO_CTF=1
.endif
SUBDIR+=gnu include
.if ${MK_KERBEROS} != "no"
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkWed Nov 30 18:07:38 2011(r228157)
+++ head/share/mk/bsd.lib.mkWed Nov 30 18:11:49 2011(r228158)
@@ -36,7 +36,7 @@ NO_WERROR=
.if defined(DEBUG_FLAGS)
CFLAGS+= ${DEBUG_FLAGS}
-.if defined(WITH_CTF) && (${DEBUG_FLAGS:M-g} != "")
+.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
CTFFLAGS+= -g
.endif
.endif
@@ -186,7 +186,7 @@ ${SHLIB_NAME}: ${SOBJS}
-o ${.TARGET} -Wl,-soname,${SONAME} \
`NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
.endif
-.if defined(WITH_CTF)
+.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
.endif
.endif
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkWed Nov 30 18:07:38 2011(r228157)
+++ head/share/mk/bsd.own.mkWed Nov 30 18:11:49 2011(r228158)
@@ -189,12 +189,6 @@ STRIP?=-s
COMPRESS_CMD?= gzip -cn
COMPRESS_EXT?= .gz
-.if defined(WITH_CTF)
-CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.else
-CTFCONVERT_CMD=@:
-.endif
-
.if !defined(_WITHOUT_SRCCONF)
#
# Define MK_* variables (which are either "yes" or "no") for users
@@ -209,6 +203,7 @@ CTFCONVERT_CMD= @:
# regardless of user's setting).
#
.for var in \
+CTF \
INSTALLLIB \
MAN \
PROFILE
@@ -418,6 +413,7 @@ __DEFAULT_NO_OPTIONS = \
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
+CTF \
HESIOD \
ICONV \
IDEA \
@@ -516,6 +512,7 @@ MK_BIND_ETC:= no
.if ${MK_CDDL} == "no"
MK_ZFS:= no
+MK_CTF:= no
.endif
.if ${MK_CRYPT} == "no"
@@ -616,6 +613,14 @@ MK_${vv:H}:= ${MK_${vv:T}}
.endif
.endfor
+.if ${MK_CTF} != "no"
+CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.elif ${MAKE_VERSION} >= 520300
+CTFCONVERT_CMD=
+.else
+CTFCONVERT_CMD=@:
+.endif
+
.endif # !_WITHOUT_SRCCONF
.endif # !target()
Modified: head/share/mk/bsd.prog.mk
==
--- head/share/mk/bsd.prog.mk Wed Nov 30 18:07:38 2011(r228157)
+++ head/share/mk/bsd.prog.mk Wed Nov 30 18:11:49 2011(r228158)
@@ -19,7 +19,7 @@ NO_WERROR=
CFLAGS+=${DEBUG_FLAGS}
CXXFLAGS+=${DEBUG_FLAGS}
-.if defined(WITH_CTF) && (${DEBUG_FLAGS:M-g} != "")
+.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
CTFFLAGS+= -g
.endif
.endif
@@ -55,7 +55,7 @@ ${PROG}: ${OBJS}
.else
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
.endif
-.if defined(WITH_CTF)
+.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
.endif
@@ -85,7 +85,7 @@ ${PROG}: ${OBJS}
.else
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
.endif
-.if defined(WITH_CTF)
+.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
.endif
.endif
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Wed Nov 30 18:07:38 2011(r228157)
+++ head/sys/conf/kern.post.mk Wed Nov 30 18:11:49 2011(r228158)
@@ -94,7 +94,7 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@echo linking ${.TARGET}
${SYSTEM_LD}
-.if defined(WITH_CTF)
+.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
.endif
.if !defined(DEBUG)
@@ -249,7 +249,7 @@ kernel-reinstall:
config.o env.o hints.o vers.o vnode_if.o:
${NORMAL_C}
- @${NORMAL_CTFCONVERT}
+ ${NORMAL_CTFCONVERT}
config.ln env.ln hints.ln vers.ln vnode_if.ln:
${NORMAL_LINT}
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Wed Nov 30 18:07:38 2011(r
svn commit: r228159 - head/tools/build/options
Author: fjoe Date: Wed Nov 30 18:22:44 2011 New Revision: 228159 URL: http://svn.freebsd.org/changeset/base/228159 Log: Add WITH_CTF description. Added: head/tools/build/options/WITH_CTF (contents, props changed) Added: head/tools/build/options/WITH_CTF == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_CTF Wed Nov 30 18:22:44 2011 (r228159) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to compile with CTF (Compact C Type Format) data. +CTF data encapsulates a reduced form of debugging information +similar to DWARF and the venerable stabs and is required for DTrace. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228160 - head/share/man/man5
Author: fjoe Date: Wed Nov 30 18:24:43 2011 New Revision: 228160 URL: http://svn.freebsd.org/changeset/base/228160 Log: Regen. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Wed Nov 30 18:22:44 2011 (r228159) +++ head/share/man/man5/src.conf.5 Wed Nov 30 18:24:43 2011 (r228160) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd November 28, 2011 +.Dd December 1, 2011 .Dt SRC.CONF 5 .Os .Sh NAME @@ -258,6 +258,8 @@ When set, it also enforces the following .Pp .Bl -item -compact .It +.Va WITHOUT_CTF +.It .Va WITHOUT_ZFS .El .It Va WITHOUT_CLANG @@ -300,6 +302,11 @@ When set, the following options are also .Va WITH_GSSAPI is set explicitly) .El +.It Va WITH_CTF +.\" $FreeBSD$ +Set to compile with CTF (Compact C Type Format) data. +CTF data encapsulates a reduced form of debugging information +similar to DWARF and the venerable stabs and is required for DTrace. .It Va WITHOUT_CTM .\" from FreeBSD: head/tools/build/options/WITHOUT_CTM 183242 2008-09-21 22:02:26Z sam Set to not build @@ -813,9 +820,9 @@ and related files. Set to not build .Xr ppp 8 and related programs. -.It Va WITHOUT_PROFILE -.\" from FreeBSD: head/tools/build/options/WITHOUT_PROFILE 156932 2006-03-21 07:50:50Z ru -Set to avoid compiling profiled libraries. +.It Va WITH_PROFILE +.\" from FreeBSD: head/tools/build/options/WITH_PROFILE 228143 2011-11-29 19:46:17Z fjoe +Set to build profiled libraries. .It Va WITHOUT_QUOTAS .\" from FreeBSD: head/tools/build/options/WITHOUT_QUOTAS 183242 2008-09-21 22:02:26Z sam Set to not build ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r228157 - head/usr.bin/make
Alexander,
On Thu, Dec 1, 2011 at 7:16 AM, Alexander Best wrote:
> Author: fjoe
> > Date: Wed Nov 30 18:07:38 2011
> > New Revision: 228157
> > URL: http://svn.freebsd.org/changeset/base/228157
> >
> > Log:
> > - Fix segmentation fault when running "+command" when run with -jX -n
> due
> > to Compat_RunCommand() being called with `cmd' that is not on the
> node->commands
> > list
> > - Make ellipsis ("..." command) handling consistent: check for "..."
> command
> > in job make after variables expansion to match compat make behavior
> > - Fix empty command handling (after variables expansion and @+-
> modifiers
> > are processed): now empty commands are ignored in compat make and are
> not
> > printed in job make case
> > - Bump MAKE_VERSION to 5-2011-11-30-0
>
> it would also be nice, if at some point, somebody could dive into the code
> to
> see why 'make buildkernel' will let clang produce coloured output, but
> 'make -j(N>1) buildkernel' doesn't (and why adding a -B switch to that
> command
> fixes it).
>
This one is simple: job make (-jX) runs commands with stdin/stdout/stderr
redirected to pipes.
-B turns on compat mode for job make.
This can be demonstrated by running make with -jX or -jX -B with the
following Makefile:
--- cut here ---
all:
@if [ -t 1 ]; then echo "stdout is a tty"; else echo "stdout is not
a tty"; fi
--- cut here ---
If you really want to see colored output in -jX case you should teach clang
to output ANSI color sequences not only in isatty(1) case, but also
when MAKE_JOBS_FIFO environment variable is present (it is set when make
runs in job mode).
Max
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r228157 - head/usr.bin/make
Alexander,
On Thu, Dec 1, 2011 at 11:05 AM, Max Khon wrote:
it would also be nice, if at some point, somebody could dive into the code
>> to
>> see why 'make buildkernel' will let clang produce coloured output, but
>> 'make -j(N>1) buildkernel' doesn't (and why adding a -B switch to that
>> command
>> fixes it).
>>
>
> This one is simple: job make (-jX) runs commands with stdin/stdout/stderr
> redirected to pipes.
> -B turns on compat mode for job make.
>
> This can be demonstrated by running make with -jX or -jX -B with the
> following Makefile:
> --- cut here ---
> all:
> @if [ -t 1 ]; then echo "stdout is a tty"; else echo "stdout is
> not a tty"; fi
> --- cut here ---
>
> If you really want to see colored output in -jX case you should teach
> clang to output ANSI color sequences not only in isatty(1) case, but also
> when MAKE_JOBS_FIFO environment variable is present (it is set when make
> runs in job mode).
>
This will not work for the cases when make(1) is itself redirected.
Something like attached patch should work, but it blocks sometimes in
"ttyout" state for some reason (needs more work).
Max
Index: usr.bin/make/Makefile
===
--- usr.bin/make/Makefile (revision 228157)
+++ usr.bin/make/Makefile (working copy)
@@ -7,6 +7,8 @@
SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
util.c var.c
+DPADD= ${LIBUTIL}
+LDADD= -lutil
NO_SHARED?= YES
Index: usr.bin/make/job.c
===
--- usr.bin/make/job.c (revision 228157)
+++ usr.bin/make/job.c (working copy)
@@ -115,6 +115,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1798,8 +1799,13 @@
if (usePipes) {
int fd[2];
- if (pipe(fd) == -1)
-Punt("Cannot create pipe: %s", strerror(errno));
+ if (isatty(1)) {
+if (openpty(fd, fd + 1, NULL, NULL, NULL) == -1)
+ Punt("Cannot open pty: %s", strerror(errno));
+ } else {
+if (pipe(fd) == -1)
+ Punt("Cannot create pipe: %s", strerror(errno));
+ }
job->inPipe = fd[0];
job->outPipe = fd[1];
fcntl(job->inPipe, F_SETFD, 1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r228157 - head/usr.bin/make
Alexander,
On Thu, Dec 1, 2011 at 12:03 PM, Max Khon wrote:
it would also be nice, if at some point, somebody could dive into the code
>>> to
>>> see why 'make buildkernel' will let clang produce coloured output, but
>>> 'make -j(N>1) buildkernel' doesn't (and why adding a -B switch to that
>>> command
>>> fixes it).
>>>
>>
>> This one is simple: job make (-jX) runs commands with stdin/stdout/stderr
>> redirected to pipes.
>> -B turns on compat mode for job make.
>>
>> This can be demonstrated by running make with -jX or -jX -B with the
>> following Makefile:
>> --- cut here ---
>> all:
>> @if [ -t 1 ]; then echo "stdout is a tty"; else echo "stdout is
>> not a tty"; fi
>> --- cut here ---
>>
>> If you really want to see colored output in -jX case you should teach
>> clang to output ANSI color sequences not only in isatty(1) case, but also
>> when MAKE_JOBS_FIFO environment variable is present (it is set when make
>> runs in job mode).
>>
>
> This will not work for the cases when make(1) is itself redirected.
> Something like attached patch should work, but it blocks sometimes in
> "ttyout" state for some reason (needs more work).
>
It hangs when tty_drain() is called when make(1) closes slave pty. Looks
like a race condition there when tty_wait() is called from tty_drain().
If I exchange pty master and slave hangs disappear. So attached patch works
for me.
It may add performance penalty but I think that the impact will be
negligible.
Max
Index: usr.bin/make/Makefile
===
--- usr.bin/make/Makefile (revision 228157)
+++ usr.bin/make/Makefile (working copy)
@@ -7,6 +7,8 @@
SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
util.c var.c
+DPADD= ${LIBUTIL}
+LDADD= -lutil
NO_SHARED?= YES
Index: usr.bin/make/job.c
===
--- usr.bin/make/job.c (revision 228157)
+++ usr.bin/make/job.c (working copy)
@@ -115,6 +115,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1798,8 +1799,13 @@
if (usePipes) {
int fd[2];
- if (pipe(fd) == -1)
-Punt("Cannot create pipe: %s", strerror(errno));
+ if (isatty(1)) {
+if (openpty(fd + 1, fd + 0, NULL, NULL, NULL) == -1)
+ Punt("Cannot open pty: %s", strerror(errno));
+ } else {
+if (pipe(fd) == -1)
+ Punt("Cannot create pipe: %s", strerror(errno));
+ }
job->inPipe = fd[0];
job->outPipe = fd[1];
fcntl(job->inPipe, F_SETFD, 1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228175 - head/usr.sbin/sade
Author: fjoe
Date: Thu Dec 1 09:01:51 2011
New Revision: 228175
URL: http://svn.freebsd.org/changeset/base/228175
Log:
Fix dialog autosizing: dlg_count_columns() does not handle NL characters.
Modified:
head/usr.sbin/sade/misc.c
Modified: head/usr.sbin/sade/misc.c
==
--- head/usr.sbin/sade/misc.c Thu Dec 1 07:41:30 2011(r228174)
+++ head/usr.sbin/sade/misc.c Thu Dec 1 09:01:51 2011(r228175)
@@ -233,6 +233,23 @@ xdialog_count_rows(const char *p)
return rows ? rows : 1;
}
+static int
+xdialog_count_columns(const char *p)
+{
+ int len;
+ int max_len = 0;
+ const char *q;
+
+ for (; (q = strchr(p, '\n')) != NULL; p = q + 1) {
+ len = q - p;
+ max_len = MAX(max_len, len);
+ }
+
+ len = strlen(p);
+ max_len = MAX(max_len, len);
+ return max_len;
+}
+
int
xdialog_menu(const char *title, const char *cprompt, int height, int width,
int menu_height, int item_no, dialogMenuItem *ditems)
@@ -270,7 +287,7 @@ xdialog_menu(const char *title, const ch
tag_x = MAX(tag_x, l + k + 2);
}
}
- width = MAX(dlg_count_columns(cprompt), title != NULL ?
dlg_count_columns(title) : 0);
+ width = MAX(xdialog_count_columns(cprompt), title != NULL ?
xdialog_count_columns(title) : 0);
width = MAX(width, tag_x + 4) + 4;
}
width = MAX(width, 24);
@@ -345,7 +362,7 @@ xdialog_radiolist(const char *title, con
check_x = MAX(check_x, l + k + 6);
}
}
- width = MAX(dlg_count_columns(cprompt), title != NULL ?
dlg_count_columns(title) : 0);
+ width = MAX(xdialog_count_columns(cprompt), title != NULL ?
xdialog_count_columns(title) : 0);
width = MAX(width, check_x + 4) + 4;
}
width = MAX(width, 24);
@@ -397,8 +414,8 @@ xdialog_msgbox(const char *title, const
/* calculate width */
if (width < 0) {
- width = title != NULL ? dlg_count_columns(title) : 0;
- width = MAX(width, dlg_count_columns(cprompt)) + 4;
+ width = title != NULL ? xdialog_count_columns(title) : 0;
+ width = MAX(width, xdialog_count_columns(cprompt)) + 4;
}
if (pauseopt)
width = MAX(width, 10);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228176 - head/usr.sbin/tzsetup
Author: fjoe
Date: Thu Dec 1 09:02:57 2011
New Revision: 228176
URL: http://svn.freebsd.org/changeset/base/228176
Log:
Sync xdialog_menu() implementation with sade.
Modified:
head/usr.sbin/tzsetup/tzsetup.c
Modified: head/usr.sbin/tzsetup/tzsetup.c
==
--- head/usr.sbin/tzsetup/tzsetup.c Thu Dec 1 09:01:51 2011
(r228175)
+++ head/usr.sbin/tzsetup/tzsetup.c Thu Dec 1 09:02:57 2011
(r228176)
@@ -73,6 +73,38 @@ typedef struct dialogMenuItem {
} dialogMenuItem;
static int
+xdialog_count_rows(const char *p)
+{
+ int rows = 0;
+
+ while ((p = strchr(p, '\n')) != NULL) {
+ p++;
+ if (*p == '\0')
+ break;
+ rows++;
+ }
+
+ return rows ? rows : 1;
+}
+
+static int
+xdialog_count_columns(const char *p)
+{
+ int len;
+ int max_len = 0;
+ const char *q;
+
+ for (; (q = strchr(p, '\n')) != NULL; p = q + 1) {
+ len = q - p;
+ max_len = MAX(max_len, len);
+ }
+
+ len = strlen(p);
+ max_len = MAX(max_len, len);
+ return max_len;
+}
+
+static int
xdialog_menu(const char *title, const char *cprompt, int height, int width,
int menu_height, int item_no, dialogMenuItem *ditems)
{
@@ -90,6 +122,12 @@ xdialog_menu(const char *title, const ch
listitems[i].text = ditems[i].title;
}
+ /* calculate height */
+ if (height < 0)
+ height = xdialog_count_rows(cprompt) + menu_height + 4 + 2;
+ if (height > LINES)
+ height = LINES;
+
/* calculate width */
if (width < 0) {
int tag_x = 0;
@@ -103,7 +141,7 @@ xdialog_menu(const char *title, const ch
tag_x = MAX(tag_x, l + k + 2);
}
}
- width = MAX(dlg_count_columns(cprompt), title != NULL ?
dlg_count_columns(title) : 0);
+ width = MAX(xdialog_count_columns(cprompt), title != NULL ?
xdialog_count_columns(title) : 0);
width = MAX(width, tag_x + 4) + 4;
}
width = MAX(width, 24);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228196 - in head: share/mk tools/build/options
Author: fjoe Date: Fri Dec 2 09:09:54 2011 New Revision: 228196 URL: http://svn.freebsd.org/changeset/base/228196 Log: Revert to conservative defaults. WITH_PROFILE is a default now. NO_PROFILE overrides in Makefile.inc1 and bsd.own.m are left intact so that the reversal to the WITHOUT_PROFILE will be easier in future. Added: head/tools/build/options/WITHOUT_PROFILE - copied, changed from r228148, head/tools/build/options/WITH_PROFILE Deleted: head/tools/build/options/WITH_PROFILE Modified: head/share/mk/bsd.own.mk Modified: head/share/mk/bsd.own.mk == --- head/share/mk/bsd.own.mkFri Dec 2 02:19:03 2011(r228195) +++ head/share/mk/bsd.own.mkFri Dec 2 09:09:54 2011(r228196) @@ -383,6 +383,7 @@ __DEFAULT_YES_OPTIONS = \ PMC \ PORTSNAP \ PPP \ +PROFILE \ QUOTAS \ RCMDS \ RCS \ @@ -418,8 +419,7 @@ __DEFAULT_NO_OPTIONS = \ ICONV \ IDEA \ LIBCPLUSPLUS \ -OFED \ -PROFILE +OFED # # Default behaviour of some options depends on the architecture. Unfortunately Copied and modified: head/tools/build/options/WITHOUT_PROFILE (from r228148, head/tools/build/options/WITH_PROFILE) == --- head/tools/build/options/WITH_PROFILE Tue Nov 29 21:28:48 2011 (r228148, copy source) +++ head/tools/build/options/WITHOUT_PROFILEFri Dec 2 09:09:54 2011 (r228196) @@ -1,2 +1,2 @@ .\" $FreeBSD$ -Set to build profiled libraries. +Set to avoid compiling profiled libraries. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228197 - head/share/man/man5
Author: fjoe Date: Fri Dec 2 09:28:19 2011 New Revision: 228197 URL: http://svn.freebsd.org/changeset/base/228197 Log: Regen. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Fri Dec 2 09:09:54 2011 (r228196) +++ head/share/man/man5/src.conf.5 Fri Dec 2 09:28:19 2011 (r228197) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd December 1, 2011 +.Dd December 2, 2011 .Dt SRC.CONF 5 .Os .Sh NAME @@ -303,7 +303,7 @@ When set, the following options are also is set explicitly) .El .It Va WITH_CTF -.\" $FreeBSD$ +.\" from FreeBSD: head/tools/build/options/WITH_CTF 228159 2011-11-30 18:22:44Z fjoe Set to compile with CTF (Compact C Type Format) data. CTF data encapsulates a reduced form of debugging information similar to DWARF and the venerable stabs and is required for DTrace. @@ -820,9 +820,9 @@ and related files. Set to not build .Xr ppp 8 and related programs. -.It Va WITH_PROFILE +.It Va WITHOUT_PROFILE .\" from FreeBSD: head/tools/build/options/WITH_PROFILE 228143 2011-11-29 19:46:17Z fjoe -Set to build profiled libraries. +Set to avoid compiling profiled libraries. .It Va WITHOUT_QUOTAS .\" from FreeBSD: head/tools/build/options/WITHOUT_QUOTAS 183242 2008-09-21 22:02:26Z sam Set to not build ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r228196 - in head: share/mk tools/build/options
Bruce, On Fri, Dec 2, 2011 at 9:41 PM, Bruce Evans wrote: >> Log: >> Â Revert to conservative defaults. WITH_PROFILE is a default now. >> >> Â NO_PROFILE overrides in Makefile.inc1 and bsd.own.m are left intact >> Â so that the reversal to the WITHOUT_PROFILE will be easier in future. > > > Thanks. Â Not building profiled libraries might have been best in 1993 > when makeworld took hours (4-10?). Â When I optimized makeworld in 1998, > it still took more than 1 hour but I removing profiling from it was > intentionally left out (except for bootstrapping). Â It would have saved > only a few minutes. Â Now, a whole makeworld should take a few minutes > and the few extra seconds for profiling libraries doesn't matter. The real goal was to have reasonable defaults. The definition of reasonable differs. The definition for some of us is: if I use it it should be the default. My definition is: the system needs minimum tweaks for the majority of users. Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r228153 - head/usr.sbin/config
David,
On Fri, Dec 2, 2011 at 4:40 PM, David O'Brien wrote:
>> Â Generate ${NORMAL_CTFCONVERT} invocation without '@' modifier:
>> Â - ${NORMAL_CC} is also invoked without '@'
>> Â - Userland CTF support was changed previously to echo ctfconvert
>> Â invocations too
>
> Thank you for your work on cleaning up the CTF part of the build.
> Enabling WITH_CTF has been too different (and conflicting) from our
> other knobs.
> I also had local patches to not hide ctfconvert so one could easily see
> when they didn't have WITH_CTF enabled in the right magical incantations.
You're welcome.
> Will you be MFC'ing the CTF build work? Â Please. :-)
Frankly, I do see reasons for the MFC (and I do not want to respond to
people who will be unhappy with this MFC because they do not see
reasons for the MFC too).
Max
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228311 - head/sys/conf
Author: fjoe
Date: Tue Dec 6 18:01:09 2011
New Revision: 228311
URL: http://svn.freebsd.org/changeset/base/228311
Log:
MK_CTF is not defined when kmod.mk is used with old bsd.own.mk.
Modified:
head/sys/conf/kmod.mk
Modified: head/sys/conf/kmod.mk
==
--- head/sys/conf/kmod.mk Tue Dec 6 17:54:59 2011(r228310)
+++ head/sys/conf/kmod.mk Tue Dec 6 18:01:09 2011(r228311)
@@ -201,7 +201,7 @@ ${KMOD}.kld: ${OBJS}
${FULLPROG}: ${OBJS}
.endif
${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
-.if ${MK_CTF} != "no"
+.if defined(MK_CTF) && ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
.endif
.if defined(EXPORT_SYMS)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r228158 - in head: . share/mk sys/conf
Gary, Hans,
On Tue, Dec 6, 2011 at 4:06 PM, Gary Jennejohn wrote:
> I see regressions when building kernel modules from /usr/ports:
> >
> > On Monday 05 December 2011 14:39:56 Robert Huff wrote:
> > > Hello:
> > > When trying to update I get:
> > >
> > > ===> Building for cuse4bsd-kmod-0.1.21_2
> > > make -f
> > >
> /data/port-work/usr/ports/multimedia/cuse4bsd-kmod/work/cuse4bsd-kmod-0.1.
> > > 21/Makefile.lib HAVE_DEBUG=YES all Warning: Object directory not
> changed
> > > from original
> > >
> /data/port-work/usr/ports/multimedia/cuse4bsd-kmod/work/cuse4bsd-kmod-0.1.
> > > 21 make -f
> > >
> /data/port-work/usr/ports/multimedia/cuse4bsd-kmod/work/cuse4bsd-kmod-0.1.
> > > 21/Makefile.kmod all "/sys/conf/kmod.mk", line 204: Malformed
> conditional
> > > (${MK_CTF} != "no") "/sys/conf/kmod.mk", line 206: if-less endif
> > > make: fatal errors encountered -- cannot continue
> > > *** Error code 1
> >
>
> I encountered this problem yesterday. My quick hack was to put
> .if defined(MK_CTF) .endif around the offending lines, similar to
> EXPORT_SYMS.
>
This should be fixed now (rev. 228311)
Max
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228521 - head/usr.bin/make
Author: fjoe
Date: Thu Dec 15 03:13:23 2011
New Revision: 228521
URL: http://svn.freebsd.org/changeset/base/228521
Log:
job make: if stdout is a tty create a pty when running a command.
Modified:
head/usr.bin/make/Makefile
head/usr.bin/make/job.c
Modified: head/usr.bin/make/Makefile
==
--- head/usr.bin/make/Makefile Thu Dec 15 02:26:53 2011(r228520)
+++ head/usr.bin/make/Makefile Thu Dec 15 03:13:23 2011(r228521)
@@ -7,6 +7,8 @@ CFLAGS+=-I${.CURDIR}
SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
util.c var.c
+DPADD= ${LIBUTIL}
+LDADD= -lutil
NO_SHARED?=YES
Modified: head/usr.bin/make/job.c
==
--- head/usr.bin/make/job.c Thu Dec 15 02:26:53 2011(r228520)
+++ head/usr.bin/make/job.c Thu Dec 15 03:13:23 2011(r228521)
@@ -115,6 +115,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -1798,8 +1799,13 @@ JobStart(GNode *gn, int flags, Job *prev
if (usePipes) {
int fd[2];
- if (pipe(fd) == -1)
- Punt("Cannot create pipe: %s", strerror(errno));
+ if (isatty(1)) {
+ if (openpty(fd + 1, fd + 0, NULL, NULL, NULL)
== -1)
+ Punt("Cannot open pty: %s",
strerror(errno));
+ } else {
+ if (pipe(fd) == -1)
+ Punt("Cannot create pipe: %s",
strerror(errno));
+ }
job->inPipe = fd[0];
job->outPipe = fd[1];
fcntl(job->inPipe, F_SETFD, 1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228523 - head/tools/regression/usr.bin/make/execution/joberr
Author: fjoe
Date: Thu Dec 15 06:01:06 2011
New Revision: 228523
URL: http://svn.freebsd.org/changeset/base/228523
Log:
Add job error output test.
make(1) with openpty() currently fails this test: there's a race condition
and error output is sometimes lost.
Added:
head/tools/regression/usr.bin/make/execution/joberr/
head/tools/regression/usr.bin/make/execution/joberr/Makefile (contents,
props changed)
head/tools/regression/usr.bin/make/execution/joberr/expected.status.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1
(contents, props changed)
head/tools/regression/usr.bin/make/execution/joberr/test.t (contents, props
changed)
Added: head/tools/regression/usr.bin/make/execution/joberr/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/joberr/MakefileThu Dec
15 06:01:06 2011(r228523)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+check-jobherr:
+.for _t in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9
+ @-${MAKE} -f ${MAKEFILE} -j2 do-$@
+.endfor
+
+do-check-joberr:
+ @echo "Error: build failed"
+ @exit 1
Added: head/tools/regression/usr.bin/make/execution/joberr/expected.status.1
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/joberr/expected.status.1
Thu Dec 15 06:01:06 2011(r228523)
@@ -0,0 +1 @@
+0
Added: head/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1
Thu Dec 15 06:01:06 2011(r228523)
@@ -0,0 +1,30 @@
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
+1 error
Added: head/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1
Thu Dec 15 06:01:06 2011(r228523)
@@ -0,0 +1,90 @@
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+Error: build failed
+*** Error code 1
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
+*** Error code 2 (ignored)
Added: head/tools/regression/usr.bin/make/execution/joberr/test.t
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools
svn commit: r228524 - head/tools/regression/usr.bin/make/execution/joberr
Author: fjoe
Date: Thu Dec 15 06:12:43 2011
New Revision: 228524
URL: http://svn.freebsd.org/changeset/base/228524
Log:
Fix last-minute typo.
Modified:
head/tools/regression/usr.bin/make/execution/joberr/Makefile
Modified: head/tools/regression/usr.bin/make/execution/joberr/Makefile
==
--- head/tools/regression/usr.bin/make/execution/joberr/MakefileThu Dec
15 06:01:06 2011(r228523)
+++ head/tools/regression/usr.bin/make/execution/joberr/MakefileThu Dec
15 06:12:43 2011(r228524)
@@ -1,6 +1,6 @@
# $FreeBSD$
-check-jobherr:
+check-joberr:
.for _t in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9
@-${MAKE} -f ${MAKEFILE} -j2 do-$@
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r228525 - head/usr.bin/make
Author: fjoe
Date: Thu Dec 15 06:25:19 2011
New Revision: 228525
URL: http://svn.freebsd.org/changeset/base/228525
Log:
Revert r228521: sometimes job output is lost
(see tools/regression/usr.bin/make/execution/joberr test).
openpty(fd + 0, fd + 1,...) version does not have this problem but
it sometimes enters an infinite sleep in "ttywait" state in tty_drain()
when make(1) closes slave pty.
Modified:
head/usr.bin/make/Makefile
head/usr.bin/make/job.c
Modified: head/usr.bin/make/Makefile
==
--- head/usr.bin/make/Makefile Thu Dec 15 06:12:43 2011(r228524)
+++ head/usr.bin/make/Makefile Thu Dec 15 06:25:19 2011(r228525)
@@ -7,8 +7,6 @@ CFLAGS+=-I${.CURDIR}
SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
util.c var.c
-DPADD= ${LIBUTIL}
-LDADD= -lutil
NO_SHARED?=YES
Modified: head/usr.bin/make/job.c
==
--- head/usr.bin/make/job.c Thu Dec 15 06:12:43 2011(r228524)
+++ head/usr.bin/make/job.c Thu Dec 15 06:25:19 2011(r228525)
@@ -115,7 +115,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
#include
#include
@@ -1799,13 +1798,8 @@ JobStart(GNode *gn, int flags, Job *prev
if (usePipes) {
int fd[2];
- if (isatty(1)) {
- if (openpty(fd + 1, fd + 0, NULL, NULL, NULL)
== -1)
- Punt("Cannot open pty: %s",
strerror(errno));
- } else {
- if (pipe(fd) == -1)
- Punt("Cannot create pipe: %s",
strerror(errno));
- }
+ if (pipe(fd) == -1)
+ Punt("Cannot create pipe: %s", strerror(errno));
job->inPipe = fd[0];
job->outPipe = fd[1];
fcntl(job->inPipe, F_SETFD, 1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r238933 - head/sys/dev/puc
Author: fjoe
Date: Tue Jul 31 05:23:23 2012
New Revision: 238933
URL: http://svn.freebsd.org/changeset/base/238933
Log:
- Change back "d_ofs" to int8_t to not pessimize padding and size of "struct
puc_cfg".
- Use "puc_config_moxa" for Moxa boards that need d_ofs greater than 0x7f
Prodded by: marcel@, gavin@
MFC after:3 days
Modified:
head/sys/dev/puc/puc_cfg.h
head/sys/dev/puc/pucdata.c
Modified: head/sys/dev/puc/puc_cfg.h
==
--- head/sys/dev/puc/puc_cfg.h Tue Jul 31 04:09:27 2012(r238932)
+++ head/sys/dev/puc/puc_cfg.h Tue Jul 31 05:23:23 2012(r238933)
@@ -79,7 +79,7 @@ struct puc_cfg {
int8_t ports;
int8_t rid;/* Rid of first port */
int8_t d_rid; /* Delta rid of next ports */
- int16_t d_ofs; /* Delta offset of next ports */
+ int8_t d_ofs; /* Delta offset of next ports */
puc_config_f*config_function;
};
Modified: head/sys/dev/puc/pucdata.c
==
--- head/sys/dev/puc/pucdata.c Tue Jul 31 04:09:27 2012(r238932)
+++ head/sys/dev/puc/pucdata.c Tue Jul 31 05:23:23 2012(r238933)
@@ -510,13 +510,15 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1024, 0x, 0,
"Moxa Technologies, Smartio CP-102E/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1025, 0x, 0,
"Moxa Technologies, Smartio CP-102EL/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200,
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1040, 0x, 0,
@@ -572,7 +574,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1182, 0x, 0,
"Moxa Technologies, Smartio CP-118EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1680, 0x, 0,
@@ -596,7 +599,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1683, 0x, 0,
"Moxa Technologies, Smartio CP-168EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x13a8, 0x0152, 0x, 0,
@@ -1159,7 +1163,12 @@ puc_config_moxa(struct puc_softc *sc, en
intptr_t *res)
{
if (cmd == PUC_CFG_GET_OFS) {
- *res = ((port == 3) ? 7 : port) * 0x200;
+ const struct puc_cfg *cfg = sc->sc_cfg;
+
+ if (port == 3 && (cfg->device == 0x1045 || cfg->device ==
0x1144))
+ port = 7;
+ *res = port * 0x200;
+
return 0;
}
return (ENXIO);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r238775 - stable/8/sys/dev/puc
John, On Mon, Jul 30, 2012 at 10:32 PM, John Baldwin wrote: > On Wednesday, July 25, 2012 1:42:57 pm Max Khon wrote: >> Author: fjoe >> Date: Wed Jul 25 17:42:57 2012 >> New Revision: 238775 >> URL: http://svn.freebsd.org/changeset/base/238775 >> >> Log: >> MFC: r227457, r237350, r237357 >> >> Add support for the following Moxa PCIe multiport serial boards: >> - CP102E >> - CP102EL >> - CP104EL-A >> - CP104JU >> - CP114EL >> - CP118EL-A >> - CP168EL-A > > You ignored the comments from Marcel when you committed this to HEAD it seems. > You need to revert d_ofs back to a int8_t and add a config_function for these > adapters instead that use an offset of 0x200. Well, I did not ignore comments from Marcel - his e-mail got lost in my inbox. Sorry about that. I was notified about the issue off the list several days ago and fixed it today. Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r239006 - stable/8/sys/dev/puc
Author: fjoe
Date: Fri Aug 3 11:22:09 2012
New Revision: 239006
URL: http://svn.freebsd.org/changeset/base/239006
Log:
MFC: r238933
- Change back "d_ofs" to int8_t to not pessimize padding and size of "struct
puc_cfg"
- Use "puc_config_moxa" for Moxa boards that need d_ofs greater than 0x7f
Modified:
stable/8/sys/dev/puc/puc_cfg.h
stable/8/sys/dev/puc/pucdata.c
Directory Properties:
stable/8/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
Modified: stable/8/sys/dev/puc/puc_cfg.h
==
--- stable/8/sys/dev/puc/puc_cfg.h Fri Aug 3 09:08:20 2012
(r239005)
+++ stable/8/sys/dev/puc/puc_cfg.h Fri Aug 3 11:22:09 2012
(r239006)
@@ -79,7 +79,7 @@ struct puc_cfg {
int8_t ports;
int8_t rid;/* Rid of first port */
int8_t d_rid; /* Delta rid of next ports */
- int16_t d_ofs; /* Delta offset of next ports */
+ int8_t d_ofs; /* Delta offset of next ports */
puc_config_f*config_function;
};
Modified: stable/8/sys/dev/puc/pucdata.c
==
--- stable/8/sys/dev/puc/pucdata.c Fri Aug 3 09:08:20 2012
(r239005)
+++ stable/8/sys/dev/puc/pucdata.c Fri Aug 3 11:22:09 2012
(r239006)
@@ -510,13 +510,15 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1024, 0x, 0,
"Moxa Technologies, Smartio CP-102E/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1025, 0x, 0,
"Moxa Technologies, Smartio CP-102EL/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200,
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1040, 0x, 0,
@@ -572,7 +574,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1182, 0x, 0,
"Moxa Technologies, Smartio CP-118EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1680, 0x, 0,
@@ -596,7 +599,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1683, 0x, 0,
"Moxa Technologies, Smartio CP-168EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x13a8, 0x0152, 0x, 0,
@@ -1153,7 +1157,12 @@ puc_config_moxa(struct puc_softc *sc, en
intptr_t *res)
{
if (cmd == PUC_CFG_GET_OFS) {
- *res = ((port == 3) ? 7 : port) * 0x200;
+ const struct puc_cfg *cfg = sc->sc_cfg;
+
+ if (port == 3 && (cfg->device == 0x1045 || cfg->device ==
0x1144))
+ port = 7;
+ *res = port * 0x200;
+
return 0;
}
return (ENXIO);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r239783 - stable/9/sys/dev/puc
Author: fjoe
Date: Tue Aug 28 17:08:47 2012
New Revision: 239783
URL: http://svn.freebsd.org/changeset/base/239783
Log:
MFC: r238933
- Change back "d_ofs" to int8_t to not pessimize padding and size of "struct
puc_cfg".
- Use "puc_config_moxa" for Moxa boards that need d_ofs greater than 0x7f
Approved by: re (kib)
Modified:
stable/9/sys/dev/puc/puc_cfg.h
stable/9/sys/dev/puc/pucdata.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/puc/puc_cfg.h
==
--- stable/9/sys/dev/puc/puc_cfg.h Tue Aug 28 15:45:37 2012
(r239782)
+++ stable/9/sys/dev/puc/puc_cfg.h Tue Aug 28 17:08:47 2012
(r239783)
@@ -79,7 +79,7 @@ struct puc_cfg {
int8_t ports;
int8_t rid;/* Rid of first port */
int8_t d_rid; /* Delta rid of next ports */
- int16_t d_ofs; /* Delta offset of next ports */
+ int8_t d_ofs; /* Delta offset of next ports */
puc_config_f*config_function;
};
Modified: stable/9/sys/dev/puc/pucdata.c
==
--- stable/9/sys/dev/puc/pucdata.c Tue Aug 28 15:45:37 2012
(r239782)
+++ stable/9/sys/dev/puc/pucdata.c Tue Aug 28 17:08:47 2012
(r239783)
@@ -510,13 +510,15 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1024, 0x, 0,
"Moxa Technologies, Smartio CP-102E/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1025, 0x, 0,
"Moxa Technologies, Smartio CP-102EL/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200,
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1040, 0x, 0,
@@ -572,7 +574,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1182, 0x, 0,
"Moxa Technologies, Smartio CP-118EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1680, 0x, 0,
@@ -596,7 +599,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1683, 0x, 0,
"Moxa Technologies, Smartio CP-168EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x13a8, 0x0152, 0x, 0,
@@ -1153,7 +1157,12 @@ puc_config_moxa(struct puc_softc *sc, en
intptr_t *res)
{
if (cmd == PUC_CFG_GET_OFS) {
- *res = ((port == 3) ? 7 : port) * 0x200;
+ const struct puc_cfg *cfg = sc->sc_cfg;
+
+ if (port == 3 && (cfg->device == 0x1045 || cfg->device ==
0x1144))
+ port = 7;
+ *res = port * 0x200;
+
return 0;
}
return (ENXIO);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r239784 - releng/9.1/sys/dev/puc
Author: fjoe
Date: Tue Aug 28 17:09:34 2012
New Revision: 239784
URL: http://svn.freebsd.org/changeset/base/239784
Log:
MFC: r238933
- Change back "d_ofs" to int8_t to not pessimize padding and size of "struct
puc_cfg".
- Use "puc_config_moxa" for Moxa boards that need d_ofs greater than 0x7f
Approved by: re (kib)
Modified:
releng/9.1/sys/dev/puc/puc_cfg.h
releng/9.1/sys/dev/puc/pucdata.c
Directory Properties:
releng/9.1/ (props changed)
releng/9.1/sys/ (props changed)
releng/9.1/sys/dev/ (props changed)
Modified: releng/9.1/sys/dev/puc/puc_cfg.h
==
--- releng/9.1/sys/dev/puc/puc_cfg.hTue Aug 28 17:08:47 2012
(r239783)
+++ releng/9.1/sys/dev/puc/puc_cfg.hTue Aug 28 17:09:34 2012
(r239784)
@@ -79,7 +79,7 @@ struct puc_cfg {
int8_t ports;
int8_t rid;/* Rid of first port */
int8_t d_rid; /* Delta rid of next ports */
- int16_t d_ofs; /* Delta offset of next ports */
+ int8_t d_ofs; /* Delta offset of next ports */
puc_config_f*config_function;
};
Modified: releng/9.1/sys/dev/puc/pucdata.c
==
--- releng/9.1/sys/dev/puc/pucdata.cTue Aug 28 17:08:47 2012
(r239783)
+++ releng/9.1/sys/dev/puc/pucdata.cTue Aug 28 17:09:34 2012
(r239784)
@@ -510,13 +510,15 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1024, 0x, 0,
"Moxa Technologies, Smartio CP-102E/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1025, 0x, 0,
"Moxa Technologies, Smartio CP-102EL/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_2S, 0x14, 0, 0x200,
+ PUC_PORT_2S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1040, 0x, 0,
@@ -572,7 +574,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1182, 0x, 0,
"Moxa Technologies, Smartio CP-118EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1680, 0x, 0,
@@ -596,7 +599,8 @@ const struct puc_cfg puc_pci_devices[] =
{ 0x1393, 0x1683, 0x, 0,
"Moxa Technologies, Smartio CP-168EL-A/PCIe",
DEFAULT_RCLK * 8,
- PUC_PORT_8S, 0x14, 0, 0x200,
+ PUC_PORT_8S, 0x14, 0, -1,
+ .config_function = puc_config_moxa
},
{ 0x13a8, 0x0152, 0x, 0,
@@ -1153,7 +1157,12 @@ puc_config_moxa(struct puc_softc *sc, en
intptr_t *res)
{
if (cmd == PUC_CFG_GET_OFS) {
- *res = ((port == 3) ? 7 : port) * 0x200;
+ const struct puc_cfg *cfg = sc->sc_cfg;
+
+ if (port == 3 && (cfg->device == 0x1045 || cfg->device ==
0x1144))
+ port = 7;
+ *res = port * 0x200;
+
return 0;
}
return (ENXIO);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211094 - head/games/fortune/datfiles
Author: fjoe Date: Mon Aug 9 09:26:17 2010 New Revision: 211094 URL: http://svn.freebsd.org/changeset/base/211094 Log: "whereis netscape" gives empty output for quite a long time already. Suggest to use "whereis firefox" instead. Modified: head/games/fortune/datfiles/freebsd-tips Modified: head/games/fortune/datfiles/freebsd-tips == --- head/games/fortune/datfiles/freebsd-tipsMon Aug 9 08:41:29 2010 (r211093) +++ head/games/fortune/datfiles/freebsd-tipsMon Aug 9 09:26:17 2010 (r211094) @@ -476,6 +476,6 @@ You can use "whereis" to search standard directories for the specified programs. This can be particularly handy when you are trying to find where in the ports tree an application is. -Try "whereis netscape" and "whereis whereis". +Try "whereis firefox" and "whereis whereis". -- Konstantinos Konstantinidis % ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r241002 - head/sys/contrib/ipfilter/netinet
Author: fjoe
Date: Thu Sep 27 18:15:01 2012
New Revision: 241002
URL: http://svn.freebsd.org/changeset/base/241002
Log:
Fix pseudo checksum calculation.
This fixes ipfilter w/ network controllers that implement only
partial rx csum offloading.
PR: 106438
Obtained from:upstream
MFC after:1 week
Modified:
head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Sep 27 17:48:04
2012(r241001)
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Sep 27 18:15:01
2012(r241002)
@@ -1357,7 +1357,9 @@ fr_info_t *fin;
else
sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr,
htonl(m->m_pkthdr.csum_data +
- fin->fin_ip->ip_len + fin->fin_p));
+ fin->fin_ip->ip_len -
+ (fin->fin_ip->ip_hl << 2) +
+ fin->fin_p));
sum ^= 0x;
if (sum != 0) {
fin->fin_flx |= FI_BAD;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r241192 - in stable/9: . gnu/usr.bin/gdb gnu/usr.bin/gdb/arch/amd64 gnu/usr.bin/gdb/arch/arm gnu/usr.bin/gdb/arch/i386 gnu/usr.bin/gdb/arch/ia64 gnu/usr.bin/gdb/arch/mips gnu/usr.bin/gd...
Author: fjoe
Date: Thu Oct 4 09:49:53 2012
New Revision: 241192
URL: http://svn.freebsd.org/changeset/base/241192
Log:
MFC: r241002
Fix pseudo checksum calculation.
This fixes ipfilter w/ network controllers that implement only
partial rx csum offloading.
PR: 106438
Obtained from:upstream
Modified:
stable/9/Makefile.inc1
stable/9/gnu/usr.bin/gdb/Makefile.inc
stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
stable/9/gnu/usr.bin/gdb/arch/arm/init.c
stable/9/gnu/usr.bin/gdb/arch/i386/Makefile
stable/9/gnu/usr.bin/gdb/arch/i386/init.c
stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile
stable/9/gnu/usr.bin/gdb/arch/ia64/init.c
stable/9/gnu/usr.bin/gdb/arch/mips/Makefile
stable/9/gnu/usr.bin/gdb/arch/mips/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c
stable/9/kerberos5/usr.bin/kadmin/Makefile
stable/9/kerberos5/usr.sbin/ktutil/Makefile
stable/9/rescue/rescue/Makefile
stable/9/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
stable/9/sys/fs/ext2fs/ext2_bmap.c
stable/9/sys/fs/ext2fs/ext2_extern.h
stable/9/sys/fs/ext2fs/ext2_vnops.c
stable/9/usr.bin/grep/util.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1 Thu Oct 4 09:02:38 2012(r241191)
+++ stable/9/Makefile.inc1 Thu Oct 4 09:49:53 2012(r241192)
@@ -172,7 +172,11 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.$
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
# /usr/games added for fortune which depend on strfile
+.if defined(NO_WORLDTMP)
+BPATH= ${PATH}
+.else
BPATH=
${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
+.endif
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
Modified: stable/9/gnu/usr.bin/gdb/Makefile.inc
==
--- stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:02:38 2012
(r241191)
+++ stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:49:53 2012
(r241192)
@@ -45,6 +45,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include
CFLAGS+= -I${CNTRB_GDB}/include
CFLAGS+= -I${CNTRB_BU}/bfd
+DEBUG_FLAGS= -g -O0
GENSRCS+= nm.h tm.h
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:02:38
2012(r241191)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:49:53
2012(r241192)
@@ -5,7 +5,7 @@ GENSRCS+= xm.h
LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c
.endif
-LIBSRCS+= solib.c solib-svr4.c
+LIBSRCS+= solib.c solib-svr4.c solib-legacy.c
LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \
i386fbsd-tdep-fixed.c i387-tdep.c
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:02:38 2012
(r241191)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:49:53 2012
(r241192)
@@ -12,6 +12,7 @@ extern initialize_file_ftype _initialize
extern initialize_file_ftype _initialize_corelow;
extern initialize_file_ftype _initialize_solib;
extern initialize_file_ftype _initialize_svr4_solib;
+extern initialize_file_ftype _initialize_svr4_lm;
extern initialize_file_ftype _initialize_ser_hardwire;
extern initialize_file_ftype _initialize_ser_pipe;
extern initialize_file_ftype _initialize_ser_tcp;
@@ -126,6 +127,7 @@ initialize_all_files (void)
_initialize_corelow ();
_initialize_solib ();
_initialize_svr4_solib ();
+ _initialize_svr4_lm ();
_initialize_ser_hardwire ();
_initialize_ser_pipe ();
_initialize_ser_tcp ();
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:02:38 2012
(r241191)
+++ stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:49:53 2012
(r241192)
@@ -2,7 +2,7 @@
GENSRCS+= xm.h
LIBSRCS+= armfbsd-nat.c
-LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c
+LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c solib-legacy.c
.if !defined(GDB_CROSS_DEBUGGER)
LIBSRCS+= fbsd-threads.c
.endif
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/init.c
===
svn commit: r241193 - in stable/9: . gnu/usr.bin/gdb gnu/usr.bin/gdb/arch/amd64 gnu/usr.bin/gdb/arch/arm gnu/usr.bin/gdb/arch/i386 gnu/usr.bin/gdb/arch/ia64 gnu/usr.bin/gdb/arch/mips gnu/usr.bin/gd...
Author: fjoe
Date: Thu Oct 4 09:53:59 2012
New Revision: 241193
URL: http://svn.freebsd.org/changeset/base/241193
Log:
Revert changes that ocassionally got into r241192.
Pointy hat to:me
Modified:
stable/9/Makefile.inc1
stable/9/gnu/usr.bin/gdb/Makefile.inc
stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
stable/9/gnu/usr.bin/gdb/arch/arm/init.c
stable/9/gnu/usr.bin/gdb/arch/i386/Makefile
stable/9/gnu/usr.bin/gdb/arch/i386/init.c
stable/9/gnu/usr.bin/gdb/arch/ia64/Makefile
stable/9/gnu/usr.bin/gdb/arch/ia64/init.c
stable/9/gnu/usr.bin/gdb/arch/mips/Makefile
stable/9/gnu/usr.bin/gdb/arch/mips/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc/init.c
stable/9/gnu/usr.bin/gdb/arch/powerpc64/Makefile
stable/9/gnu/usr.bin/gdb/arch/powerpc64/init.c
stable/9/kerberos5/usr.bin/kadmin/Makefile
stable/9/kerberos5/usr.sbin/ktutil/Makefile
stable/9/rescue/rescue/Makefile
stable/9/sys/fs/ext2fs/ext2_bmap.c
stable/9/sys/fs/ext2fs/ext2_extern.h
stable/9/sys/fs/ext2fs/ext2_vnops.c
stable/9/usr.bin/grep/util.c
Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1 Thu Oct 4 09:49:53 2012(r241192)
+++ stable/9/Makefile.inc1 Thu Oct 4 09:53:59 2012(r241193)
@@ -172,11 +172,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.$
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
# /usr/games added for fortune which depend on strfile
-.if defined(NO_WORLDTMP)
-BPATH= ${PATH}
-.else
BPATH=
${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
-.endif
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
Modified: stable/9/gnu/usr.bin/gdb/Makefile.inc
==
--- stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/Makefile.inc Thu Oct 4 09:53:59 2012
(r241193)
@@ -45,7 +45,6 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include
CFLAGS+= -I${CNTRB_GDB}/include
CFLAGS+= -I${CNTRB_BU}/bfd
-DEBUG_FLAGS= -g -O0
GENSRCS+= nm.h tm.h
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:49:53
2012(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/MakefileThu Oct 4 09:53:59
2012(r241193)
@@ -5,7 +5,7 @@ GENSRCS+= xm.h
LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c
.endif
-LIBSRCS+= solib.c solib-svr4.c solib-legacy.c
+LIBSRCS+= solib.c solib-svr4.c
LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \
i386fbsd-tdep-fixed.c i387-tdep.c
Modified: stable/9/gnu/usr.bin/gdb/arch/amd64/init.c
==
--- stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/amd64/init.c Thu Oct 4 09:53:59 2012
(r241193)
@@ -12,7 +12,6 @@ extern initialize_file_ftype _initialize
extern initialize_file_ftype _initialize_corelow;
extern initialize_file_ftype _initialize_solib;
extern initialize_file_ftype _initialize_svr4_solib;
-extern initialize_file_ftype _initialize_svr4_lm;
extern initialize_file_ftype _initialize_ser_hardwire;
extern initialize_file_ftype _initialize_ser_pipe;
extern initialize_file_ftype _initialize_ser_tcp;
@@ -127,7 +126,6 @@ initialize_all_files (void)
_initialize_corelow ();
_initialize_solib ();
_initialize_svr4_solib ();
- _initialize_svr4_lm ();
_initialize_ser_hardwire ();
_initialize_ser_pipe ();
_initialize_ser_tcp ();
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/Makefile
==
--- stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/arm/Makefile Thu Oct 4 09:53:59 2012
(r241193)
@@ -2,7 +2,7 @@
GENSRCS+= xm.h
LIBSRCS+= armfbsd-nat.c
-LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c solib-legacy.c
+LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c
.if !defined(GDB_CROSS_DEBUGGER)
LIBSRCS+= fbsd-threads.c
.endif
Modified: stable/9/gnu/usr.bin/gdb/arch/arm/init.c
==
--- stable/9/gnu/usr.bin/gdb/arch/arm/init.cThu Oct 4 09:49:53 2012
(r241192)
+++ stable/9/gnu/usr.bin/gdb/arch/arm/init.cThu Oct 4 09:53:59 2012
(r241193)
@@ -10,7 +10,6 @
svn commit: r217576 - stable/8
Author: fjoe
Date: Wed Jan 19 09:59:54 2011
New Revision: 217576
URL: http://svn.freebsd.org/changeset/base/217576
Log:
Fix buildworld on pre-8.2.
PR: 153947
Modified:
stable/8/Makefile.inc1
Modified: stable/8/Makefile.inc1
==
--- stable/8/Makefile.inc1 Wed Jan 19 09:47:20 2011(r217575)
+++ stable/8/Makefile.inc1 Wed Jan 19 09:59:54 2011(r217576)
@@ -926,6 +926,10 @@ _groff=gnu/usr.bin/groff/tmac
_ar= usr.bin/ar
.endif
+.if ${BOOTSTRAPPING} < 802000
+_lex= usr.bin/lex
+.endif
+
.if ${BOOTSTRAPPING} < 800013
_mklocale= usr.bin/mklocale
.endif
@@ -951,6 +955,7 @@ bootstrap-tools:
${_gperf} \
${_groff} \
${_ar} \
+${_lex} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r198197 - head/usr.bin/make
Author: fjoe
Date: Sun Oct 18 11:26:09 2009
New Revision: 198197
URL: http://svn.freebsd.org/changeset/base/198197
Log:
Exit with non-zero error code in case of errors
when make is run with -k and not parallel (compat) make is run.
Modified:
head/usr.bin/make/job.c
Modified: head/usr.bin/make/job.c
==
--- head/usr.bin/make/job.c Sun Oct 18 11:23:56 2009(r198196)
+++ head/usr.bin/make/job.c Sun Oct 18 11:26:09 2009(r198197)
@@ -3380,6 +3380,8 @@ Compat_Run(Lst *targs)
printf("`%s' not remade because of errors.\n",
gn->name);
makeErrors++;
+ } else if (gn->made == ERROR) {
+ makeErrors++;
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r198199 - head/usr.bin/make
Author: fjoe
Date: Sun Oct 18 11:28:31 2009
New Revision: 198199
URL: http://svn.freebsd.org/changeset/base/198199
Log:
Reset UPTODATE gnodes after remaking makefiles when make
is not going to be restarted: such nodes could be marked UPTODATE
without doing rebuild due to remakingMakefiles being TRUE.
Modified:
head/usr.bin/make/main.c
Modified: head/usr.bin/make/main.c
==
--- head/usr.bin/make/main.cSun Oct 18 11:27:34 2009(r198198)
+++ head/usr.bin/make/main.cSun Oct 18 11:28:31 2009(r198199)
@@ -706,6 +706,7 @@ Main_AddSourceMakefile(const char *name)
static void
Remake_Makefiles(void)
{
+ Lst cleanup;
LstNode *ln;
int error_cnt = 0;
int remade_cnt = 0;
@@ -716,6 +717,7 @@ Remake_Makefiles(void)
Fatal("Failed to change directory to %s.", curdir);
}
+ Lst_Init(&cleanup);
LST_FOREACH(ln, &source_makefiles) {
LstNode *ln2;
struct GNode *gn;
@@ -791,21 +793,7 @@ Remake_Makefiles(void)
gn->name);
error_cnt++;
} else if (gn->made == UPTODATE) {
- Lst examine;
-
- Lst_Init(&examine);
- Lst_EnQueue(&examine, gn);
- while (!Lst_IsEmpty(&examine)) {
- LstNode *eln;
- GNode *egn = Lst_DeQueue(&examine);
-
- egn->make = FALSE;
- LST_FOREACH(eln, &egn->children) {
- GNode *cgn = Lst_Datum(eln);
-
- Lst_EnQueue(&examine, cgn);
- }
- }
+ Lst_EnQueue(&cleanup, gn);
}
}
@@ -827,6 +815,24 @@ Remake_Makefiles(void)
}
}
+ while (!Lst_IsEmpty(&cleanup)) {
+ GNode *gn = Lst_DeQueue(&cleanup);
+
+ gn->unmade = 0;
+ gn->make = FALSE;
+ gn->made = UNMADE;
+ gn->childMade = FALSE;
+ gn->mtime = gn->cmtime = 0;
+ gn->cmtime_gn = NULL;
+
+ LST_FOREACH(ln, &gn->children) {
+ GNode *cgn = Lst_Datum(ln);
+
+ gn->unmade++;
+ Lst_EnQueue(&cleanup, cgn);
+ }
+ }
+
if (curdir != objdir) {
if (chdir(objdir) < 0)
Fatal("Failed to change directory to %s.", objdir);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r198277 - head/sys/tools
Author: fjoe
Date: Tue Oct 20 11:54:06 2009
New Revision: 198277
URL: http://svn.freebsd.org/changeset/base/198277
Log:
Allow KMOD with hypens and dots.
MFC after:1 week
Modified:
head/sys/tools/fw_stub.awk
Modified: head/sys/tools/fw_stub.awk
==
--- head/sys/tools/fw_stub.awk Tue Oct 20 11:52:39 2009(r198276)
+++ head/sys/tools/fw_stub.awk Tue Oct 20 11:54:06 2009(r198277)
@@ -118,6 +118,8 @@ if (!num_files || !opt_m)
cfilename = opt_c;
ctmpfilename = cfilename ".tmp";
+modname = opt_m;
+gsub(/[-\.]/, "_", modname);
printc("#include \
#include \
@@ -139,7 +141,7 @@ for (file_i = 0; file_i < num_files; fil
}
printc("\nstatic int\n"\
-opt_m "_fw_modevent(module_t mod, int type, void *unused)\
+modname "_fw_modevent(module_t mod, int type, void *unused)\
{\
const struct firmware *fp, *parent;\
int error;\
@@ -206,14 +208,14 @@ printc("\t\treturn (error);\
return (EINVAL);\
}\
\
-static moduledata_t " opt_m "_fw_mod = {\
-\"" opt_m "_fw\",\
-" opt_m "_fw_modevent,\
+static moduledata_t " modname "_fw_mod = {\
+\"" modname "_fw\",\
+" modname "_fw_modevent,\
0\
};\
-DECLARE_MODULE(" opt_m "_fw, " opt_m "_fw_mod, SI_SUB_DRIVERS,
SI_ORDER_FIRST);\
-MODULE_VERSION(" opt_m "_fw, 1);\
-MODULE_DEPEND(" opt_m "_fw, firmware, 1, 1, 1);\
+DECLARE_MODULE(" modname "_fw, " modname "_fw_mod, SI_SUB_DRIVERS,
SI_ORDER_FIRST);\
+MODULE_VERSION(" modname "_fw, 1);\
+MODULE_DEPEND(" modname "_fw, firmware, 1, 1, 1);\
");
if (opt_c)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r198783 - stable/8/sys/tools
Author: fjoe
Date: Mon Nov 2 09:47:15 2009
New Revision: 198783
URL: http://svn.freebsd.org/changeset/base/198783
Log:
MFC: Allow KMOD with hypens and dots.
Modified:
stable/8/sys/tools/fw_stub.awk
Modified: stable/8/sys/tools/fw_stub.awk
==
--- stable/8/sys/tools/fw_stub.awk Mon Nov 2 08:31:00 2009
(r198782)
+++ stable/8/sys/tools/fw_stub.awk Mon Nov 2 09:47:15 2009
(r198783)
@@ -118,6 +118,8 @@ if (!num_files || !opt_m)
cfilename = opt_c;
ctmpfilename = cfilename ".tmp";
+modname = opt_m;
+gsub(/[-\.]/, "_", modname);
printc("#include \
#include \
@@ -139,7 +141,7 @@ for (file_i = 0; file_i < num_files; fil
}
printc("\nstatic int\n"\
-opt_m "_fw_modevent(module_t mod, int type, void *unused)\
+modname "_fw_modevent(module_t mod, int type, void *unused)\
{\
const struct firmware *fp, *parent;\
int error;\
@@ -206,14 +208,14 @@ printc("\t\treturn (error);\
return (EINVAL);\
}\
\
-static moduledata_t " opt_m "_fw_mod = {\
-\"" opt_m "_fw\",\
-" opt_m "_fw_modevent,\
+static moduledata_t " modname "_fw_mod = {\
+\"" modname "_fw\",\
+" modname "_fw_modevent,\
0\
};\
-DECLARE_MODULE(" opt_m "_fw, " opt_m "_fw_mod, SI_SUB_DRIVERS,
SI_ORDER_FIRST);\
-MODULE_VERSION(" opt_m "_fw, 1);\
-MODULE_DEPEND(" opt_m "_fw, firmware, 1, 1, 1);\
+DECLARE_MODULE(" modname "_fw, " modname "_fw_mod, SI_SUB_DRIVERS,
SI_ORDER_FIRST);\
+MODULE_VERSION(" modname "_fw, 1);\
+MODULE_DEPEND(" modname "_fw, firmware, 1, 1, 1);\
");
if (opt_c)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r198784 - stable/7/sys/tools
Author: fjoe
Date: Mon Nov 2 09:47:41 2009
New Revision: 198784
URL: http://svn.freebsd.org/changeset/base/198784
Log:
MFC: Allow KMOD with hypens and dots.
Modified:
stable/7/sys/tools/fw_stub.awk
Modified: stable/7/sys/tools/fw_stub.awk
==
--- stable/7/sys/tools/fw_stub.awk Mon Nov 2 09:47:15 2009
(r198783)
+++ stable/7/sys/tools/fw_stub.awk Mon Nov 2 09:47:41 2009
(r198784)
@@ -118,6 +118,8 @@ if (!num_files || !opt_m)
cfilename = opt_c;
ctmpfilename = cfilename ".tmp";
+modname = opt_m;
+gsub(/[-\.]/, "_", modname);
printc("#include \
#include \
@@ -139,7 +141,7 @@ for (file_i = 0; file_i < num_files; fil
}
printc("\nstatic int\n"\
-opt_m "_fw_modevent(module_t mod, int type, void *unused)\
+modname "_fw_modevent(module_t mod, int type, void *unused)\
{\
const struct firmware *fp, *parent;\
int error;\
@@ -206,14 +208,14 @@ printc("\t\treturn (error);\
return (EINVAL);\
}\
\
-static moduledata_t " opt_m "_fw_mod = {\
-\"" opt_m "_fw\",\
-" opt_m "_fw_modevent,\
+static moduledata_t " modname "_fw_mod = {\
+\"" modname "_fw\",\
+" modname "_fw_modevent,\
0\
};\
-DECLARE_MODULE(" opt_m "_fw, " opt_m "_fw_mod, SI_SUB_DRIVERS,
SI_ORDER_FIRST);\
-MODULE_VERSION(" opt_m "_fw, 1);\
-MODULE_DEPEND(" opt_m "_fw, firmware, 1, 1, 1);\
+DECLARE_MODULE(" modname "_fw, " modname "_fw_mod, SI_SUB_DRIVERS,
SI_ORDER_FIRST);\
+MODULE_VERSION(" modname "_fw, 1);\
+MODULE_DEPEND(" modname "_fw, firmware, 1, 1, 1);\
");
if (opt_c)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r201924 - head/sys/netgraph
Author: fjoe
Date: Sat Jan 9 19:03:48 2010
New Revision: 201924
URL: http://svn.freebsd.org/changeset/base/201924
Log:
Send link state change control messages to "orphans" hook as well.
MFC after:1 week
Modified:
head/sys/netgraph/ng_ether.c
Modified: head/sys/netgraph/ng_ether.c
==
--- head/sys/netgraph/ng_ether.cSat Jan 9 19:02:33 2010
(r201923)
+++ head/sys/netgraph/ng_ether.cSat Jan 9 19:03:48 2010
(r201924)
@@ -359,9 +359,6 @@ ng_ether_link_state(struct ifnet *ifp, i
struct ng_mesg *msg;
int cmd, dummy_error = 0;
- if (priv->lower == NULL)
-return;
-
if (state == LINK_STATE_UP)
cmd = NGM_LINK_IS_UP;
else if (state == LINK_STATE_DOWN)
@@ -369,9 +366,16 @@ ng_ether_link_state(struct ifnet *ifp, i
else
return;
- NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
- if (msg != NULL)
- NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower, 0);
+ if (priv->lower != NULL) {
+ NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+ if (msg != NULL)
+ NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower,
0);
+ }
+ if (priv->orphan != NULL) {
+ NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+ if (msg != NULL)
+ NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->orphan,
0);
+ }
}
/**
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r202911 - stable/8/sys/netgraph
Author: fjoe
Date: Sun Jan 24 08:59:33 2010
New Revision: 202911
URL: http://svn.freebsd.org/changeset/base/202911
Log:
MFC: Send link state change control messages to "orphans" hook as well.
Modified:
stable/8/sys/netgraph/ng_ether.c
Modified: stable/8/sys/netgraph/ng_ether.c
==
--- stable/8/sys/netgraph/ng_ether.cSun Jan 24 05:23:08 2010
(r202910)
+++ stable/8/sys/netgraph/ng_ether.cSun Jan 24 08:59:33 2010
(r202911)
@@ -359,9 +359,6 @@ ng_ether_link_state(struct ifnet *ifp, i
struct ng_mesg *msg;
int cmd, dummy_error = 0;
- if (priv->lower == NULL)
-return;
-
if (state == LINK_STATE_UP)
cmd = NGM_LINK_IS_UP;
else if (state == LINK_STATE_DOWN)
@@ -369,9 +366,16 @@ ng_ether_link_state(struct ifnet *ifp, i
else
return;
- NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
- if (msg != NULL)
- NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower, 0);
+ if (priv->lower != NULL) {
+ NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+ if (msg != NULL)
+ NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower,
0);
+ }
+ if (priv->orphan != NULL) {
+ NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+ if (msg != NULL)
+ NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->orphan,
0);
+ }
}
/**
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r202932 - stable/7/sys/netgraph
Author: fjoe
Date: Sun Jan 24 14:58:49 2010
New Revision: 202932
URL: http://svn.freebsd.org/changeset/base/202932
Log:
MFC rev. 201924: Send link state change control messages
to "orphans" hook as well.
Approved by: re (kib)
Modified:
stable/7/sys/netgraph/ng_ether.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/netgraph/ng_ether.c
==
--- stable/7/sys/netgraph/ng_ether.cSun Jan 24 14:57:54 2010
(r202931)
+++ stable/7/sys/netgraph/ng_ether.cSun Jan 24 14:58:49 2010
(r202932)
@@ -343,9 +343,6 @@ ng_ether_link_state(struct ifnet *ifp, i
struct ng_mesg *msg;
int cmd, dummy_error = 0;
- if (priv->lower == NULL)
-return;
-
if (state == LINK_STATE_UP)
cmd = NGM_LINK_IS_UP;
else if (state == LINK_STATE_DOWN)
@@ -353,9 +350,16 @@ ng_ether_link_state(struct ifnet *ifp, i
else
return;
- NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
- if (msg != NULL)
- NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower, 0);
+ if (priv->lower != NULL) {
+ NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+ if (msg != NULL)
+ NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower,
0);
+ }
+ if (priv->orphan != NULL) {
+ NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+ if (msg != NULL)
+ NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->orphan,
0);
+ }
}
/**
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r202936 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci
Author: fjoe Date: Sun Jan 24 16:58:20 2010 New Revision: 202936 URL: http://svn.freebsd.org/changeset/base/202936 Log: Record rev. 201924 MFC. Modified: Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r202938 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci
Author: fjoe Date: Sun Jan 24 17:00:21 2010 New Revision: 202938 URL: http://svn.freebsd.org/changeset/base/202938 Log: Record rev. 198277 MFC. Modified: Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r186279 - head/usr.bin/make
Author: fjoe
Date: Thu Dec 18 12:16:51 2008
New Revision: 186279
URL: http://svn.freebsd.org/changeset/base/186279
Log:
Exit with error code 2 when run with -k (continue if errors) and build failed.
Modified:
head/usr.bin/make/globals.h
head/usr.bin/make/job.c
head/usr.bin/make/job.h
head/usr.bin/make/main.c
head/usr.bin/make/make.c
Modified: head/usr.bin/make/globals.h
==
--- head/usr.bin/make/globals.h Thu Dec 18 12:01:53 2008(r186278)
+++ head/usr.bin/make/globals.h Thu Dec 18 12:16:51 2008(r186279)
@@ -70,6 +70,7 @@ extern struct Path parseIncPath;
extern struct Path sysIncPath;
extern int jobLimit; /* -j argument: maximum number of jobs */
+extern int makeErrors; /* Number of targets not remade due to errors */
extern Boolean jobsRunning;/* True if jobs are running */
extern Boolean compatMake; /* True if we are make compatible */
extern Boolean ignoreErrors; /* True if should ignore all errors */
Modified: head/usr.bin/make/job.c
==
--- head/usr.bin/make/job.c Thu Dec 18 12:01:53 2008(r186278)
+++ head/usr.bin/make/job.c Thu Dec 18 12:16:51 2008(r186279)
@@ -263,7 +263,6 @@ TAILQ_HEAD(JobList, Job);
/*
* error handling variables
*/
-static int errors = 0; /* number of errors reported */
static int aborting = 0; /* why is the make aborting? */
#defineABORT_ERROR 1 /* Because of an error */
#defineABORT_INTERRUPT 2 /* Because it was interrupted */
@@ -849,7 +848,7 @@ JobClose(Job *job)
*
* If we got an error and are aborting (aborting == ABORT_ERROR) and
* the job list is now empty, we are done for the day.
- * If we recognized an error (errors !=0), we set the aborting flag
+ * If we recognized an error (makeErrors !=0), we set the aborting flag
* to ABORT_ERROR so no more jobs will be started.
*/
static void
@@ -1124,7 +1123,7 @@ JobFinish(Job *job, int *status)
free(job);
} else if (*status != 0) {
- errors += 1;
+ makeErrors++;
free(job);
}
@@ -1133,7 +1132,7 @@ JobFinish(Job *job, int *status)
/*
* Set aborting if any error.
*/
- if (errors && !keepgoing && aborting != ABORT_INTERRUPT) {
+ if (makeErrors && !keepgoing && aborting != ABORT_INTERRUPT) {
/*
* If we found any errors in this batch of children and the -k
* flag wasn't given, we set the aborting flag so no more jobs
@@ -1146,7 +1145,7 @@ JobFinish(Job *job, int *status)
/*
* If we are aborting and the job table is now empty, we finish.
*/
- Finish(errors);
+ Finish(makeErrors);
}
}
@@ -2347,7 +2346,7 @@ Job_Init(int maxproc)
nJobs = 0;
aborting = 0;
- errors = 0;
+ makeErrors = 0;
lastNode = NULL;
@@ -2539,14 +2538,14 @@ JobInterrupt(int runINTERRUPT, int signo
* attached to the .END target.
*
* Results:
- * Number of errors reported.
+ * None.
*/
-int
+void
Job_Finish(void)
{
if (postCommands != NULL && !Lst_IsEmpty(&postCommands->commands)) {
- if (errors) {
+ if (makeErrors) {
Error("Errors reported so .END ignored");
} else {
JobStart(postCommands, JOB_SPECIAL | JOB_IGNDOTS, NULL);
@@ -2563,7 +2562,6 @@ Job_Finish(void)
if (fifoMaster)
unlink(fifoName);
}
- return (errors);
}
/**
@@ -3327,7 +3325,6 @@ void
Compat_Run(Lst *targs)
{
GNode *gn = NULL; /* Current root target */
- int error_cnt; /* Number of targets not remade due to
errors */
LstNode *ln;
Compat_InstallSignalHandlers();
@@ -3360,7 +3357,7 @@ Compat_Run(Lst *targs)
* ABORTED gn was not remade because one of its inferiors
*could not be made due to errors.
*/
- error_cnt = 0;
+ makeErrors = 0;
while (!Lst_IsEmpty(targs)) {
gn = Lst_DeQueue(targs);
Compat_Make(gn, gn);
@@ -3370,18 +3367,17 @@ Compat_Run(Lst *targs)
} else if (gn->made == ABORTED) {
printf("`%s' not remade because of errors.\n",
gn->name);
- error_cnt += 1;
+ makeErrors++;
}
}
/*
* If the user has defined a .END target, run its commands.
*/
- if (error_cnt == 0) {
+ if (makeErrors == 0) {
LST_FOREACH(ln, &ENDNode->commands) {
if (Compat_RunCommand
svn commit: r190821 - head/usr.bin/make
Author: fjoe
Date: Tue Apr 7 19:49:38 2009
New Revision: 190821
URL: http://svn.freebsd.org/changeset/base/190821
Log:
Avoid infinite loops when remaking makefiles not only
for Makefile targets but also for targets they depend on.
Modified:
head/usr.bin/make/globals.h
head/usr.bin/make/main.c
head/usr.bin/make/make.1
head/usr.bin/make/make.c
Modified: head/usr.bin/make/globals.h
==
--- head/usr.bin/make/globals.h Tue Apr 7 19:44:06 2009(r190820)
+++ head/usr.bin/make/globals.h Tue Apr 7 19:49:38 2009(r190821)
@@ -81,6 +81,7 @@ extern BooleannoExecute; /* True if sho
extern Boolean allPrecious;/* True if every target is precious */
extern Boolean is_posix; /* .POSIX target seen */
extern Boolean mfAutoDeps; /* .MAKEFILEDEPS target seen */
+extern Boolean remakingMakefiles; /* True if remaking makefiles is in progress
*/
/* True if should continue on unaffected portions of the graph
* when have an error in one portion */
Modified: head/usr.bin/make/main.c
==
--- head/usr.bin/make/main.cTue Apr 7 19:44:06 2009(r190820)
+++ head/usr.bin/make/main.cTue Apr 7 19:49:38 2009(r190821)
@@ -124,6 +124,7 @@ Lst create = Lst_Initializer(create);
BooleanallPrecious;/* .PRECIOUS given on line by itself */
Booleanis_posix; /* .POSIX target seen */
BooleanmfAutoDeps; /* .MAKEFILEDEPS target seen */
+BooleanremakingMakefiles; /* True if remaking makefiles is in
progress */
BooleanbeSilent; /* -s flag */
BooleanbeVerbose; /* -v flag */
BooleanbeQuiet;/* -Q flag */
@@ -732,41 +733,6 @@ Remake_Makefiles(void)
Suff_FindDeps(gn);
/*
-* ! dependencies as well as
-* dependencies with .FORCE, .EXEC and .PHONY attributes
-* are skipped to prevent infinite loops
-*/
- if (gn->type & (OP_FORCE | OP_EXEC | OP_PHONY)) {
- DEBUGF(MAKE, ("skipping (force, exec or phony).\n",
- gn->name));
- continue;
- }
-
- /*
-* Skip :: targets that have commands and no children
-* because such targets are always out-of-date
-*/
- if ((gn->type & OP_DOUBLEDEP) &&
- !Lst_IsEmpty(&gn->commands) &&
- Lst_IsEmpty(&gn->children)) {
- DEBUGF(MAKE, ("skipping (doubledep, no sources "
- "and has commands).\n"));
- continue;
- }
-
- /*
-* Skip targets without sources and without commands
-*/
- if (Lst_IsEmpty(&gn->commands) &&
- Lst_IsEmpty(&gn->children)) {
- DEBUGF(MAKE,
- ("skipping (no sources and no commands).\n"));
- continue;
- }
-
- DEBUGF(MAKE, ("\n"));
-
- /*
* -t, -q and -n has no effect unless the makefile is
* specified as one of the targets explicitly in the
* command line
@@ -787,7 +753,9 @@ Remake_Makefiles(void)
* Check and remake the makefile
*/
mtime = Dir_MTime(gn);
+ remakingMakefiles = TRUE;
Compat_Make(gn, gn);
+ remakingMakefiles = FALSE;
/*
* Restore -t, -q and -n behaviour
Modified: head/usr.bin/make/make.1
==
--- head/usr.bin/make/make.1Tue Apr 7 19:44:06 2009(r190820)
+++ head/usr.bin/make/make.1Tue Apr 7 19:49:38 2009(r190821)
@@ -1629,7 +1629,7 @@ To prevent infinite loops the following
.Bl -bullet
.It
.Ic ::
-targets that have no prerequisites but have commands
+targets that have no prerequisites
.It
.Ic !
targets
Modified: head/usr.bin/make/make.c
==
--- head/usr.bin/make/make.cTue Apr 7 19:44:06 2009(r190820)
+++ head/usr.bin/make/make.cTue Apr 7 19:49:38 2009(r190821)
@@ -211,11 +211,15 @@ Make_OODate(GNode *gn)
} else {
DEBUGF(MAKE, (".EXEC node..."));
}
- oodate = TRUE;
- } else if ((gn->mtime < gn->cmtime) ||
- ((gn->cmtime == 0) &&
- ((gn->mtime==0) || (gn->type & OP_DOUBLEDEP {
+ if (remakingMakefiles) {
+ DEBUGF(MAKE, ("skipping (remaking
svn commit: r188001 - head/usr.bin/make
Author: fjoe
Date: Mon Feb 2 06:25:57 2009
New Revision: 188001
URL: http://svn.freebsd.org/changeset/base/188001
Log:
Remove duplicate OPTFLAGS definition.
Modified:
head/usr.bin/make/main.c
Modified: head/usr.bin/make/main.c
==
--- head/usr.bin/make/main.cMon Feb 2 04:59:00 2009(r188000)
+++ head/usr.bin/make/main.cMon Feb 2 06:25:57 2009(r188001)
@@ -371,7 +371,6 @@ MainParseArgs(int argc, char **argv)
rearg:
optind = 1; /* since we're called more than once */
optreset = 1;
-#define OPTFLAGS "ABC:D:E:I:PSV:Xd:ef:ij:km:nQpqrstvx:"
#define OPTFLAGS "ABC:D:d:E:ef:I:ij:km:nPpQqrSstV:vXx:"
for (;;) {
if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r188392 - head/sys/pci
Author: fjoe
Date: Mon Feb 9 16:53:37 2009
New Revision: 188392
URL: http://svn.freebsd.org/changeset/base/188392
Log:
Destroy TX tag outside of loop scope.
Found with: Coverity Prevent(tm)
CID: 3886
Modified:
head/sys/pci/if_rl.c
Modified: head/sys/pci/if_rl.c
==
--- head/sys/pci/if_rl.cMon Feb 9 15:55:21 2009(r188391)
+++ head/sys/pci/if_rl.cMon Feb 9 16:53:37 2009(r188392)
@@ -1151,9 +1151,9 @@ rl_dma_free(struct rl_softc *sc)
sc->rl_cdata.rl_tx_dmamap[i]);
sc->rl_cdata.rl_tx_dmamap[i] = NULL;
}
+ }
bus_dma_tag_destroy(sc->rl_cdata.rl_tx_tag);
sc->rl_cdata.rl_tx_tag = NULL;
- }
}
if (sc->rl_parent_tag != NULL) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r188393 - head/sys/dev/firewire
Author: fjoe
Date: Mon Feb 9 16:57:07 2009
New Revision: 188393
URL: http://svn.freebsd.org/changeset/base/188393
Log:
Remove unused variable.
Found with: Coverity Prevent(tm)
CID: 3693
Modified:
head/sys/dev/firewire/sbp.c
Modified: head/sys/dev/firewire/sbp.c
==
--- head/sys/dev/firewire/sbp.c Mon Feb 9 16:53:37 2009(r188392)
+++ head/sys/dev/firewire/sbp.c Mon Feb 9 16:57:07 2009(r188393)
@@ -330,12 +330,11 @@ static char *orb_status1_serial_bus_erro
static void
sbp_identify(driver_t *driver, device_t parent)
{
- device_t child;
SBP_DEBUG(0)
printf("sbp_identify\n");
END_DEBUG
- child = BUS_ADD_CHILD(parent, 0, "sbp", device_get_unit(parent));
+ BUS_ADD_CHILD(parent, 0, "sbp", device_get_unit(parent));
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r188394 - head/sys/dev/firewire
Author: fjoe
Date: Mon Feb 9 16:58:18 2009
New Revision: 188394
URL: http://svn.freebsd.org/changeset/base/188394
Log:
Do not self-initialize a variable.
Found with: Coverity Prevent(tm)
CID: 3864, 3865
Modified:
head/sys/dev/firewire/if_fwe.c
head/sys/dev/firewire/if_fwip.c
Modified: head/sys/dev/firewire/if_fwe.c
==
--- head/sys/dev/firewire/if_fwe.c Mon Feb 9 16:57:07 2009
(r188393)
+++ head/sys/dev/firewire/if_fwe.c Mon Feb 9 16:58:18 2009
(r188394)
@@ -445,7 +445,7 @@ fwe_ioctl(struct ifnet *ifp, u_long cmd,
#ifdef DEVICE_POLLING
{
struct ifreq *ifr = (struct ifreq *) data;
- struct firewire_comm *fc = fc = fwe->fd.fc;
+ struct firewire_comm *fc = fwe->fd.fc;
if (ifr->ifr_reqcap & IFCAP_POLLING &&
!(ifp->if_capenable & IFCAP_POLLING)) {
Modified: head/sys/dev/firewire/if_fwip.c
==
--- head/sys/dev/firewire/if_fwip.c Mon Feb 9 16:57:07 2009
(r188393)
+++ head/sys/dev/firewire/if_fwip.c Mon Feb 9 16:58:18 2009
(r188394)
@@ -427,7 +427,7 @@ fwip_ioctl(struct ifnet *ifp, u_long cmd
#ifdef DEVICE_POLLING
{
struct ifreq *ifr = (struct ifreq *) data;
- struct firewire_comm *fc = fc = fwip->fd.fc;
+ struct firewire_comm *fc = fwip->fd.fc;
if (ifr->ifr_reqcap & IFCAP_POLLING &&
!(ifp->if_capenable & IFCAP_POLLING)) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r188395 - head/sys/cam
Author: fjoe
Date: Mon Feb 9 17:02:54 2009
New Revision: 188395
URL: http://svn.freebsd.org/changeset/base/188395
Log:
cam_periph_alloc: fix "invalid periph name" error condition
Found with: Coverity Prevent(tm)
CID: 130
Modified:
head/sys/cam/cam_periph.c
Modified: head/sys/cam/cam_periph.c
==
--- head/sys/cam/cam_periph.c Mon Feb 9 16:58:18 2009(r188394)
+++ head/sys/cam/cam_periph.c Mon Feb 9 17:02:54 2009(r188395)
@@ -171,7 +171,7 @@ cam_periph_alloc(periph_ctor_t *periph_c
break;
}
xpt_unlock_buses();
- if (p_drv == NULL) {
+ if (*p_drv == NULL) {
printf("cam_periph_alloc: invalid periph name '%s'\n", name);
return (CAM_REQ_INVALID);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r188396 - head/sys/dev/de
Author: fjoe
Date: Mon Feb 9 17:07:29 2009
New Revision: 188396
URL: http://svn.freebsd.org/changeset/base/188396
Log:
tulip_busdma_cleanup: pass correct vaddr (2nd arg) to bus_dmamem_free()
Found with: Coverity Prevent(tm)
CID: 1998
Modified:
head/sys/dev/de/if_de.c
Modified: head/sys/dev/de/if_de.c
==
--- head/sys/dev/de/if_de.c Mon Feb 9 17:02:54 2009(r188395)
+++ head/sys/dev/de/if_de.c Mon Feb 9 17:07:29 2009(r188396)
@@ -4561,7 +4561,7 @@ tulip_busdma_cleanup(tulip_softc_t * con
sc->tulip_setup_dma_addr = 0;
}
if (sc->tulip_setupbuf != NULL) {
- bus_dmamem_free(sc->tulip_setup_tag, sc->tulip_setupdata,
+ bus_dmamem_free(sc->tulip_setup_tag, sc->tulip_setupbuf,
sc->tulip_setup_map);
sc->tulip_setup_map = NULL;
sc->tulip_setupbuf = NULL;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r231543 - head/sys/netgraph
Author: fjoe
Date: Sun Feb 12 05:14:12 2012
New Revision: 231543
URL: http://svn.freebsd.org/changeset/base/231543
Log:
- Use fixed-width integer types.
- Prefer to use C99 stdint types.
This fixes ng_cisco on 64-bit architectures.
MFC after:1 week
Modified:
head/sys/netgraph/ng_cisco.c
head/sys/netgraph/ng_cisco.h
Modified: head/sys/netgraph/ng_cisco.c
==
--- head/sys/netgraph/ng_cisco.cSun Feb 12 05:01:49 2012
(r231542)
+++ head/sys/netgraph/ng_cisco.cSun Feb 12 05:14:12 2012
(r231543)
@@ -75,33 +75,33 @@
#define KEEPALIVE_SECS 10
struct cisco_header {
- u_char address;
- u_char control;
- u_short protocol;
-};
+ uint8_t address;
+ uint8_t control;
+ uint16_t protocol;
+} __packed;
#defineCISCO_HEADER_LENsizeof (struct cisco_header)
struct cisco_packet {
- u_long type;
- u_long par1;
- u_long par2;
- u_short rel;
- u_short time0;
- u_short time1;
-};
+ uint32_t type;
+ uint32_t par1;
+ uint32_t par2;
+ uint16_t rel;
+ uint16_t time0;
+ uint16_t time1;
+} __packed;
#defineCISCO_PACKET_LEN (sizeof(struct cisco_packet))
struct protoent {
hook_p hook; /* the hook for this proto */
- u_short af; /* address family, -1 = downstream */
+ uint16_t af;/* address family, -1 = downstream */
};
struct cisco_priv {
- u_long local_seq;
- u_long remote_seq;
- u_long seqRetries; /* how many times we've been here throwing out
+ uint32_t local_seq;
+ uint32_t remote_seq;
+ uint32_t seqRetries;/* how many times we've been here throwing out
* the same sequence number without ack */
node_p node;
struct callout handle;
@@ -271,7 +271,7 @@ cisco_rcvmsg(node_p node, item_p item, h
pos = sprintf(arg,
"keepalive period: %d sec; ", KEEPALIVE_SECS);
pos += sprintf(arg + pos,
- "unacknowledged keepalives: %ld", sc->seqRetries);
+ "unacknowledged keepalives: %d", sc->seqRetries);
resp->header.arglen = pos + 1;
break;
}
@@ -603,7 +603,7 @@ cisco_send(sc_p sc, int type, long par1,
struct cisco_packet *ch;
struct mbuf *m;
struct timeval time;
- u_long t;
+ uint32_t t;
int error = 0;
getmicrouptime(&time);
@@ -626,8 +626,8 @@ cisco_send(sc_p sc, int type, long par1,
ch->par1 = htonl(par1);
ch->par2 = htonl(par2);
ch->rel = -1;
- ch->time0 = htons((u_short) (t >> 16));
- ch->time1 = htons((u_short) t);
+ ch->time0 = htons((uint16_t) (t >> 16));
+ ch->time1 = htons((uint16_t) t);
NG_SEND_DATA_ONLY(error, sc->downstream.hook, m);
return (error);
Modified: head/sys/netgraph/ng_cisco.h
==
--- head/sys/netgraph/ng_cisco.hSun Feb 12 05:01:49 2012
(r231542)
+++ head/sys/netgraph/ng_cisco.hSun Feb 12 05:14:12 2012
(r231543)
@@ -76,8 +76,8 @@ struct ng_cisco_ipaddr {
}
struct ng_cisco_stats {
- u_int32_t seqRetries; /* # unack'd retries */
- u_int32_t keepAlivePeriod;/* in seconds */
+ uint32_t seqRetries; /* # unack'd retries */
+ uint32_t keepAlivePeriod; /* in seconds */
};
/* Keep this in sync with the above structure definition */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r231544 - in head: tools/regression/usr.bin/make/execution/joberr usr.bin/make
Author: fjoe Date: Sun Feb 12 05:34:01 2012 New Revision: 231544 URL: http://svn.freebsd.org/changeset/base/231544 Log: Include target names in diagnostic output. Submitted by: Garrett Cooper Modified: head/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 head/usr.bin/make/job.c Modified: head/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 == --- head/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 Sun Feb 12 05:14:12 2012(r231543) +++ head/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 Sun Feb 12 05:34:01 2012(r231544) @@ -1,90 +1,90 @@ Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 +*** [do-check-joberr] Error code 1 Error: build failed -*** Error code 1 -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) -*** Error code 2 (ignored) +*** [do-check-joberr] Error code 1 +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-joberr] Error code 2 (ignored) +*** [check-job
svn commit: r231752 - stable/9/sys/netgraph
Author: fjoe
Date: Wed Feb 15 10:08:13 2012
New Revision: 231752
URL: http://svn.freebsd.org/changeset/base/231752
Log:
MFC: rev. 231543
- Use fixed-width integer types.
- Prefer to use C99 stdint types.
This fixes ng_cisco on 64-bit architectures.
Modified:
stable/9/sys/netgraph/ng_cisco.c
stable/9/sys/netgraph/ng_cisco.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netgraph/ng_cisco.c
==
--- stable/9/sys/netgraph/ng_cisco.cWed Feb 15 10:02:19 2012
(r231751)
+++ stable/9/sys/netgraph/ng_cisco.cWed Feb 15 10:08:13 2012
(r231752)
@@ -75,33 +75,33 @@
#define KEEPALIVE_SECS 10
struct cisco_header {
- u_char address;
- u_char control;
- u_short protocol;
-};
+ uint8_t address;
+ uint8_t control;
+ uint16_t protocol;
+} __packed;
#defineCISCO_HEADER_LENsizeof (struct cisco_header)
struct cisco_packet {
- u_long type;
- u_long par1;
- u_long par2;
- u_short rel;
- u_short time0;
- u_short time1;
-};
+ uint32_t type;
+ uint32_t par1;
+ uint32_t par2;
+ uint16_t rel;
+ uint16_t time0;
+ uint16_t time1;
+} __packed;
#defineCISCO_PACKET_LEN (sizeof(struct cisco_packet))
struct protoent {
hook_p hook; /* the hook for this proto */
- u_short af; /* address family, -1 = downstream */
+ uint16_t af;/* address family, -1 = downstream */
};
struct cisco_priv {
- u_long local_seq;
- u_long remote_seq;
- u_long seqRetries; /* how many times we've been here throwing out
+ uint32_t local_seq;
+ uint32_t remote_seq;
+ uint32_t seqRetries;/* how many times we've been here throwing out
* the same sequence number without ack */
node_p node;
struct callout handle;
@@ -271,7 +271,7 @@ cisco_rcvmsg(node_p node, item_p item, h
pos = sprintf(arg,
"keepalive period: %d sec; ", KEEPALIVE_SECS);
pos += sprintf(arg + pos,
- "unacknowledged keepalives: %ld", sc->seqRetries);
+ "unacknowledged keepalives: %d", sc->seqRetries);
resp->header.arglen = pos + 1;
break;
}
@@ -602,7 +602,7 @@ cisco_send(sc_p sc, int type, long par1,
struct cisco_packet *ch;
struct mbuf *m;
struct timeval time;
- u_long t;
+ uint32_t t;
int error = 0;
getmicrouptime(&time);
@@ -625,8 +625,8 @@ cisco_send(sc_p sc, int type, long par1,
ch->par1 = htonl(par1);
ch->par2 = htonl(par2);
ch->rel = -1;
- ch->time0 = htons((u_short) (t >> 16));
- ch->time1 = htons((u_short) t);
+ ch->time0 = htons((uint16_t) (t >> 16));
+ ch->time1 = htons((uint16_t) t);
NG_SEND_DATA_ONLY(error, sc->downstream.hook, m);
return (error);
Modified: stable/9/sys/netgraph/ng_cisco.h
==
--- stable/9/sys/netgraph/ng_cisco.hWed Feb 15 10:02:19 2012
(r231751)
+++ stable/9/sys/netgraph/ng_cisco.hWed Feb 15 10:08:13 2012
(r231752)
@@ -76,8 +76,8 @@ struct ng_cisco_ipaddr {
}
struct ng_cisco_stats {
- u_int32_t seqRetries; /* # unack'd retries */
- u_int32_t keepAlivePeriod;/* in seconds */
+ uint32_t seqRetries; /* # unack'd retries */
+ uint32_t keepAlivePeriod; /* in seconds */
};
/* Keep this in sync with the above structure definition */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r231753 - stable/8/sys/netgraph
Author: fjoe
Date: Wed Feb 15 10:15:15 2012
New Revision: 231753
URL: http://svn.freebsd.org/changeset/base/231753
Log:
MFC r231543:
- Use fixed-width integer types.
- Prefer to use C99 stdint types.
This fixes ng_cisco on 64-bit architectures.
Modified:
stable/8/sys/netgraph/ng_cisco.c
stable/8/sys/netgraph/ng_cisco.h
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/netgraph/ng_cisco.c
==
--- stable/8/sys/netgraph/ng_cisco.cWed Feb 15 10:08:13 2012
(r231752)
+++ stable/8/sys/netgraph/ng_cisco.cWed Feb 15 10:15:15 2012
(r231753)
@@ -75,33 +75,33 @@
#define KEEPALIVE_SECS 10
struct cisco_header {
- u_char address;
- u_char control;
- u_short protocol;
-};
+ uint8_t address;
+ uint8_t control;
+ uint16_t protocol;
+} __packed;
#defineCISCO_HEADER_LENsizeof (struct cisco_header)
struct cisco_packet {
- u_long type;
- u_long par1;
- u_long par2;
- u_short rel;
- u_short time0;
- u_short time1;
-};
+ uint32_t type;
+ uint32_t par1;
+ uint32_t par2;
+ uint16_t rel;
+ uint16_t time0;
+ uint16_t time1;
+} __packed;
#defineCISCO_PACKET_LEN (sizeof(struct cisco_packet))
struct protoent {
hook_p hook; /* the hook for this proto */
- u_short af; /* address family, -1 = downstream */
+ uint16_t af;/* address family, -1 = downstream */
};
struct cisco_priv {
- u_long local_seq;
- u_long remote_seq;
- u_long seqRetries; /* how many times we've been here throwing out
+ uint32_t local_seq;
+ uint32_t remote_seq;
+ uint32_t seqRetries;/* how many times we've been here throwing out
* the same sequence number without ack */
node_p node;
struct callout handle;
@@ -273,7 +273,7 @@ cisco_rcvmsg(node_p node, item_p item, h
pos = sprintf(arg,
"keepalive period: %d sec; ", KEEPALIVE_SECS);
pos += sprintf(arg + pos,
- "unacknowledged keepalives: %ld", sc->seqRetries);
+ "unacknowledged keepalives: %d", sc->seqRetries);
resp->header.arglen = pos + 1;
break;
}
@@ -604,7 +604,7 @@ cisco_send(sc_p sc, int type, long par1,
struct cisco_packet *ch;
struct mbuf *m;
struct timeval time;
- u_long t;
+ uint32_t t;
int error = 0;
getmicrouptime(&time);
@@ -627,8 +627,8 @@ cisco_send(sc_p sc, int type, long par1,
ch->par1 = htonl(par1);
ch->par2 = htonl(par2);
ch->rel = -1;
- ch->time0 = htons((u_short) (t >> 16));
- ch->time1 = htons((u_short) t);
+ ch->time0 = htons((uint16_t) (t >> 16));
+ ch->time1 = htons((uint16_t) t);
NG_SEND_DATA_ONLY(error, sc->downstream.hook, m);
return (error);
Modified: stable/8/sys/netgraph/ng_cisco.h
==
--- stable/8/sys/netgraph/ng_cisco.hWed Feb 15 10:08:13 2012
(r231752)
+++ stable/8/sys/netgraph/ng_cisco.hWed Feb 15 10:15:15 2012
(r231753)
@@ -76,8 +76,8 @@ struct ng_cisco_ipaddr {
}
struct ng_cisco_stats {
- u_int32_t seqRetries; /* # unack'd retries */
- u_int32_t keepAlivePeriod;/* in seconds */
+ uint32_t seqRetries; /* # unack'd retries */
+ uint32_t keepAlivePeriod; /* in seconds */
};
/* Keep this in sync with the above structure definition */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
