Code Review / AGL / meta-agl-demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 80c6bbc)
Revert "Add the libsocketcan and canutils userspace components" 17/15017/1
authorStephane Desneux <stephane.desneux@iot.bzh>
Wed, 4 Jul 2018 18:23:15 +0000 (20:23 +0200)
committerStephane Desneux <stephane.desneux@iot.bzh>
Wed, 4 Jul 2018 18:24:03 +0000 (20:24 +0200)
This reverts commit 80c6bbcd190ac40305e0e2e83e20209f39c9dfb8.

The reverted commit introduces a conflict when building for m3ulcb
between can-utils and canutils.

Change-Id: I97c188f0869c5816e7c378a00ac6df6424fe2d46
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
recipes-platform/packagegroups/packagegroup-agl-demo.bb patch | blob | history

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 979830a..5cf826b 100644 (file)
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -57,8 +57,7 @@ PREFERRED_PROVIDER_virtual/webruntime = "web-runtime"
 
 RDEPENDS_${PN} += " \
     linux-firmware-ath9k \
-    libsocketcan \
-    canutils \
+    can-utils \
     iproute2 \
     python-curses \
     dhcp-client \
meta-agl-demo layer (demo/staging/"one-shot")