From b033920976b280166233b82d1db1c031afa9d8ea Mon Sep 17 00:00:00 2001
From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Date: Sun, 19 Nov 2017 22:42:44 +0300
Subject: Rename sv packagegroup recipes and split them

---
 .../recipes-core/images/core-image-weston.bbappend |  4 +--
 .../packagegroups/packagegroup-opencv-sdk.bb       | 28 +++++++++++++++
 .../packagegroups/packagegroup-rcar-gen3-adas.bb   | 40 ----------------------
 .../packagegroups/packagegroup-surroundview.bb     | 19 ++++++++++
 .../recipes-core/systemd/systemd/dummy0.network    |  2 +-
 .../recipes-core/systemd/systemd_229.bbappend      |  2 +-
 6 files changed, 51 insertions(+), 44 deletions(-)
 create mode 100644 meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb
 delete mode 100644 meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-rcar-gen3-adas.bb
 create mode 100644 meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb

(limited to 'meta-rcar-gen3-adas')

diff --git a/meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend b/meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend
index 994e9a0..945d9b0 100644
--- a/meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend
+++ b/meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend
@@ -1,6 +1,6 @@
 IMAGE_INSTALL_append = " \
-	packagegroup-opencv-sdk \
-	packagegroup-surroundview \
+    packagegroup-opencv-sdk \
+    packagegroup-surroundview \
 "
 
 CONFLICT_DISTRO_FEATURES = "x11"
\ No newline at end of file
diff --git a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb
new file mode 100644
index 0000000..81d81d9
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "OpenCV SDK packages"
+LICENSE = "GPL"
+
+inherit packagegroup
+
+PACKAGES = " \
+    packagegroup-opencv-sdk \
+"
+
+RDEPENDS_packagegroup-opencv-sdk = '${@ " \
+    opencv \
+    opencv-apps \
+    opencv-dbg \
+    libopencv-calib3d \
+    libopencv-core \
+    libopencv-features2d \
+    libopencv-flann \
+    libopencv-highgui \
+    libopencv-imgproc \
+    libopencv-ml \
+    libopencv-objdetect \
+    libopencv-photo \
+    libopencv-stitching \
+    libopencv-superres \
+    libopencv-video \
+    libopencv-videostab \
+    gstreamer1.0-plugins-base-app \
+" if 'opencv-sdk' in '${DISTRO_FEATURES}' else ""}'
diff --git a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-rcar-gen3-adas.bb b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-rcar-gen3-adas.bb
deleted file mode 100644
index f7b2e88..0000000
--- a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-rcar-gen3-adas.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "Demo package"
-LICENSE = "GPL"
-
-inherit packagegroup
-
-PACKAGES = " \
-	packagegroup-opencv-sdk \
-	packagegroup-surroundview \
-"
-
-RDEPENDS_packagegroup-surroundview = '${@ " \
-    spacenavd \
-    libspnav \
-    glm \
-    nlopt \
-    gstreamer1.0-omx \
-    gstreamer1.0-plugins-base-app libgstapp-1.0 \
-    yaml-cpp \
-    libmediactl-v4l2 \
-" if 'surroundview' in '${DISTRO_FEATURES}' else ""}'
-
-RDEPENDS_packagegroup-opencv-sdk = '${@ " \
-    opencv \
-    opencv-apps \
-    opencv-dbg \
-    libopencv-calib3d \
-    libopencv-core \
-    libopencv-features2d \
-    libopencv-flann \
-    libopencv-highgui \
-    libopencv-imgproc \
-    libopencv-ml \
-    libopencv-objdetect \
-    libopencv-photo \
-    libopencv-stitching \
-    libopencv-superres \
-    libopencv-video \
-    libopencv-videostab \
-    gstreamer1.0-plugins-base-app \
-" if 'opencv-sdk' in '${DISTRO_FEATURES}' else ""}'
diff --git a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb
new file mode 100644
index 0000000..d31e5fe
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Packages required for GPU Surroundview demo"
+LICENSE = "GPL"
+
+inherit packagegroup
+
+PACKAGES = " \
+    packagegroup-surroundview \
+"
+
+RDEPENDS_packagegroup-surroundview = '${@ " \
+    spacenavd \
+    libspnav \
+    glm \
+    nlopt \
+    gstreamer1.0-omx \
+    gstreamer1.0-plugins-base-app libgstapp-1.0 \
+    yaml-cpp \
+    libmediactl-v4l2 \
+" if 'surroundview' in '${DISTRO_FEATURES}' else ""}'
diff --git a/meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network b/meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network
index 26fd32b..054e17b 100644
--- a/meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network
+++ b/meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network
@@ -1,6 +1,6 @@
 [Match]
 Name=dummy0
 
-[Network] 
+[Network]
 DHCP=no
 
diff --git a/meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend b/meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend
index 37cb270..f4dc296 100644
--- a/meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend
+++ b/meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend
@@ -9,7 +9,7 @@ SRC_URI_append= '${@ " \
 " if 'surroundview' in '${DISTRO_FEATURES}' else ""}'
 
 FILES_${PN} += "${sysconfdir}/systemd/network/*"
- 
+
 USERADD_PARAM_${PN} += "; --system systemd-network "
 
 do_install_append() {
-- 
cgit 1.2.3-korg