diff options
Diffstat (limited to 'meta-rcar-gen3-adas/recipes-core')
-rw-r--r-- | meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend | 4 | ||||
-rw-r--r-- | meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb (renamed from meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-rcar-gen3-adas.bb) | 16 | ||||
-rw-r--r-- | meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb | 19 | ||||
-rw-r--r-- | meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network | 2 | ||||
-rw-r--r-- | meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend | 2 |
5 files changed, 25 insertions, 18 deletions
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-rcar-gen3-adas.bb b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb index f7b2e88..81d81d9 100644 --- a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-rcar-gen3-adas.bb +++ b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb @@ -1,24 +1,12 @@ -DESCRIPTION = "Demo package" +DESCRIPTION = "OpenCV SDK packages" LICENSE = "GPL" inherit packagegroup PACKAGES = " \ - packagegroup-opencv-sdk \ - packagegroup-surroundview \ + packagegroup-opencv-sdk \ " -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 \ 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() { |