[OE-core] devtool modify errors on second recipe

[Khem Raj]

Hi Paul

I am seeing this errors message consistently since few weeks on master
when using
devtool modify

NOTE:   do_populate_sysroot: 100.0% sstate reuse(1 setscene, 0 scratch)
Traceback (most recent call last):
  File "/mnt/a/oe/sources/openembedded-core/scripts/devtool", line
331, in 
ret = main()
  File "/mnt/a/oe/sources/openembedded-core/scripts/devtool", line 318, in main
ret = args.func(args, config, basepath, workspace)
  File "/mnt/a/oe/sources/openembedded-core/scripts/lib/devtool/standard.py",
line 714, in modify
initial_rev = _extract_source(srctree, args.keep_temp,
args.branch, False, config, basepath, workspace, args.fixed_setup, rd,
tinfoil)
  File "/mnt/a/oe/sources/openembedded-core/scripts/lib/devtool/standard.py",
line 545, in _extract_source
with open(os.path.join(tempdir, 'initial_rev'), 'r') as f:
FileNotFoundError: [Errno 2] No such file or directory:
'/mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/dovecot/2.2.29-r0/devtooltmp-zjst6lsd/initial_rev'


This does not happen when I use it for first time but there after when
I try to modify the second recipe it shows up.

The setup hasn't changed so it use to work fine. Now as a workaround I
delete the workspace/
folder everytime I finish modifying a recipe but thats quite cumbersome

Thanks
-Khem
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] musl: Update to latest

[Khem Raj]

Rich Felker (8):
  fix use of memset without declaration in sched.h cpu set macros
  fix access by setjmp and longjmp to __hwcap on arm built as thumb2
  for executing init array functions, use function type with prototype
  fix read-after-free type error in pthread_detach
  fix incorrect base name offset from nftw when pathname ends in slash(es)
  in dns parsing callback, enforce MAXADDRS to preclude overflow
  release 1.1.17
  fix regression in glob with literal . or .. path component

Szabolcs Nagy (2):
  powerpc{64}: fix MAP_NORESERVE and MAP_LOCKED in mman.h
  math: rewrite fma with mostly int arithmetics

Will Dietz (1):
  posix_spawn: use larger stack to cover worst-case in execvpe

Signed-off-by: Khem Raj 
---
 meta/recipes-core/musl/musl_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/musl/musl_git.bb 
b/meta/recipes-core/musl/musl_git.bb
index bd7573e0f3..593d3bc581 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -3,9 +3,9 @@
 
 require musl.inc
 
-SRCREV = "da438ee1fc516c41ba1790cef7be551a9e244397"
+SRCREV = "ec04d122f1182aeb91f39b0e80ae40c68e4d9605"
 
-PV = "1.1.16+git${SRCPV}"
+PV = "1.1.17+git${SRCPV}"
 
 # mirror is at git://github.com/kraj/musl.git
 
-- 
2.14.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] kexec-tools: add systemd support for kdump

[Wenlin Kang]

On 2017年10月17日 10:21, Wenlin Kang wrote:

Add file kdump.service to support kdump in systemd.

Signed-off-by: Wenlin Kang 
---
  meta/recipes-kernel/kexec/kexec-tools.inc  |  1 +
  .../recipes-kernel/kexec/kexec-tools/kdump.service | 12 +++
  meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb| 23 +-
  3 files changed, 31 insertions(+), 5 deletions(-)
  create mode 100644 meta/recipes-kernel/kexec/kexec-tools/kdump.service

diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc 
b/meta/recipes-kernel/kexec/kexec-tools.inc
index bdfe024..c689bec 100644
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ b/meta/recipes-kernel/kexec/kexec-tools.inc
@@ -11,6 +11,7 @@ DEPENDS = "zlib xz"
  SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
 file://kdump \
 file://kdump.conf \
+   file://kdump.service \
  "
  
  PR = "r1"

