Page MenuHomeFreeBSD
Differential D10110

fix detection of zlib sources, fix on -CURRENT
ClosedPublic
Actions

Authored by ler on Mar 23 2017, 12:42 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 15, 11:00 PM
Unknown Object (File)
Feb 16 2025, 6:16 AM
Unknown Object (File)
Feb 15 2025, 6:51 PM
Unknown Object (File)
Feb 5 2025, 5:15 PM
Unknown Object (File)
Feb 4 2025, 5:02 AM
Unknown Object (File)
Dec 11 2024, 8:03 PM
Unknown Object (File)
Dec 8 2024, 9:42 AM
Unknown Object (File)
Nov 23 2024, 10:31 PM
View All 84 Files
Subscribers
mat

Details

Reviewers
adamw
rene
Commits
rP436749: fix finding of the zlib sources.
Summary

fix finding of the zlib sources.

PR: 216212
Submitted By: amdmi3
Approved by: fernando.apesteguia@gmail.com, phk, adamw (mentor)

Test Plan

poudriere (12, 11)
http://home.lerctr.org:8888/build.html?mastername=p110amd64-ler-checkout&build=2017-03-22_19h35m56s
http://home.lerctr.org:8888/build.html?mastername=live-ler-checkout&build=2017-03-22_19h31m04s

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ler created this revision.Mar 23 2017, 12:42 AM
Herald added a subscriber: mat. · View Herald TranscriptMar 23 2017, 12:42 AM
Harbormaster completed remote builds in B8235: Diff 26577.Mar 23 2017, 12:42 AM
adamw edited edge metadata.Mar 23 2017, 12:44 AM

Did you mean to delete virtualbox patches in this review?

ler edited the summary of this revision. (Show Details)Mar 23 2017, 12:45 AM
ler added a comment.Mar 23 2017, 1:07 AM

No. I could re-check out my tree, and the commit would be in the opennurbs directory.

ler updated this revision to Diff 26580.Mar 23 2017, 1:12 AM

fix errouneous VirtualBox patch deletes

Harbormaster completed remote builds in B8238: Diff 26580.Mar 23 2017, 1:12 AM
adamw accepted this revision.Mar 23 2017, 1:16 AM

Other than that trailing slash, this looks good.

For your commit message, put @phk as a reviewer, not approver.

graphics/opennurbs/Makefile
45 ↗(On Diff #26580)

For consistency, please remove the trailing slash. None of the other commands have it.

This revision is now accepted and ready to land.Mar 23 2017, 1:16 AM
Closed by commit rP436749: fix finding of the zlib sources. (authored by ler). · Explain WhyMar 23 2017, 1:27 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
graphics/
opennurbs/
60 lines
files/
2 lines
29 lines

Diff 26581

View Options

head/graphics/opennurbs/Makefile

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines
#include <vm/vm_pager.h> #include <vm/vm_pager.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/intr.h> #include <machine/intr.h>
#include <machine/kdb.h> #include <machine/kdb.h>
#include <machine/machdep.h> #include <machine/machdep.h>
#include <machine/metadata.h> #include <machine/metadata.h>
#include <machine/pcb.h> #include <machine/pcb.h>
#include <machine/pte.h>
#include <machine/reg.h> #include <machine/reg.h>
#include <machine/riscvreg.h> #include <machine/riscvreg.h>
#include <machine/sbi.h> #include <machine/sbi.h>
#include <machine/trap.h> #include <machine/trap.h>
#include <machine/vmparam.h> #include <machine/vmparam.h>
#ifdef FPE #ifdef FPE
#include <machine/fpe.h> #include <machine/fpe.h>
▲ Show 20 Lines • Show All 727 Lines • ▼ Show 20 Linesinitriscv(struct riscv_bootparams *rvbp)
boothowto = RB_VERBOSE | RB_SINGLE; boothowto = RB_VERBOSE | RB_SINGLE;
boothowto = RB_VERBOSE; boothowto = RB_VERBOSE;
kern_envp = NULL; kern_envp = NULL;
#ifdef FDT #ifdef FDT
try_load_dtb(kmdp); try_load_dtb(kmdp);
/*
* Exclude reserved memory specified by the device tree. Typically,
* this contains an entry for memory used by the runtime SBI firmware.
*/
if (fdt_get_reserved_mem(mem_regions, &mem_regions_sz) == 0) {
physmem_exclude_regions(mem_regions, mem_regions_sz,
EXFLAG_NODUMP | EXFLAG_NOALLOC);
}
/* Grab physical memory regions information from device tree. */ /* Grab physical memory regions information from device tree. */
if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, NULL) != 0) if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, NULL) != 0) {
panic("Cannot get physical memory regions"); panic("Cannot get physical memory regions");
}
physmem_hardware_regions(mem_regions, mem_regions_sz); physmem_hardware_regions(mem_regions, mem_regions_sz);
#endif #endif
/* Do basic tuning, hz etc */ /* Do basic tuning, hz etc */
init_param1(); init_param1();
cache_setup(); cache_setup();
markjUnsubmitted
Not Done
Inline Actions

