copy-builtin cannot be run more than once against the same target tree

[infowolfe]

line 119 of copy-builtin:
sed -i 's#+= kernel/#+= kernel/ spl/#' "$KERNEL_DIR/Makefile"
results in line 887 of /usr/src/linux/Makefile:
core-y += kernel/ spl/ spl/ mm/ fs/ ipc/ security/ crypto/ block/
upon make:
`Makefile:946: target 'spl' given more than once in the same rule``

something like
grep 'kernel/ spl/' "$KERNEL_DIR/Makefile" || sed -i 's#+= kernel/#+= kernel/ spl/#' "$KERNEL_DIR/Makefile"
is completely inelegant, but would fix this.

[behlendorf]

Good point, I'm a little surprised this hasn't come up until now. Your fix looks reasonable to me and is similar to what add_after() does. It's not elegant, but it's definitely functional. Could you please open a pull request with your proposed fix so we can get it tested and reviewed.

[infowolfe]

Is there some reason why we're not just using add_after() in this case?

[behlendorf]

Yes, because we need to modify an existing line and not insert a new one.

[infowolfe]

Hence the why the PR makes the sed less fragile instead of replacing it with add_after.

[behlendorf]

I must have misunderstood your previous comment, yes the fix looks good.

[simonvanderveldt]

Wouldn't it be cleaner to add spl to core-y on a separate line?
That way you could check if the line you've added exists and that's it. Now you have to check a line that already exists and you have no control over.

Expected result in the Makefile:

core-y      += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ <whatever upstream adds>
core-y      += spl/

[behlendorf]

@simonvanderveldt that would be cleaner but there's a dependency issue. The spl directory must be built before the fs directory but after kernel and mm.

[simonvanderveldt]

@behlendorf ah, didn't know that, that's annoying/unfortunate. Not much we can do about it then.