diff --git a/meta/recipes-kernel/kexec/kexec-tools/kdump.service 
b/meta/recipes-kernel/kexec/kexec-tools/kdump.service
new file mode 100644
index 000..4e65a46
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/kdump.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Reboot and dump vmcore via kexec
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@LIBEXECDIR@/kdump-helper start
+ExecStop=@LIBEXECDIR@/kdump-helper stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb 
b/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb
index bd89720..0f6398f1 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb
@@ -34,19 +34,32 @@ ALLOW_EMPTY_${PN} = "1"
  RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg"
  
  FILES_kexec = "${sbindir}/kexec"

-FILES_kdump = "${sbindir}/kdump ${sysconfdir}/init.d/kdump \
-   ${sysconfdir}/sysconfig/kdump.conf"
+FILES_kdump = "${sbindir}/kdump \
+   ${sysconfdir}/sysconfig/kdump.conf \
+   ${sysconfdir}/init.d/kdump \
+   ${libexecdir}/kdump-helper \
+   ${systemd_unitdir}/system/kdump.service \
+"
+
  FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg"
  
-inherit update-rc.d

+inherit update-rc.d systemd
  
  INITSCRIPT_PACKAGES = "kdump"

  INITSCRIPT_NAME_kdump = "kdump"
  INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ."
  
  do_install_append () {

-install -d ${D}${sysconfdir}/init.d
-install -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump
  install -d ${D}${sysconfdir}/sysconfig
  install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig
+
+if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 
'false', d)}; then
+install -D -m 0755 ${WORKDIR}/kdump 
${D}${sysconfdir}/init.d/kdump
+fi
+
+if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', 
d)}; then
+install -D -m 0755 ${WORKDIR}/kdump 
${D}${libexecdir}/kdump-helper
+install -D -m 0644 ${WORKDIR}/kdump.service 
${D}${systemd_unitdir}/system/kdump.service
+sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' 
${D}${systemd_unitdir}/system/kdump.service
+fi
  }



ping ..

--
Thanks,
Wenlin Kang

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] useradd.bbclass: print a warn when useradd not found

[Robert Yang]

Exit quietly makes it very hard for debugging when user is not added as
expected, print a warning helps a lot.

Signed-off-by: Robert Yang 
---
 meta/classes/useradd.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index c9103cb..124becd 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -118,6 +118,7 @@ useradd_sysroot () {
# useradd/groupadd tools are unavailable. If there is no dependency, we 
assume we don't want to
# create users in the sysroot
if ! command -v useradd; then
+   bbwarn "command useradd not found!"
exit 0
fi
 
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] sstate.bbclass: sstate_hardcode_path(): fix for multilib

[Robert Yang]

It only substituted staging_target for target recipe which didn't work
for multilib, for example, postinst-useradd-lib32-polkit:

* No multilib:
  
PATH=/path/to/tmp-glibc/work/core2-64-wrs-linux/polkit/0.113-r0/recipe-sysroot-native/bin
  It would be substituted to:
  FIXMESTAGINGDIRTARGET-native/bin
  Not the funny "-native/bin", this works well.

* When multilib:
  
PATH=/path/to/tmp-glibc/work/core2-32-wrsmllib32-linux/lib32-polkit/0.113-r0/recipe-sysroot-native/bin
  Now staging_target endswith "/lib32-recipe-sysroot", so it can't
  replace '/recipe-sysroot-native', there would be build errors when
  building multilib + rm_work, for example:
  chown: invalid user: ‘polkitd:root’

Substitute staging_host for target recipe can fix the problem, now all
of native, cross and target need substitute staging_host, so we can
simply the code a little.