I wouldn't omit braces here, since the if and else bodies span multiple lines.

markj: I wouldn't omit braces here, since the if and else bodies span multiple lines.
/* Bootstrap enough of pmap to enter the kernel proper */ /* Bootstrap enough of pmap to enter the kernel proper */
kernlen = (lastaddr - KERNBASE); kernlen = (lastaddr - KERNBASE);
pmap_bootstrap(rvbp->kern_l1pt, mem_regions[0].mr_start, kernlen); pmap_bootstrap(rvbp->kern_l1pt, mem_regions[0].mr_start, kernlen);
physmem_init_kernel_globals(); physmem_init_kernel_globals();
#ifdef FDT
/*
* XXX: Exclude the lowest 2MB of physical memory, if it hasn't been
* already, as this area is assumed to contain the SBI firmware. This
* is a little fragile, but it is consistent with the platforms we
* support so far.
*
* TODO: remove this when the all regular booting methods properly
* report their reserved memory in the device tree.
*/
if (mem_regions[0].mr_start == physmap[0]) {
physmem_exclude_region(mem_regions[0].mr_start, L2_SIZE,
EXFLAG_NODUMP | EXFLAG_NOALLOC);
}
#endif
/* Establish static device mappings */ /* Establish static device mappings */
devmap_bootstrap(0, NULL); devmap_bootstrap(0, NULL);
cninit(); cninit();
init_proc0(rvbp->kern_stack); init_proc0(rvbp->kern_stack);
Show All 23 Lines
View Options

head/graphics/opennurbs/files/patch-opennurbs__system.h

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines
#include <vm/vm_pager.h> #include <vm/vm_pager.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/intr.h> #include <machine/intr.h>
#include <machine/kdb.h> #include <machine/kdb.h>
#include <machine/machdep.h> #include <machine/machdep.h>
#include <machine/metadata.h> #include <machine/metadata.h>
#include <machine/pcb.h> #include <machine/pcb.h>
#include <machine/pte.h>
#include <machine/reg.h> #include <machine/reg.h>
#include <machine/riscvreg.h> #include <machine/riscvreg.h>
#include <machine/sbi.h> #include <machine/sbi.h>
#include <machine/trap.h> #include <machine/trap.h>
#include <machine/vmparam.h> #include <machine/vmparam.h>
#ifdef FPE #ifdef FPE
#include <machine/fpe.h> #include <machine/fpe.h>
▲ Show 20 Lines • Show All 727 Lines • ▼ Show 20 Linesinitriscv(struct riscv_bootparams *rvbp)
boothowto = RB_VERBOSE | RB_SINGLE; boothowto = RB_VERBOSE | RB_SINGLE;
boothowto = RB_VERBOSE; boothowto = RB_VERBOSE;
kern_envp = NULL; kern_envp = NULL;
#ifdef FDT #ifdef FDT
try_load_dtb(kmdp); try_load_dtb(kmdp);
/*
* Exclude reserved memory specified by the device tree. Typically,
* this contains an entry for memory used by the runtime SBI firmware.
*/
if (fdt_get_reserved_mem(mem_regions, &mem_regions_sz) == 0) {
physmem_exclude_regions(mem_regions, mem_regions_sz,
EXFLAG_NODUMP | EXFLAG_NOALLOC);
}
/* Grab physical memory regions information from device tree. */ /* Grab physical memory regions information from device tree. */
if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, NULL) != 0) if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, NULL) != 0) {
panic("Cannot get physical memory regions"); panic("Cannot get physical memory regions");
}
physmem_hardware_regions(mem_regions, mem_regions_sz); physmem_hardware_regions(mem_regions, mem_regions_sz);
#endif #endif
/* Do basic tuning, hz etc */ /* Do basic tuning, hz etc */
init_param1(); init_param1();
cache_setup(); cache_setup();
markjUnsubmitted
Not Done
Inline Actions

I wouldn't omit braces here, since the if and else bodies span multiple lines.

