From e64abf4d17c5349103de924ec7059c0d30d67cb9 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 4 Feb 2016 19:56:22 +0100 Subject: [PATCH] meta-digi-dey: remove old minimal and graphical images DEY provides a new dey-image-qt image (for fb and X11). https://jira.digi.com/browse/DEL-2196 Signed-off-by: Javier Viguera --- .../images/dey-image-graphical-dev.bb | 8 ---- .../images/dey-image-graphical-sdk.bb | 15 ------- .../images/dey-image-graphical.bb | 20 ---------- .../images/dey-image-minimal-dev.bb | 8 ---- .../images/dey-image-minimal-sdk.bb | 15 ------- .../recipes-core/images/dey-image-minimal.bb | 40 ------------------- 6 files changed, 106 deletions(-) delete mode 100644 meta-digi-dey/recipes-core/images/dey-image-graphical-dev.bb delete mode 100644 meta-digi-dey/recipes-core/images/dey-image-graphical-sdk.bb delete mode 100644 meta-digi-dey/recipes-core/images/dey-image-graphical.bb delete mode 100644 meta-digi-dey/recipes-core/images/dey-image-minimal-dev.bb delete mode 100644 meta-digi-dey/recipes-core/images/dey-image-minimal-sdk.bb delete mode 100644 meta-digi-dey/recipes-core/images/dey-image-minimal.bb diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical-dev.bb b/meta-digi-dey/recipes-core/images/dey-image-graphical-dev.bb deleted file mode 100644 index a6c783b8e..000000000 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical-dev.bb +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2012 Digi International. -# -require dey-image-graphical.bb - -DESCRIPTION = "DEY SATO based graphical image suitable for development work." - -IMAGE_FEATURES += "dev-pkgs" diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical-sdk.bb b/meta-digi-dey/recipes-core/images/dey-image-graphical-sdk.bb deleted file mode 100644 index 3d8388db8..000000000 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical-sdk.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2013 Digi International. -# - -require dey-image-graphical.bb - -DESCRIPTION = "Image that includes everything within dey-image-grahical plus meta-toolchain, \ -development headers and libraries to form a standalone SDK." - -# Dropbear clashes with openssh which is included by tools-debug. -IMAGE_FEATURES := "${@oe_filter_out('ssh-server-dropbear', bb.data.getVar('IMAGE_FEATURES', d, 1), d)}" -IMAGE_FEATURES += "dev-pkgs tools-sdk\ - tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks" - -IMAGE_INSTALL += "kernel-dev" diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb deleted file mode 100644 index 18e4bc08b..000000000 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (C) 2012 Digi International. -# -DESCRIPTION = "Graphical image based on SATO, a gnome mobile environment visual style." - -IMAGE_FEATURES += " \ - dey-qt \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', '', d)} \ -" - -LICENSE = "MIT" - -include dey-image-minimal.bb - -SOC_IMAGE_INSTALL = "" -SOC_IMAGE_INSTALL_mx6 = "imx-gpu-viv-demos imx-gpu-viv-tools" - -IMAGE_INSTALL += " \ - ${SOC_IMAGE_INSTALL} \ -" diff --git a/meta-digi-dey/recipes-core/images/dey-image-minimal-dev.bb b/meta-digi-dey/recipes-core/images/dey-image-minimal-dev.bb deleted file mode 100644 index dbb3603a2..000000000 --- a/meta-digi-dey/recipes-core/images/dey-image-minimal-dev.bb +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2012 Digi International. -# -require dey-image-minimal.bb - -DESCRIPTION = "DEY busybox based image (non graphical) suitable for development work." - -IMAGE_FEATURES += "dev-pkgs" diff --git a/meta-digi-dey/recipes-core/images/dey-image-minimal-sdk.bb b/meta-digi-dey/recipes-core/images/dey-image-minimal-sdk.bb deleted file mode 100644 index f1d57b53e..000000000 --- a/meta-digi-dey/recipes-core/images/dey-image-minimal-sdk.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2013 Digi International. -# - -require dey-image-minimal.bb - -DESCRIPTION = "Image that includes everything within dey-image-minimal plus meta-toolchain, \ -development headers and libraries to form a standalone SDK." - -# Dropbear clashes with openssh which is included by tools-debug. -IMAGE_FEATURES := "${@oe_filter_out('ssh-server-dropbear', bb.data.getVar('IMAGE_FEATURES', d, 1), d)}" -IMAGE_FEATURES += "dev-pkgs tools-sdk\ - tools-debug eclipse-debug debug-tweaks" - -IMAGE_INSTALL += "kernel-dev" diff --git a/meta-digi-dey/recipes-core/images/dey-image-minimal.bb b/meta-digi-dey/recipes-core/images/dey-image-minimal.bb deleted file mode 100644 index e1e26ec24..000000000 --- a/meta-digi-dey/recipes-core/images/dey-image-minimal.bb +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (C) 2012 Digi International. -# -DESCRIPTION = "DEY busybox based image (non graphical)." - -IMAGE_INSTALL = "packagegroup-dey-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" - -IMAGE_LINGUAS = " " - -LICENSE = "MIT" - -inherit core-image -inherit dey-image -inherit distro_features_check - -CONFLICT_DISTRO_FEATURES = "directfb wayland" - -# Add 'x11' to CONFLICT_DISTRO_FEATURES for 'dey-image-minimal' family of recipes but -# not for 'dey-image-graphical' (NOTICE: dey-image-graphical recipe includes this one) -CONFLICT_DISTRO_FEATURES += "${@base_ifelse(d.getVar('PN', True).startswith('dey-image-minimal'), "x11", "")}" - -# Only common features to remain here. -VIRTUAL_RUNTIME_ssh_server ?= "ssh-server-dropbear" -IMAGE_FEATURES += "${VIRTUAL_RUNTIME_ssh_server}" -IMAGE_FEATURES += "dey-network" -IMAGE_FEATURES += "package-management" - -# Machine dependent features -IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "alsa", "dey-audio", "", d)}' -IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "accel-video", "dey-gstreamer", "", d)}' -IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "wifi", "dey-wireless", "", d)}' -IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-bluetooth", "", d)}' - -# SDK features (for toolchains generated from an image with populate_sdk) -SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs" - -IMAGE_ROOTFS_SIZE = "8192" - -# Do not install udev-cache -BAD_RECOMMENDATIONS += "udev-cache"