Signed-off-by: Robert Yang 
---
 meta/classes/sstate.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e30fbe1..314a14d 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -538,15 +538,15 @@ python sstate_hardcode_path () {
 staging_host = d.getVar('RECIPE_SYSROOT_NATIVE')
 sstate_builddir = d.getVar('SSTATE_BUILDDIR')
 
+sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % staging_host
 if bb.data.inherits_class('native', d) or 
bb.data.inherits_class('cross-canadian', d):
 sstate_grep_cmd = "grep -l -e '%s'" % (staging_host)
-sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % 
(staging_host)
 elif bb.data.inherits_class('cross', d) or 
bb.data.inherits_class('crosssdk', d):
 sstate_grep_cmd = "grep -l -e '%s' -e '%s'" % (staging_target, 
staging_host)
-sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; 
s:%s:FIXMESTAGINGDIRHOST:g'" % (staging_target, staging_host)
+sstate_sed_cmd += " -e 's:%s:FIXMESTAGINGDIRTARGET:g'" % staging_target
 else:
 sstate_grep_cmd = "grep -l -e '%s'" % (staging_target)
-sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g'" % 
(staging_target)
+sstate_sed_cmd += " -e 's:%s:FIXMESTAGINGDIRTARGET:g'" % staging_target
 
 extra_staging_fixmes = d.getVar('EXTRA_STAGING_FIXMES') or ''
 for fixmevar in extra_staging_fixmes.split():
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/2] sstate.bbclass: sstate_hardcode_path(): fix for multilib

[Robert Yang]

The following changes since commit 3b413a80578caacd9a7f405f3c51a3921d78a60d:

  README.qemu: qemuppc64 is not supported (2017-10-16 23:54:27 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/2ssfixes
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/2ssfixes

Robert Yang (2):
  useradd.bbclass: print a warn when useradd not found
  sstate.bbclass: sstate_hardcode_path(): fix for multilib

 meta/classes/sstate.bbclass  | 6 +++---
 meta/classes/useradd.bbclass | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] openssl: force soft link to avoid rare race

[Randy MacLeod]

This patch works around a rare parallel build race condition using
the force option when soft linking.

The error seen is:

ln: failed to create symbolic link 'libssl.so': File exists
make[4]: *** [Makefile.shared:171: link_a.gnu] Error 1
make[4]: Leaving directory
'/.../build/tmp-glibc/work/x86_64-linux/openssl-native/1.0.2k-r0/openssl-1.0.2k'

Just add the -f flag to the platform independent soft link code to
avoid the collision.  This is reasonable since this Makefile removes
the link target before creating a new soft link. The Makefile was
written this way to support platforms that don't allow forcing a
softlink to overwrite an existing link. Only builds on Linux are
supported so that's not a requirement for oe-core recipes.

The openssl team is rewriting their build files so it's not appropriate
for openssl upstream and fixing the root cause of the race condition
was also not pursued.

Signed-off-by: Randy MacLeod 
---
 ...penssl-force-soft-link-to-avoid-rare-race.patch | 48 ++
 .../recipes-connectivity/openssl/openssl_1.0.2l.bb |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 
meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-openssl-force-soft-link-to-avoid-rare-race.patch

diff --git 
a/meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-openssl-force-soft-link-to-avoid-rare-race.patch
 
b/meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-openssl-force-soft-link-to-avoid-rare-race.patch
new file mode 100644
index 000..7a23d23
--- /dev/null
+++ 
b/meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-openssl-force-soft-link-to-avoid-rare-race.patch
@@ -0,0 +1,48 @@
+From 3d9199423d48766649a2b2ebb3924e892ed16fa4 Mon Sep 17 00:00:00 2001
+From: Randy MacLeod 
+Date: Tue, 20 Jun 2017 15:32:08 -0400
+Subject: [PATCH] openssl: Force soft link to avoid rare race
+
+This patch works around a rare parallel build race condition. 
+The error seen is:
+
+ln: failed to create symbolic link 'libssl.so': File exists
+make[4]: *** [Makefile.shared:171: link_a.gnu] Error 1
+make[4]: Leaving directory
+'/.../build/tmp-glibc/work/x86_64-linux/openssl-native/1.0.2k-r0/openssl-1.0.2k'
+
+The openssl team is rewriting their build files so it's not
+appropriate for openssl upstream and fixing the root cause of
+the Makefile race condition was also not pursued.
+
+Upstream-Status: Inappropriate [build rules rewrite in progress]
+
+Signed-off-by: Randy MacLeod 
+---
+ Makefile.shared | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.shared b/Makefile.shared
+index e8d222a..1bff92f 100644
+--- a/Makefile.shared
 b/Makefile.shared