markj: I wouldn't omit braces here, since the if and else bodies span multiple lines.
/* Bootstrap enough of pmap to enter the kernel proper */ /* Bootstrap enough of pmap to enter the kernel proper */
kernlen = (lastaddr - KERNBASE); kernlen = (lastaddr - KERNBASE);
pmap_bootstrap(rvbp->kern_l1pt, mem_regions[0].mr_start, kernlen); pmap_bootstrap(rvbp->kern_l1pt, mem_regions[0].mr_start, kernlen);
physmem_init_kernel_globals(); physmem_init_kernel_globals();
#ifdef FDT
/*
* XXX: Exclude the lowest 2MB of physical memory, if it hasn't been
* already, as this area is assumed to contain the SBI firmware. This
* is a little fragile, but it is consistent with the platforms we
* support so far.
*
* TODO: remove this when the all regular booting methods properly
* report their reserved memory in the device tree.
*/
if (mem_regions[0].mr_start == physmap[0]) {
physmem_exclude_region(mem_regions[0].mr_start, L2_SIZE,
EXFLAG_NODUMP | EXFLAG_NOALLOC);
}
#endif
/* Establish static device mappings */ /* Establish static device mappings */
devmap_bootstrap(0, NULL); devmap_bootstrap(0, NULL);
cninit(); cninit();
init_proc0(rvbp->kern_stack); init_proc0(rvbp->kern_stack);
Show All 23 Lines
View Options

head/graphics/opennurbs/pkg-plist

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines
#include <vm/vm_pager.h> #include <vm/vm_pager.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/intr.h> #include <machine/intr.h>
#include <machine/kdb.h> #include <machine/kdb.h>
#include <machine/machdep.h> #include <machine/machdep.h>
#include <machine/metadata.h> #include <machine/metadata.h>
#include <machine/pcb.h> #include <machine/pcb.h>
#include <machine/pte.h>
#include <machine/reg.h> #include <machine/reg.h>
#include <machine/riscvreg.h> #include <machine/riscvreg.h>
#include <machine/sbi.h> #include <machine/sbi.h>
#include <machine/trap.h> #include <machine/trap.h>
#include <machine/vmparam.h> #include <machine/vmparam.h>
#ifdef FPE #ifdef FPE
#include <machine/fpe.h> #include <machine/fpe.h>
▲ Show 20 Lines • Show All 727 Lines • ▼ Show 20 Linesinitriscv(struct riscv_bootparams *rvbp)
boothowto = RB_VERBOSE | RB_SINGLE; boothowto = RB_VERBOSE | RB_SINGLE;
boothowto = RB_VERBOSE; boothowto = RB_VERBOSE;
kern_envp = NULL; kern_envp = NULL;
#ifdef FDT #ifdef FDT
try_load_dtb(kmdp); try_load_dtb(kmdp);
/*
* Exclude reserved memory specified by the device tree. Typically,
* this contains an entry for memory used by the runtime SBI firmware.
*/
if (fdt_get_reserved_mem(mem_regions, &mem_regions_sz) == 0) {
physmem_exclude_regions(mem_regions, mem_regions_sz,
EXFLAG_NODUMP | EXFLAG_NOALLOC);
}
/* Grab physical memory regions information from device tree. */ /* Grab physical memory regions information from device tree. */
if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, NULL) != 0) if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, NULL) != 0) {
panic("Cannot get physical memory regions"); panic("Cannot get physical memory regions");
}
physmem_hardware_regions(mem_regions, mem_regions_sz); physmem_hardware_regions(mem_regions, mem_regions_sz);
#endif #endif
/* Do basic tuning, hz etc */ /* Do basic tuning, hz etc */
init_param1(); init_param1();
cache_setup(); cache_setup();
markjUnsubmitted
Not Done
Inline Actions

I wouldn't omit braces here, since the if and else bodies span multiple lines.

markj: I wouldn't omit braces here, since the if and else bodies span multiple lines.
/* Bootstrap enough of pmap to enter the kernel proper */ /* Bootstrap enough of pmap to enter the kernel proper */
kernlen = (lastaddr - KERNBASE); kernlen = (lastaddr - KERNBASE);
pmap_bootstrap(rvbp->kern_l1pt, mem_regions[0].mr_start, kernlen); pmap_bootstrap(rvbp->kern_l1pt, mem_regions[0].mr_start, kernlen);
physmem_init_kernel_globals(); physmem_init_kernel_globals();
#ifdef FDT
/*
* XXX: Exclude the lowest 2MB of physical memory, if it hasn't been
* already, as this area is assumed to contain the SBI firmware. This
* is a little fragile, but it is consistent with the platforms we
* support so far.
*
* TODO: remove this when the all regular booting methods properly
* report their reserved memory in the device tree.
*/
if (mem_regions[0].mr_start == physmap[0]) {
physmem_exclude_region(mem_regions[0].mr_start, L2_SIZE,
EXFLAG_NODUMP | EXFLAG_NOALLOC);
}
#endif
/* Establish static device mappings */ /* Establish static device mappings */
devmap_bootstrap(0, NULL); devmap_bootstrap(0, NULL);
cninit(); cninit();
init_proc0(rvbp->kern_stack); init_proc0(rvbp->kern_stack);
Show All 23 Lines