Defer evaluation of modified until after it's set
ClosedPublic
Actions

Authored by imp on May 31 2019, 3:01 PM.

Details

Reviewers

emaste
zeising

Commits

rS348486: Defer evaluation of modified until after it's set

Summary

With the reorg r348175, we now look at modified before it is
set. Rearrange things so that we can set include_metadata to either
yes, no or some variable to be evaluated in the future (in this case
modified). Use the eval echo trick to expanded it. This should fix the
-R flag that was broken in r348175, which broke
WITH_REPRODUCIBLE_BUILD for kernels.

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 24635
Build 23413: arc lint + arc unit

Event Timeline

imp created this revision.May 31 2019, 3:01 PM

Harbormaster completed remote builds in B24621: Diff 58112.May 31 2019, 3:01 PM

imp added reviewers: emaste, zeising.May 31 2019, 3:12 PM

No objection but I'm generally not a fan of the deferred evaluation; what about just setting include_metadata=yes/no/if-modified and making the test something like
if [${include_metadata} = yes || (${include_metadata} = if-modified && ${modified} = yes)]

Anyway if you prefer this approach that's fine with me

Fix per ed (though a little different construct)
Fix backwards test after converting from -z notation...

Harbormaster completed remote builds in B24635: Diff 58128.May 31 2019, 8:53 PM

In D20480#442157, @emaste wrote:

No objection but I'm generally not a fan of the deferred evaluation; what about just setting include_metadata=yes/no/if-modified and making the test something like
if [${include_metadata} = yes || (${include_metadata} = if-modified && ${modified} = yes)]

Anyway if you prefer this approach that's fine with me

Due to the funky way that test works, I opted for a slightly different way to say this...

This revision was not accepted when it landed; it landed in state Needs Review.May 31 2019, 10:57 PM

Closed by commit rS348486: Defer evaluation of modified until after it's set (authored by imp). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

sys/

conf/

newvers.sh

18 lines

Diff 58128

View Options

sys/conf/newvers.sh

Show First 20 Lines • Show All 275 Lines • ▼ Show 20 Lines	parse_pci_mem_ranges(struct generic_pcie_softc *sc)

OF_getencprop(node, "#address-cells", &pci_addr_cells,		OF_getencprop(node, "#address-cells", &pci_addr_cells,
sizeof(pci_addr_cells));		sizeof(pci_addr_cells));
OF_getencprop(node, "#size-cells", &size_cells,		OF_getencprop(node, "#size-cells", &size_cells,
sizeof(size_cells));		sizeof(size_cells));
OF_getencprop(OF_parent(node), "#address-cells", &parent_addr_cells,		OF_getencprop(OF_parent(node), "#address-cells", &parent_addr_cells,
sizeof(parent_addr_cells));		sizeof(parent_addr_cells));

if (parent_addr_cells != 2 \|\| pci_addr_cells != 3 \|\| size_cells != 2) {		if (parent_addr_cells > 2 \|\| pci_addr_cells != 3 \|\| size_cells > 2) {
device_printf(sc->dev,		device_printf(sc->dev,
"Unexpected number of address or size cells in FDT\n");		"Unexpected number of address or size cells in FDT\n");
return (ENXIO);		return (ENXIO);
}		}

nbase_ranges = OF_getproplen(node, "ranges");		nbase_ranges = OF_getproplen(node, "ranges");
sc->nranges = nbase_ranges / sizeof(cell_t) /		sc->nranges = nbase_ranges / sizeof(cell_t) /
(parent_addr_cells + pci_addr_cells + size_cells);		(parent_addr_cells + pci_addr_cells + size_cells);
▲ Show 20 Lines • Show All 689 Lines • Show Last 20 Lines

Defer evaluation of modified until after it's setClosedPublicActions