+@@ -118,14 +118,14 @@
+   if [ -n "$$SHLIB_COMPAT" ]; then \
+   for x in $$SHLIB_COMPAT; do \
+   ( $(SET_X); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
+-ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
++ln -sf $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
+   prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
+   done; \
+   fi; \
+   if [ -n "$$SHLIB_SOVER" ]; then \
+   [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+   ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+-ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
++ln -sf $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+   fi; \
+   fi
+ 
+-- 
+2.9.3
+
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb 
b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
index 8c34ea6..c537aa4 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
@@ -41,6 +41,7 @@ SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \
 file://openssl-util-perlpath.pl-cwd.patch \
 file://Use-SHA256-not-MD5-as-default-digest.patch \
 file://0001-Fix-build-with-clang-using-external-assembler.patch \
+file://0001-openssl-force-soft-link-to-avoid-rare-race.patch  \
 "
 SRC_URI[md5sum] = "f85123cd390e864dfbe517e7616e6566"
 SRC_URI[sha256sum] = 
"ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c"
-- 
2.9.3

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] oe-buildenv-internal: Fix finding build directory

[Otavio Salvador]

On Sat, Oct 21, 2017 at 10:06 AM, Richard Purdie
 wrote:
> The intent of the env setup scripts is to set BBPATH to point at the
> build directory if not already set. This means if the user changes
> directory, bitbake can still find the original build directory. The
> default bblayers.conf files reset BBPATH to the correct components so
> this is safe and restores the behaviour the script was intended to have.
>
> [YOCTO #12163]
>
> Signed-off-by: Richard Purdie 

A warning letting user know that it not going to be run would be good,
also printing the current value

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] connman: upgrade 1.34 -> 1.35

[Changhyeok Bae]

Below two patches are applied in v1.35
- 0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch
- CVE-2017-12865.patch

Signed-off-by: Changhyeok Bae 
---
 ...ll-nftables-fix-build-with-libnftnl-1.0.7.patch | 72 --
 .../connman/connman/CVE-2017-12865.patch   | 87 --
 .../connman/{connman_1.34.bb => connman_1.35.bb}   |  6 +-
 3 files changed, 2 insertions(+), 163 deletions(-)
 delete mode 100644 
meta/recipes-connectivity/connman/connman/0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch
 delete mode 100644 
meta/recipes-connectivity/connman/connman/CVE-2017-12865.patch
 rename meta/recipes-connectivity/connman/{connman_1.34.bb => connman_1.35.bb} 
(67%)

diff --git 
a/meta/recipes-connectivity/connman/connman/0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch
 
b/meta/recipes-connectivity/connman/connman/0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch
deleted file mode 100644
index cfafbd1..000
--- 
a/meta/recipes-connectivity/connman/connman/0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 4058ce3186a99fd5f03350fc11a7fc8d38b6a381 Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" 
-Date: Mon, 8 May 2017 10:53:18 +0300
-Subject: [PATCH] firewall-nftables: fix build with libnftnl-1.0.7
-
-We need these updates to accommodate the changes caused by the following
-commit in libnftnl-1.0.7
-
-commit 907a9f8e5a93f5bcd449643eb3916a656d634758
-Author: Pablo Neira Ayuso 
-Date:   Tue Dec 20 13:47:11 2016 +0100
-
-src: get rid of aliases and compat
-
-This machinery was introduced to avoid sudden compilation breakage of
-old nftables releases. With the upcoming release of 0.7 (and 0.6 which
-is now 6 months old) this is not required anymore.
-
-Moreover, users gain nothing from older releases since they are
-half-boiled and buggy.
-
-So let's get rid of aliases now. Bump LIBVERSION and update map file.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Maxin B. John 

- src/firewall-nftables.c | 14 +++---
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/firewall-nftables.c b/src/firewall-nftables.c
-index 583d1c4..83b137b 100644
 a/src/firewall-nftables.c
-+++ b/src/firewall-nftables.c
-@@ -387,9 +387,9 @@ static int add_cmp(struct nftnl_rule *rule, uint32_t sreg, 
uint32_t op,
- if (!expr)
- return -ENOMEM;
- 
--nftnl_expr_set_u32(expr, NFT_EXPR_CMP_SREG, sreg);
--nftnl_expr_set_u32(expr, NFT_EXPR_CMP_OP, op);
--nftnl_expr_set(expr, NFT_EXPR_CMP_DATA, data, data_len);
-+nftnl_expr_set_u32(expr, NFTNL_EXPR_CMP_SREG, sreg);
-+nftnl_expr_set_u32(expr, NFTNL_EXPR_CMP_OP, op);
-+nftnl_expr_set(expr, NFTNL_EXPR_CMP_DATA, data, data_len);
- 
- nftnl_rule_add_expr(rule, expr);
- 
-@@ -575,8 +575,8 @@ static int build_rule_nat(const char *address, unsigned 
char prefixlen,
-   expr = nftnl_expr_alloc("meta");
-   if (!expr)
-   goto err;
--  nftnl_expr_set_u32(expr, NFT_EXPR_META_KEY, NFT_META_OIFNAME);
--  nftnl_expr_set_u32(expr, NFT_EXPR_META_DREG, NFT_REG_1);
-+  nftnl_expr_set_u32(expr, NFTNL_EXPR_META_KEY, NFT_META_OIFNAME);
-+  nftnl_expr_set_u32(expr, NFTNL_EXPR_META_DREG, NFT_REG_1);
-   nftnl_rule_add_expr(rule, expr);
-   err = add_cmp(rule, NFT_REG_1, NFT_CMP_EQ, interface,
-   strlen(interface) + 1);
-@@ -677,8 +677,8 @@ static int build_rule_snat(int index, const char *address,
-   expr = nftnl_expr_alloc("meta");
-   if (!expr)
-   goto err;
--  nftnl_expr_set_u32(expr, NFT_EXPR_META_KEY, NFT_META_OIF);
--  nftnl_expr_set_u32(expr, NFT_EXPR_META_DREG, NFT_REG_1);
-+  nftnl_expr_set_u32(expr, NFTNL_EXPR_META_KEY, NFT_META_OIF);
-+  nftnl_expr_set_u32(expr, NFTNL_EXPR_META_DREG, NFT_REG_1);
-   nftnl_rule_add_expr(rule, expr);
-   err = add_cmp(rule, NFT_REG_1, NFT_CMP_EQ, , sizeof(index));
-   if (err < 0)
--- 
-2.4.0
-
diff --git a/meta/recipes-connectivity/connman/connman/CVE-2017-12865.patch 
b/meta/recipes-connectivity/connman/connman/CVE-2017-12865.patch
deleted file mode 100644
index 45f78f1..000
--- a/meta/recipes-connectivity/connman/connman/CVE-2017-12865.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 5c281d182ecdd0a424b64f7698f32467f8f67b71 Mon Sep 17 00:00:00 2001
-From: Jukka Rissanen 
-Date: Wed, 9 Aug 2017 10:16:46 +0300
-Subject: dnsproxy: Fix crash on malformed DNS response
-
-If the response query string is malformed, we might access memory
-pass the end of "name" variable in parse_response().
-
-CVE: CVE-2017-12865
-Upstream-Status: Backport 
[https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=5c281d182ecdd0a424b64f7698f32467f8f67b71]
-
-Signed-off-by: Sona Sarmadi 

- src/dnsproxy.c