diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/systemd-older-kernel.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch b/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch new file mode 100644 index 0000000000..18b50e797a --- /dev/null +++ b/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 6109f02dcc4f2d7a461c5772bab494f5753a2203 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 29 May 2014 08:09:07 +0000 | ||
4 | Subject: [PATCH] rtnl-types.c: check IFLA_VLAN_PROTOCOL | ||
5 | |||
6 | The older kernel's linux/if_link.h doesn't have IFLA_VLAN_PROTOCOL, we need | ||
7 | check whether it has been defined or not. | ||
8 | |||
9 | The maintainer said that he would fix it: | ||
10 | |||
11 | http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/18200 | ||
12 | |||
13 | Also we need redefine IFLA_MAX from 34 to 35 when define IFLA_CARRIER, | ||
14 | otherwise there would be error: | ||
15 | |||
16 | | src/libsystemd/sd-rtnl/rtnl-types.c:233:9: error: array index in initializer exceeds array bounds | ||
17 | | [IFLA_CARRIER] = { .type = NLA_U8 }, | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
22 | --- | ||
23 | src/libsystemd/sd-rtnl/rtnl-types.c | 2 ++ | ||
24 | src/shared/missing.h | 2 ++ | ||
25 | 2 files changed, 4 insertions(+) | ||
26 | |||
27 | diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c | ||
28 | index 44ac5ec..ab6161f 100644 | ||
29 | --- a/src/libsystemd/sd-rtnl/rtnl-types.c | ||
30 | +++ b/src/libsystemd/sd-rtnl/rtnl-types.c | ||
31 | @@ -67,7 +67,9 @@ static const NLType rtnl_link_info_data_vlan_types[IFLA_VLAN_MAX + 1] = { | ||
32 | [IFLA_VLAN_EGRESS_QOS] = { .type = NLA_NESTED }, | ||
33 | [IFLA_VLAN_INGRESS_QOS] = { .type = NLA_NESTED }, | ||
34 | */ | ||
35 | +#ifdef IFLA_VLAN_PROTOCOL | ||
36 | [IFLA_VLAN_PROTOCOL] = { .type = NLA_U16 }, | ||
37 | +#endif | ||
38 | }; | ||
39 | |||
40 | static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + 1] = { | ||
41 | diff --git a/src/shared/missing.h b/src/shared/missing.h | ||
42 | index d5ec2f8..732853f 100644 | ||
43 | --- a/src/shared/missing.h | ||
44 | +++ b/src/shared/missing.h | ||
45 | @@ -94,6 +94,8 @@ | ||
46 | |||
47 | #ifndef IFLA_CARRIER | ||
48 | #define IFLA_CARRIER 33 | ||
49 | + #undef IFLA_MAX | ||
50 | + #define IFLA_MAX 35 | ||
51 | #ifndef IFLA_NUM_RX_QUEUES | ||
52 | #define IFLA_NUM_RX_QUEUES 32 | ||
53 | #ifndef IFLA_NUM_TX_QUEUES | ||
54 | -- | ||
55 | 1.8.3.4 | ||
56 | |||