| 1 |
On 01/21/2017 11:59 PM, Michał Górny wrote: |
| 2 |
> Include arch/amd64/no-multilib in the hardened no-multilib amd64 |
| 3 |
> variant. Confirmed with profile-dumper that it does not currently change |
| 4 |
> anything. |
| 5 |
> --- |
| 6 |
> profiles/hardened/linux/amd64/no-multilib/parent | 1 + |
| 7 |
> 1 file changed, 1 insertion(+) |
| 8 |
> |
| 9 |
> diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent |
| 10 |
> index 8305c3556463..0defac31415d 100644 |
| 11 |
> --- a/profiles/hardened/linux/amd64/no-multilib/parent |
| 12 |
> +++ b/profiles/hardened/linux/amd64/no-multilib/parent |
| 13 |
> @@ -1,2 +1,3 @@ |
| 14 |
> +../../../../arch/amd64/no-multilib |
| 15 |
> .. |
| 16 |
> |
| 17 |
|
| 18 |
As hardened/linux/amd64 does inherit arch/amd64, this way arch/amd64 |
| 19 |
always overrides arch/amd64/no-multilib, rendering the latter useless. |
| 20 |
|
| 21 |
Instead, profiles/hardened/linux/amd64/no-multilib/parent should read: |
| 22 |
.. |
| 23 |
../../../../arch/amd64/no-multilib |
| 24 |
|
| 25 |
Beyond that: |
| 26 |
While arch/amd64/no-multilib of course _is_ an override to arch/amd64, |
| 27 |
question is whether it also should _perform_ the override by itself. |
| 28 |
|
| 29 |
Currently it does perform the override, causing lots of subsequent profiles |
| 30 |
to end up with arch/amd64 inherited multiple times - most prominent is the |
| 31 |
default/linux/amd64/13.0/no-multilib profile. |
| 32 |
|
| 33 |
So removing arch/amd64/no-multilib/parent would simplify things here. |
| 34 |
|
| 35 |
Thoughts? |
| 36 |
/haubi/ |
Archives