* [PATCH V3 0/1] systemd: upgrade to 215
@ 2014-07-29 2:12 Chen Qi
2014-07-29 2:12 ` [PATCH V3 1/1] " Chen Qi
0 siblings, 1 reply; 5+ messages in thread
From: Chen Qi @ 2014-07-29 2:12 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 58f08a96764094189b5aaf3cc8b4cc0c95e23409:
gst-ffmpeg: Add CVE patches (2014-07-23 21:57:04 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd_215
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd_215
Chen Qi (1):
systemd: upgrade to 215
.../systemd/systemd/systemd-older-kernel.patch | 56 --------------------
.../systemd/{systemd_213.bb => systemd_215.bb} | 8 +--
2 files changed, 4 insertions(+), 60 deletions(-)
delete mode 100644 meta/recipes-core/systemd/systemd/systemd-older-kernel.patch
rename meta/recipes-core/systemd/{systemd_213.bb => systemd_215.bb} (99%)
--
1.7.9.5
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH V3 1/1] systemd: upgrade to 215 2014-07-29 2:12 [PATCH V3 0/1] systemd: upgrade to 215 Chen Qi @ 2014-07-29 2:12 ` Chen Qi 2014-07-29 4:19 ` Saul Wold 2014-07-30 5:41 ` Koen Kooi 0 siblings, 2 replies; 5+ messages in thread From: Chen Qi @ 2014-07-29 2:12 UTC (permalink / raw) To: openembedded-core Upgrade systemd from 213 to 215. systemd-older-kernel.patch is removed as it's fixed in 215. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- .../systemd/systemd/systemd-older-kernel.patch | 56 -------------------- .../systemd/{systemd_213.bb => systemd_215.bb} | 8 +-- 2 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/systemd-older-kernel.patch rename meta/recipes-core/systemd/{systemd_213.bb => systemd_215.bb} (99%) diff --git a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch b/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch deleted file mode 100644 index 18b50e7..0000000 --- a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6109f02dcc4f2d7a461c5772bab494f5753a2203 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 29 May 2014 08:09:07 +0000 -Subject: [PATCH] rtnl-types.c: check IFLA_VLAN_PROTOCOL - -The older kernel's linux/if_link.h doesn't have IFLA_VLAN_PROTOCOL, we need -check whether it has been defined or not. - -The maintainer said that he would fix it: - -http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/18200 - -Also we need redefine IFLA_MAX from 34 to 35 when define IFLA_CARRIER, -otherwise there would be error: - -| src/libsystemd/sd-rtnl/rtnl-types.c:233:9: error: array index in initializer exceeds array bounds -| [IFLA_CARRIER] = { .type = NLA_U8 }, - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - src/libsystemd/sd-rtnl/rtnl-types.c | 2 ++ - src/shared/missing.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c -index 44ac5ec..ab6161f 100644 ---- a/src/libsystemd/sd-rtnl/rtnl-types.c -+++ b/src/libsystemd/sd-rtnl/rtnl-types.c -@@ -67,7 +67,9 @@ static const NLType rtnl_link_info_data_vlan_types[IFLA_VLAN_MAX + 1] = { - [IFLA_VLAN_EGRESS_QOS] = { .type = NLA_NESTED }, - [IFLA_VLAN_INGRESS_QOS] = { .type = NLA_NESTED }, - */ -+#ifdef IFLA_VLAN_PROTOCOL - [IFLA_VLAN_PROTOCOL] = { .type = NLA_U16 }, -+#endif - }; - - static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + 1] = { -diff --git a/src/shared/missing.h b/src/shared/missing.h -index d5ec2f8..732853f 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -94,6 +94,8 @@ - - #ifndef IFLA_CARRIER - #define IFLA_CARRIER 33 -+ #undef IFLA_MAX -+ #define IFLA_MAX 35 - #ifndef IFLA_NUM_RX_QUEUES - #define IFLA_NUM_RX_QUEUES 32 - #ifndef IFLA_NUM_TX_QUEUES --- -1.8.3.4 - diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_215.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_213.bb rename to meta/recipes-core/systemd/systemd_215.bb index 5de7cdc..b1ffbdd 100644 --- a/meta/recipes-core/systemd/systemd_213.bb +++ b/meta/recipes-core/systemd/systemd_215.bb @@ -17,9 +17,9 @@ SECTION = "base/shell" inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest -SRCREV = "c9679c652b3c31f2510e8805d81630680ebc7e95" +SRCREV = "252ff40a3827b4e8e62e03a5e2f80da3fe02bee6" -PV = "213+git${SRCPV}" +PV = "215+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \ file://binfmt-install.patch \ @@ -35,8 +35,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= file://00-create-volatile.conf \ file://init \ file://run-ptest \ - file://systemd-older-kernel.patch \ - " + " S = "${WORKDIR}/git" @@ -231,6 +230,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${exec_prefix}/lib/systemd \ ${exec_prefix}/lib/modules-load.d \ ${exec_prefix}/lib/sysctl.d \ + ${exec_prefix}/lib/sysusers.d \ ${localstatedir} \ /lib/udev/rules.d/70-uaccess.rules \ /lib/udev/rules.d/71-seat.rules \ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V3 1/1] systemd: upgrade to 215 2014-07-29 2:12 ` [PATCH V3 1/1] " Chen Qi @ 2014-07-29 4:19 ` Saul Wold 2014-07-29 5:49 ` ChenQi 2014-07-30 5:41 ` Koen Kooi 1 sibling, 1 reply; 5+ messages in thread From: Saul Wold @ 2014-07-29 4:19 UTC (permalink / raw) To: Chen Qi, openembedded-core On 07/28/2014 07:12 PM, Chen Qi wrote: > Upgrade systemd from 213 to 215. > > systemd-older-kernel.patch is removed as it's fixed in 215. > I had a failure like this from the V2 Patch, has this been addressed: > | cc1: warning: ./src/core: No such file or directory > | make[1]: *** [all-recursive] Error 1 > | make: *** [all] Error 2 > | ERROR: oe_runmake failed > | WARNING: /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_215+gitAUTOINC+252ff40a38-r0/temp/run.do_compile.687:1 exit 1 from > | exit 1 > | ERROR: Function failed: do_compile (log file is located at /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_215+gitAUTOINC+252ff40a38-r0/temp/log.do_compile.687) Sau! > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > .../systemd/systemd/systemd-older-kernel.patch | 56 -------------------- > .../systemd/{systemd_213.bb => systemd_215.bb} | 8 +-- > 2 files changed, 4 insertions(+), 60 deletions(-) > delete mode 100644 meta/recipes-core/systemd/systemd/systemd-older-kernel.patch > rename meta/recipes-core/systemd/{systemd_213.bb => systemd_215.bb} (99%) > > diff --git a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch b/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch > deleted file mode 100644 > index 18b50e7..0000000 > --- a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch > +++ /dev/null > @@ -1,56 +0,0 @@ > -From 6109f02dcc4f2d7a461c5772bab494f5753a2203 Mon Sep 17 00:00:00 2001 > -From: Robert Yang <liezhi.yang@windriver.com> > -Date: Thu, 29 May 2014 08:09:07 +0000 > -Subject: [PATCH] rtnl-types.c: check IFLA_VLAN_PROTOCOL > - > -The older kernel's linux/if_link.h doesn't have IFLA_VLAN_PROTOCOL, we need > -check whether it has been defined or not. > - > -The maintainer said that he would fix it: > - > -http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/18200 > - > -Also we need redefine IFLA_MAX from 34 to 35 when define IFLA_CARRIER, > -otherwise there would be error: > - > -| src/libsystemd/sd-rtnl/rtnl-types.c:233:9: error: array index in initializer exceeds array bounds > -| [IFLA_CARRIER] = { .type = NLA_U8 }, > - > -Upstream-Status: Pending > - > -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> > ---- > - src/libsystemd/sd-rtnl/rtnl-types.c | 2 ++ > - src/shared/missing.h | 2 ++ > - 2 files changed, 4 insertions(+) > - > -diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c > -index 44ac5ec..ab6161f 100644 > ---- a/src/libsystemd/sd-rtnl/rtnl-types.c > -+++ b/src/libsystemd/sd-rtnl/rtnl-types.c > -@@ -67,7 +67,9 @@ static const NLType rtnl_link_info_data_vlan_types[IFLA_VLAN_MAX + 1] = { > - [IFLA_VLAN_EGRESS_QOS] = { .type = NLA_NESTED }, > - [IFLA_VLAN_INGRESS_QOS] = { .type = NLA_NESTED }, > - */ > -+#ifdef IFLA_VLAN_PROTOCOL > - [IFLA_VLAN_PROTOCOL] = { .type = NLA_U16 }, > -+#endif > - }; > - > - static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + 1] = { > -diff --git a/src/shared/missing.h b/src/shared/missing.h > -index d5ec2f8..732853f 100644 > ---- a/src/shared/missing.h > -+++ b/src/shared/missing.h > -@@ -94,6 +94,8 @@ > - > - #ifndef IFLA_CARRIER > - #define IFLA_CARRIER 33 > -+ #undef IFLA_MAX > -+ #define IFLA_MAX 35 > - #ifndef IFLA_NUM_RX_QUEUES > - #define IFLA_NUM_RX_QUEUES 32 > - #ifndef IFLA_NUM_TX_QUEUES > --- > -1.8.3.4 > - > diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_215.bb > similarity index 99% > rename from meta/recipes-core/systemd/systemd_213.bb > rename to meta/recipes-core/systemd/systemd_215.bb > index 5de7cdc..b1ffbdd 100644 > --- a/meta/recipes-core/systemd/systemd_213.bb > +++ b/meta/recipes-core/systemd/systemd_215.bb > @@ -17,9 +17,9 @@ SECTION = "base/shell" > > inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest > > -SRCREV = "c9679c652b3c31f2510e8805d81630680ebc7e95" > +SRCREV = "252ff40a3827b4e8e62e03a5e2f80da3fe02bee6" > > -PV = "213+git${SRCPV}" > +PV = "215+git${SRCPV}" > > SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \ > file://binfmt-install.patch \ > @@ -35,8 +35,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= > file://00-create-volatile.conf \ > file://init \ > file://run-ptest \ > - file://systemd-older-kernel.patch \ > - " > + " > > S = "${WORKDIR}/git" > > @@ -231,6 +230,7 @@ FILES_${PN} = " ${base_bindir}/* \ > ${exec_prefix}/lib/systemd \ > ${exec_prefix}/lib/modules-load.d \ > ${exec_prefix}/lib/sysctl.d \ > + ${exec_prefix}/lib/sysusers.d \ > ${localstatedir} \ > /lib/udev/rules.d/70-uaccess.rules \ > /lib/udev/rules.d/71-seat.rules \ > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V3 1/1] systemd: upgrade to 215 2014-07-29 4:19 ` Saul Wold @ 2014-07-29 5:49 ` ChenQi 0 siblings, 0 replies; 5+ messages in thread From: ChenQi @ 2014-07-29 5:49 UTC (permalink / raw) To: Saul Wold, openembedded-core On 07/29/2014 12:19 PM, Saul Wold wrote: > On 07/28/2014 07:12 PM, Chen Qi wrote: >> Upgrade systemd from 213 to 215. >> >> systemd-older-kernel.patch is removed as it's fixed in 215. >> > > I had a failure like this from the V2 Patch, has this been addressed: > No. I haven't seen this error. Could you give me a link to the whole error log? Best Regards, Chen Qi >> | cc1: warning: ./src/core: No such file or directory >> | make[1]: *** [all-recursive] Error 1 >> | make: *** [all] Error 2 >> | ERROR: oe_runmake failed >> | WARNING: >> /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_215+gitAUTOINC+252ff40a38-r0/temp/run.do_compile.687:1 >> exit 1 from >> | exit 1 >> | ERROR: Function failed: do_compile (log file is located at >> /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_215+gitAUTOINC+252ff40a38-r0/temp/log.do_compile.687) > > > Sau! > >> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> >> --- >> .../systemd/systemd/systemd-older-kernel.patch | 56 >> -------------------- >> .../systemd/{systemd_213.bb => systemd_215.bb} | 8 +-- >> 2 files changed, 4 insertions(+), 60 deletions(-) >> delete mode 100644 >> meta/recipes-core/systemd/systemd/systemd-older-kernel.patch >> rename meta/recipes-core/systemd/{systemd_213.bb => systemd_215.bb} >> (99%) >> >> diff --git >> a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch >> b/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch >> deleted file mode 100644 >> index 18b50e7..0000000 >> --- a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch >> +++ /dev/null >> @@ -1,56 +0,0 @@ >> -From 6109f02dcc4f2d7a461c5772bab494f5753a2203 Mon Sep 17 00:00:00 2001 >> -From: Robert Yang <liezhi.yang@windriver.com> >> -Date: Thu, 29 May 2014 08:09:07 +0000 >> -Subject: [PATCH] rtnl-types.c: check IFLA_VLAN_PROTOCOL >> - >> -The older kernel's linux/if_link.h doesn't have IFLA_VLAN_PROTOCOL, >> we need >> -check whether it has been defined or not. >> - >> -The maintainer said that he would fix it: >> - >> -http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/18200 >> - >> -Also we need redefine IFLA_MAX from 34 to 35 when define IFLA_CARRIER, >> -otherwise there would be error: >> - >> -| src/libsystemd/sd-rtnl/rtnl-types.c:233:9: error: array index in >> initializer exceeds array bounds >> -| [IFLA_CARRIER] = { .type = NLA_U8 }, >> - >> -Upstream-Status: Pending >> - >> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> >> ---- >> - src/libsystemd/sd-rtnl/rtnl-types.c | 2 ++ >> - src/shared/missing.h | 2 ++ >> - 2 files changed, 4 insertions(+) >> - >> -diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c >> b/src/libsystemd/sd-rtnl/rtnl-types.c >> -index 44ac5ec..ab6161f 100644 >> ---- a/src/libsystemd/sd-rtnl/rtnl-types.c >> -+++ b/src/libsystemd/sd-rtnl/rtnl-types.c >> -@@ -67,7 +67,9 @@ static const NLType >> rtnl_link_info_data_vlan_types[IFLA_VLAN_MAX + 1] = { >> - [IFLA_VLAN_EGRESS_QOS] = { .type = NLA_NESTED }, >> - [IFLA_VLAN_INGRESS_QOS] = { .type = NLA_NESTED }, >> - */ >> -+#ifdef IFLA_VLAN_PROTOCOL >> - [IFLA_VLAN_PROTOCOL] = { .type = NLA_U16 }, >> -+#endif >> - }; >> - >> - static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + >> 1] = { >> -diff --git a/src/shared/missing.h b/src/shared/missing.h >> -index d5ec2f8..732853f 100644 >> ---- a/src/shared/missing.h >> -+++ b/src/shared/missing.h >> -@@ -94,6 +94,8 @@ >> - >> - #ifndef IFLA_CARRIER >> - #define IFLA_CARRIER 33 >> -+ #undef IFLA_MAX >> -+ #define IFLA_MAX 35 >> - #ifndef IFLA_NUM_RX_QUEUES >> - #define IFLA_NUM_RX_QUEUES 32 >> - #ifndef IFLA_NUM_TX_QUEUES >> --- >> -1.8.3.4 >> - >> diff --git a/meta/recipes-core/systemd/systemd_213.bb >> b/meta/recipes-core/systemd/systemd_215.bb >> similarity index 99% >> rename from meta/recipes-core/systemd/systemd_213.bb >> rename to meta/recipes-core/systemd/systemd_215.bb >> index 5de7cdc..b1ffbdd 100644 >> --- a/meta/recipes-core/systemd/systemd_213.bb >> +++ b/meta/recipes-core/systemd/systemd_215.bb >> @@ -17,9 +17,9 @@ SECTION = "base/shell" >> >> inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d >> update-alternatives qemu systemd ptest >> >> -SRCREV = "c9679c652b3c31f2510e8805d81630680ebc7e95" >> +SRCREV = "252ff40a3827b4e8e62e03a5e2f80da3fe02bee6" >> >> -PV = "213+git${SRCPV}" >> +PV = "215+git${SRCPV}" >> >> SRC_URI = >> "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git >> \ >> file://binfmt-install.patch \ >> @@ -35,8 +35,7 @@ SRC_URI = >> "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= >> file://00-create-volatile.conf \ >> file://init \ >> file://run-ptest \ >> - file://systemd-older-kernel.patch \ >> - " >> + " >> >> S = "${WORKDIR}/git" >> >> @@ -231,6 +230,7 @@ FILES_${PN} = " ${base_bindir}/* \ >> ${exec_prefix}/lib/systemd \ >> ${exec_prefix}/lib/modules-load.d \ >> ${exec_prefix}/lib/sysctl.d \ >> + ${exec_prefix}/lib/sysusers.d \ >> ${localstatedir} \ >> /lib/udev/rules.d/70-uaccess.rules \ >> /lib/udev/rules.d/71-seat.rules \ >> > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V3 1/1] systemd: upgrade to 215 2014-07-29 2:12 ` [PATCH V3 1/1] " Chen Qi 2014-07-29 4:19 ` Saul Wold @ 2014-07-30 5:41 ` Koen Kooi 1 sibling, 0 replies; 5+ messages in thread From: Koen Kooi @ 2014-07-30 5:41 UTC (permalink / raw) To: Chen Qi; +Cc: openembedded-core Op 29 jul. 2014, om 04:12 heeft Chen Qi <Qi.Chen@windriver.com> het volgende geschreven: > Upgrade systemd from 213 to 215. > > systemd-older-kernel.patch is removed as it's fixed in 215. > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > .../systemd/systemd/systemd-older-kernel.patch | 56 -------------------- > .../systemd/{systemd_213.bb => systemd_215.bb} | 8 +-- > 2 files changed, 4 insertions(+), 60 deletions(-) > delete mode 100644 meta/recipes-core/systemd/systemd/systemd-older-kernel.patch > rename meta/recipes-core/systemd/{systemd_213.bb => systemd_215.bb} (99%) > > diff --git a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch b/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch > deleted file mode 100644 > index 18b50e7..0000000 > --- a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch > +++ /dev/null > @@ -1,56 +0,0 @@ > -From 6109f02dcc4f2d7a461c5772bab494f5753a2203 Mon Sep 17 00:00:00 2001 > -From: Robert Yang <liezhi.yang@windriver.com> > -Date: Thu, 29 May 2014 08:09:07 +0000 > -Subject: [PATCH] rtnl-types.c: check IFLA_VLAN_PROTOCOL > - > -The older kernel's linux/if_link.h doesn't have IFLA_VLAN_PROTOCOL, we need > -check whether it has been defined or not. > - > -The maintainer said that he would fix it: > - > -http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/18200 > - > -Also we need redefine IFLA_MAX from 34 to 35 when define IFLA_CARRIER, > -otherwise there would be error: > - > -| src/libsystemd/sd-rtnl/rtnl-types.c:233:9: error: array index in initializer exceeds array bounds > -| [IFLA_CARRIER] = { .type = NLA_U8 }, > - > -Upstream-Status: Pending > - > -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> > ---- > - src/libsystemd/sd-rtnl/rtnl-types.c | 2 ++ > - src/shared/missing.h | 2 ++ > - 2 files changed, 4 insertions(+) > - > -diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c > -index 44ac5ec..ab6161f 100644 > ---- a/src/libsystemd/sd-rtnl/rtnl-types.c > -+++ b/src/libsystemd/sd-rtnl/rtnl-types.c > -@@ -67,7 +67,9 @@ static const NLType rtnl_link_info_data_vlan_types[IFLA_VLAN_MAX + 1] = { > - [IFLA_VLAN_EGRESS_QOS] = { .type = NLA_NESTED }, > - [IFLA_VLAN_INGRESS_QOS] = { .type = NLA_NESTED }, > - */ > -+#ifdef IFLA_VLAN_PROTOCOL > - [IFLA_VLAN_PROTOCOL] = { .type = NLA_U16 }, > -+#endif > - }; > - > - static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + 1] = { > -diff --git a/src/shared/missing.h b/src/shared/missing.h > -index d5ec2f8..732853f 100644 > ---- a/src/shared/missing.h > -+++ b/src/shared/missing.h > -@@ -94,6 +94,8 @@ > - > - #ifndef IFLA_CARRIER > - #define IFLA_CARRIER 33 > -+ #undef IFLA_MAX > -+ #define IFLA_MAX 35 > - #ifndef IFLA_NUM_RX_QUEUES > - #define IFLA_NUM_RX_QUEUES 32 > - #ifndef IFLA_NUM_TX_QUEUES > --- > -1.8.3.4 > - > diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_215.bb > similarity index 99% > rename from meta/recipes-core/systemd/systemd_213.bb > rename to meta/recipes-core/systemd/systemd_215.bb > index 5de7cdc..b1ffbdd 100644 > --- a/meta/recipes-core/systemd/systemd_213.bb > +++ b/meta/recipes-core/systemd/systemd_215.bb > @@ -17,9 +17,9 @@ SECTION = "base/shell" > > inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest > > -SRCREV = "c9679c652b3c31f2510e8805d81630680ebc7e95" > +SRCREV = "252ff40a3827b4e8e62e03a5e2f80da3fe02bee6" > > -PV = "213+git${SRCPV}" > +PV = "215+git${SRCPV}" > > SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \ > file://binfmt-install.patch \ > @@ -35,8 +35,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= > file://00-create-volatile.conf \ > file://init \ > file://run-ptest \ > - file://systemd-older-kernel.patch \ > - " > + " > > S = "${WORKDIR}/git" > > @@ -231,6 +230,7 @@ FILES_${PN} = " ${base_bindir}/* \ > ${exec_prefix}/lib/systemd \ > ${exec_prefix}/lib/modules-load.d \ > ${exec_prefix}/lib/sysctl.d \ > + ${exec_prefix}/lib/sysusers.d \ Those really need to go into CONFFILES as well ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-30 5:41 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-07-29 2:12 [PATCH V3 0/1] systemd: upgrade to 215 Chen Qi 2014-07-29 2:12 ` [PATCH V3 1/1] " Chen Qi 2014-07-29 4:19 ` Saul Wold 2014-07-29 5:49 ` ChenQi 2014-07-30 5:41 ` Koen Kooi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox