diff options
7 files changed, 35 insertions, 41 deletions
diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p1.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p1.bb index a849088..d861c1a 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p1.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p1.bb @@ -5,16 +5,16 @@ inherit packagegroup PACKAGES = "\ packagegroup-abstract-component-p1 \ - " +" ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ bluez5 \ bluez5-obex \ - libbluetooth-plugins-service \ glibc \ + libbluetooth-plugins-service \ ofono \ wayland-ivi-extension \ weston weston-examples \ - " +" diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb index 64811b9..40369c5 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb @@ -6,15 +6,14 @@ inherit packagegroup PACKAGES = "\ packagegroup-abstract-component-p2 \ - " +" ALLOW_EMPTY_${PN} = "1" - RDEPENDS_${PN} += "\ + audiomanagerplugins \ neard \ node-health-monitor \ - persistence-client-library \ persistence-administrator \ - audiomanagerplugins \ - " + persistence-client-library \ +" diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-core-boot-genivi.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-core-boot-genivi.bb index 22cc4dc..55f8a71 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-core-boot-genivi.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-core-boot-genivi.bb @@ -28,21 +28,22 @@ VIRTUAL-RUNTIME_initscripts ?= "" VIRTUAL-RUNTIME_keymaps ?= "keymaps" RDEPENDS_${PN} = "\ - base-files \ - base-passwd \ - busybox \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ - netbase \ - ${VIRTUAL-RUNTIME_login_manager} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ + ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ ${VIRTUAL-RUNTIME_initscripts} \ - ${VIRTUAL-RUNTIME_dev_manager} \ + ${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_update-alternatives} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ + base-files \ + base-passwd \ + busybox \ kmod \ + netbase \ procps \ util-linux-mount \ - " +" RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ +" diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-placeholder-component-p1.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-placeholder-component-p1.bb index 57af945..2096b16 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-placeholder-component-p1.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-placeholder-component-p1.bb @@ -6,10 +6,6 @@ inherit packagegroup PACKAGES = "\ packagegroup-placeholder-component-p1 \ - " +" ALLOW_EMPTY_${PN} = "1" - - -RDEPENDS_${PN} += "\ - " diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p1.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p1.bb index 4bab959..bb63ac4 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p1.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p1.bb @@ -5,28 +5,27 @@ inherit packagegroup PACKAGES = "\ packagegroup-specific-component-p1 \ - " +" ALLOW_EMPTY_${PN} = "1" - RDEPENDS_${PN} += "\ - kernel-modules \ + alsa-utils \ audiomanager \ common-api-c++ \ - dlt-daemon \ - dlt-daemon-systemd \ - libasound \ - alsa-utils \ connman \ curl \ dbus \ + dlt-daemon \ + dlt-daemon-systemd \ ecryptfs-utils \ gstreamer1.0-meta-base \ + kernel-modules \ + libasound \ libusb1 \ node-startup-controller \ node-state-manager \ openssl \ udev \ wpa-supplicant \ - " +" diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb index 8c17b99..06c11b0 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb @@ -6,18 +6,16 @@ inherit packagegroup PACKAGES = "\ packagegroup-specific-component-p2 \ - " +" ALLOW_EMPTY_${PN} = "1" - RDEPENDS_${PN} += "\ common-api-c++-dbus \ common-api-c++-someip \ - vsomeip \ fuse \ pulseaudio-server \ quota \ sqlite3 \ - " - + vsomeip \ +" diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-xserver-ivi.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-xserver-ivi.bb index 850df90..d11c34f 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-xserver-ivi.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-xserver-ivi.bb @@ -5,11 +5,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -XSERVER ?= "xserver-xorg \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-video-fbdev \ - xf86-input-keyboard \ - " +XSERVER ?= " + xf86-input-evdev \ + xf86-input-keyboard \ + xf86-input-mouse \ + xf86-video-fbdev \ + xserver-xorg \ +" RDEPENDS_${PN} = "${XSERVER}" |