meta-digi: Rename from DEL to DEY.
The final product will be called "Digi Embedded for Yocto" or DEY for short. This commit renames all relevant files. https://jira.digi.com/browse/DEL-474 Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
This commit is contained in:
Alex Gonzalez
parent
c019fa7611
commit
8988542df3
|
|
@ -1,7 +1,7 @@
|
|||
# Digi BSP default providers
|
||||
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx"
|
||||
PREFERRED_PROVIDER_u-boot ?= "u-boot-del"
|
||||
PREFERRED_PROVIDER_virtual/kernel ?= "linux-del"
|
||||
PREFERRED_PROVIDER_u-boot ?= "u-boot-dey"
|
||||
PREFERRED_PROVIDER_virtual/kernel ?= "linux-dey"
|
||||
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}',
|
|||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS_mxs += "elftosb-native imx-bootlets-del"
|
||||
DEPENDS_mxs += "elftosb-native imx-bootlets-dey"
|
||||
|
||||
EXTRA_OEMAKE += 'HOSTSTRIP=true'
|
||||
EXTRA_OEMAKE_append_mxs = ' BOOTLETS_DIR=${STAGING_DIR_TARGET}/boot'
|
||||
|
|
@ -11,7 +11,7 @@ INC_PR = "r0"
|
|||
inherit kernel
|
||||
|
||||
# Put a local version until we have a true SRCREV to point to
|
||||
LOCALVERSION ?= "+del"
|
||||
LOCALVERSION ?= "+dey"
|
||||
SCMVERSION ?= "y"
|
||||
|
||||
kernel_conf_variable() {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright (C) 2012 Digi International
|
||||
|
||||
include linux-del.inc
|
||||
include linux-dey.inc
|
||||
|
||||
PR = "${DISTRO}.${INC_PR}.0"
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ IMAGE_LINGUAS = " "
|
|||
LICENSE = "MIT"
|
||||
|
||||
inherit core-image
|
||||
inherit del-image
|
||||
inherit dey-image
|
||||
|
||||
INC_PR = "r0"
|
||||
PR = "${INC_PR}"
|
||||
|
|
@ -21,14 +21,14 @@ PR = "${INC_PR}"
|
|||
# Only common features to remain here.
|
||||
IMAGE_FEATURES += "ssh-server-dropbear"
|
||||
IMAGE_FEATURES += "package-management"
|
||||
IMAGE_FEATURES += "del-network"
|
||||
IMAGE_FEATURES += "dey-network"
|
||||
|
||||
# Machine dependant features
|
||||
IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "alsa", "del-audio", "", d)}'
|
||||
IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "accel-video", "del-gstreamer", "", d)}'
|
||||
IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "wifi", "del-wireless", "", d)}'
|
||||
IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "bluetooth", "del-bluetooth", "", d)}'
|
||||
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)}'
|
||||
|
||||
IMAGE_ROOTFS_SIZE = "8192"
|
||||
|
||||
ROOTFS_POSTPROCESS_COMMAND += "del_rootfs_tuning;"
|
||||
ROOTFS_POSTPROCESS_COMMAND += "dey_rootfs_tuning;"
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2012 Digi International.
|
||||
#
|
||||
require del-image-graphical.bb
|
||||
|
||||
DESCRIPTION = "DEL SATO based graphical image suitable for development work."
|
||||
|
||||
IMAGE_FEATURES += "dev-pkgs"
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
# Copyright (C) 2013 Digi International.
|
||||
|
||||
SUMMARY = "DEL examples packagegroup"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
|
||||
PR = "r0"
|
||||
|
||||
inherit packagegroup
|
||||
|
||||
RDEPENDS_${PN} = "\
|
||||
del-examples-adc \
|
||||
${@base_contains("MACHINE_FEATURES", "alsa", "del-examples-alsa", "", d)} \
|
||||
del-examples-gpio \
|
||||
del-examples-gpio-sysfs \
|
||||
${@base_contains("MACHINE_FEATURES", "rtc", "del-examples-rtc", "", d)} \
|
||||
del-examples-spidev \
|
||||
${@base_contains("MACHINE_FEATURES", "alsa", "del-examples-vplay", "", d)} \
|
||||
del-examples-watchdog \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN}_append_mxs = "\
|
||||
${@base_contains("MACHINE_FEATURES", "bluetooth", "del-examples-bt", "", d)} \
|
||||
${@base_contains("MACHINE_FEATURES", "bluetooth", "del-examples-btconfig", "", d)} \
|
||||
del-examples-can \
|
||||
${@base_contains("MACHINE_FEATURES", "bluetooth", "del-examples-hdp", "", d)} \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN}_append_mx5 = "\
|
||||
${@base_contains("MACHINE_FEATURES", "accelerometer", "del-examples-accelerometer", "", d)} \
|
||||
${@base_contains("MACHINE_FEATURES", "accel-graphics", "del-examples-opengles", "", d)} \
|
||||
del-examples-sahara \
|
||||
del-examples-v4l2 \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN}_append_ccimx51js_mx5 = "\
|
||||
del-examples-battery \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN}_append_ccimx53js_mx5 = "\
|
||||
del-examples-can \
|
||||
"
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
|
@ -1,36 +1,36 @@
|
|||
# DEL image features.
|
||||
# DEY image features.
|
||||
#
|
||||
# Copyright (C) 2012 Digi International.
|
||||
|
||||
# DEL image features (alphabetical order)
|
||||
PACKAGE_GROUP_del-audio = "packagegroup-del-audio"
|
||||
PACKAGE_GROUP_del-bluetooth = "packagegroup-del-bluetooth"
|
||||
PACKAGE_GROUP_del-debug = "packagegroup-del-debug"
|
||||
PACKAGE_GROUP_del-examples = "packagegroup-del-examples"
|
||||
PACKAGE_GROUP_del-gstreamer = "packagegroup-del-gstreamer"
|
||||
PACKAGE_GROUP_del-network = "packagegroup-del-network"
|
||||
PACKAGE_GROUP_del-qt = "packagegroup-del-qt"
|
||||
PACKAGE_GROUP_del-wireless = "packagegroup-del-wireless"
|
||||
# DEY image features (alphabetical order)
|
||||
PACKAGE_GROUP_dey-audio = "packagegroup-dey-audio"
|
||||
PACKAGE_GROUP_dey-bluetooth = "packagegroup-dey-bluetooth"
|
||||
PACKAGE_GROUP_dey-debug = "packagegroup-dey-debug"
|
||||
PACKAGE_GROUP_dey-examples = "packagegroup-dey-examples"
|
||||
PACKAGE_GROUP_dey-gstreamer = "packagegroup-dey-gstreamer"
|
||||
PACKAGE_GROUP_dey-network = "packagegroup-dey-network"
|
||||
PACKAGE_GROUP_dey-qt = "packagegroup-dey-qt"
|
||||
PACKAGE_GROUP_dey-wireless = "packagegroup-dey-wireless"
|
||||
|
||||
## Auxiliar variables and functions (used in del_rootfs_tuning)
|
||||
## Auxiliar variables and functions (used in dey_rootfs_tuning)
|
||||
LAYERS_REV = "${@'\n'.join(get_layers_branch_rev(d))}"
|
||||
DEL_TAG = "${@del_tag(d).strip()}"
|
||||
def del_tag(d):
|
||||
DEY_TAG = "${@dey_tag(d).strip()}"
|
||||
def dey_tag(d):
|
||||
import subprocess
|
||||
for layer in d.getVar('BBLAYERS', True).split():
|
||||
if 'meta-digi-del' in layer:
|
||||
if 'meta-digi-dey' in layer:
|
||||
cmd = 'git describe --tags --exact-match 2>/dev/null || true'
|
||||
return subprocess.Popen(cmd, cwd=layer, shell=True, stdout=subprocess.PIPE).stdout.read()
|
||||
return ""
|
||||
|
||||
## DEL rootfs final tuning
|
||||
del_rootfs_tuning() {
|
||||
## DEY rootfs final tuning
|
||||
dey_rootfs_tuning() {
|
||||
#######################################################################
|
||||
## Create '/etc/build' with build statistics
|
||||
#######################################################################
|
||||
cat >${IMAGE_ROOTFS}/etc/build <<-_EOF_
|
||||
TIMESTAMP=${DATETIME}
|
||||
DEL_TAG=${DEL_TAG}
|
||||
DEY_TAG=${DEY_TAG}
|
||||
|
||||
Layers revisions:
|
||||
=================
|
||||
|
|
@ -59,9 +59,9 @@ del_rootfs_tuning() {
|
|||
#######################################################################
|
||||
## WARNING:
|
||||
## enable passwordless 'root' autologin in serial console and telnetd
|
||||
## for testing purposes (when IMAGE_FEATURES contains 'del-test')
|
||||
## for testing purposes (when IMAGE_FEATURES contains 'dey-test')
|
||||
#######################################################################
|
||||
if echo "${IMAGE_FEATURES}" | grep -qs del-test; then
|
||||
if echo "${IMAGE_FEATURES}" | grep -qs dey-test; then
|
||||
if [ -f "${IMAGE_ROOTFS}/etc/inittab" ]; then
|
||||
cat >${IMAGE_ROOTFS}/sbin/rootlogin <<-_EOF_
|
||||
#!/bin/sh
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
include del.conf
|
||||
include dey.conf
|
||||
|
||||
DISTRO_FEATURES += "x11"
|
||||
VIRTUAL-RUNTIME_xserver_common = "xserver-common"
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
DISTRO = "del"
|
||||
DISTRO = "dey"
|
||||
SDK_DISTRO = "poky"
|
||||
DISTRO_NAME = "Digi Embedded Linux"
|
||||
DISTRO_NAME = "Digi Embedded for Yocto"
|
||||
DISTRO_VERSION = "1.3.2"
|
||||
SDK_VENDOR = "-pokysdk"
|
||||
SDK_VERSION := "${DISTRO_VERSION}"
|
||||
|
||||
MAINTAINER = "Digi Support <support@digi.com>"
|
||||
|
||||
TARGET_VENDOR = "-del"
|
||||
TARGET_VENDOR = "-dey"
|
||||
|
||||
LOCALCONF_VERSION = "1"
|
||||
LAYER_CONF_VERSION ?= "6"
|
||||
|
|
@ -27,7 +27,7 @@ DISTRO_FEATURES += "accel-graphics"
|
|||
DISTRO_FEATURES += "accelerometer"
|
||||
DISTRO_FEATURES += "ext-eth"
|
||||
|
||||
# Disable pulseaudio (not needed in del-image-minimal)
|
||||
# Disable pulseaudio (not needed in dey-image-minimal)
|
||||
DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
|
||||
|
||||
PREFERRED_PROVIDER_jpeg = "jpeg"
|
||||
|
|
@ -44,7 +44,7 @@ SDKPATH = "/opt/${SDK_DISTRO}/${SDK_VERSION}"
|
|||
EXTRAOPKGCONFIG = "poky-feed-config-opkg"
|
||||
|
||||
# Override these in poky based distros to modify DISTRO_EXTRA_R*
|
||||
POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-del-core"
|
||||
POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-dey-core"
|
||||
POKY_DEFAULT_EXTRA_RRECOMMENDS = ""
|
||||
|
||||
DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
|
||||
|
|
@ -5,9 +5,9 @@ BBPATH .= ":${LAYERDIR}"
|
|||
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
|
||||
${LAYERDIR}/recipes-*/*/*.bbappend"
|
||||
|
||||
BBFILE_COLLECTIONS += "del"
|
||||
BBFILE_PATTERN_del := "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_del = "6"
|
||||
BBFILE_COLLECTIONS += "dey"
|
||||
BBFILE_PATTERN_dey := "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_dey = "6"
|
||||
|
||||
# This is Digi's General license agreement.
|
||||
DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
|
||||
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Copyright (C) 2012 Digi International.
|
||||
#
|
||||
SUMMARY = "Bluetooth packagegroup for DEL image"
|
||||
SUMMARY = "Bluetooth packagegroup for DEY image"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Copyright (C) 2012 Digi International.
|
||||
#
|
||||
SUMMARY = "Network applications packagegroup for DEL image"
|
||||
SUMMARY = "Network applications packagegroup for DEY image"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Copyright (C) 2012 Digi International.
|
||||
#
|
||||
SUMMARY = "Wireless packagegroup for DEL image"
|
||||
SUMMARY = "Wireless packagegroup for DEY image"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
#
|
||||
# Copyright (C) 2012 Digi International.
|
||||
#
|
||||
require dey-image-graphical.bb
|
||||
|
||||
DESCRIPTION = "DEY SATO based graphical image suitable for development work."
|
||||
|
||||
IMAGE_FEATURES += "dev-pkgs"
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
# Copyright (C) 2013 Digi International.
|
||||
#
|
||||
|
||||
require del-image-graphical.bb
|
||||
require dey-image-graphical.bb
|
||||
|
||||
DESCRIPTION = "Image that includes everything within del-image-grahical plus meta-toolchain, \
|
||||
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.
|
||||
|
|
@ -5,11 +5,11 @@ DESCRIPTION = "Graphical image based on SATO, a gnome mobile environment visual
|
|||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
IMAGE_FEATURES += "splash package-management del-gstreamer x11-base x11-sato"
|
||||
IMAGE_FEATURES += "splash package-management dey-gstreamer x11-base x11-sato"
|
||||
|
||||
LICENSE = "MIT"
|
||||
|
||||
include del-image-minimal.bb
|
||||
include dey-image-minimal.bb
|
||||
|
||||
DISTRO_FEATURES += "pulseaudio"
|
||||
WEB = "web-webkit"
|
||||
|
|
@ -22,4 +22,4 @@ IMAGE_INSTALL += " \
|
|||
pointercal-xinput \
|
||||
"
|
||||
|
||||
export IMAGE_BASENAME = "del-image-graphical"
|
||||
export IMAGE_BASENAME = "dey-image-graphical"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue