diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 01a892b22..92a0c932f 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}" PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" -PREFERRED_VERSION_udev = "173" - # Digi BSP default settings IMAGE_CLASSES = "image_types_digi" diff --git a/meta-digi-dey/recipes-core/udev/udev-173/default b/meta-digi-dey/recipes-core/udev/udev-173/default deleted file mode 100644 index d0050b873..000000000 --- a/meta-digi-dey/recipes-core/udev/udev-173/default +++ /dev/null @@ -1,4 +0,0 @@ -# Default for /etc/init.d/udev - -# Comment this out to disable device cache -#DEVCACHE="/etc/dev.tar" diff --git a/meta-digi-dey/recipes-core/udev/udev-173/init b/meta-digi-dey/recipes-core/udev/udev-173/init deleted file mode 100644 index 7877f6eea..000000000 --- a/meta-digi-dey/recipes-core/udev/udev-173/init +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: udev -# Required-Start: mountvirtfs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# Short-Description: Start udevd, populate /dev and load drivers. -### END INIT INFO - -export TZ=/etc/localtime - -[ -d /sys/class ] || exit 1 -[ -r /proc/mounts ] || exit 1 -[ -x /sbin/udevd ] || exit 1 -[ -f /etc/default/udev ] && . /etc/default/udev -[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -kill_udevd() { - pid=`pidof -x udevd` - [ -n "$pid" ] && kill $pid -} - -export ACTION=add -# propagate /dev from /sys -echo "Starting udev" - -# mount the tmpfs on /dev, if not already done -LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && { - mount -n -o mode=0755 -t tmpfs none "/dev" - mkdir -m 0755 /dev/pts - mkdir -m 1777 /dev/shm -} - -if [ "$DEVCACHE" != "" ]; then - # Invalidate udev cache if the kernel or its bootargs/cmdline have changed - [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname - [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline - [ -r /proc/devices ] && cat /proc/devices > /tmp/devices || touch /tmp/devices - [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags - if [ -e $DEVCACHE ] && \ - cmp -s /tmp/uname /etc/udev/saved.uname && \ - cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ - cmp -s /tmp/devices /etc/udev/saved.devices && \ - cmp -s /tmp/atags /etc/udev/saved.atags; then - (cd /; tar xf $DEVCACHE > /dev/null 2>&1) - not_first_boot=1 - fi -fi - -if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then - mkdir -p /lib/modules/$(uname -r) - depmod -ae -fi - -# make_extra_nodes -kill_udevd > "/dev/null" 2>&1 - -# trigger the sorted events -echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug -/sbin/udevd -d - -/sbin/udevadm control --env STARTUP=1 -if [ "$not_first_boot" != "" ];then - /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform --action=add - (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)& -else - /sbin/udevadm trigger --action=add - /sbin/udevadm settle -fi - -# Create rest device nodes via configuration file. -[ -f /etc/device_table ] && /sbin/makedevs -d /etc/device_table / >/dev/null 2>&1 - -exit 0 diff --git a/meta-digi-dey/recipes-core/udev/udev_173.bbappend b/meta-digi-dey/recipes-core/udev/udev_173.bbappend deleted file mode 100644 index e8e01a86c..000000000 --- a/meta-digi-dey/recipes-core/udev/udev_173.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2013 Digi International. - -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -RRECOMMENDS_${PN} += "udev-extraconf" - -do_install_append() { - # Remove empty dir to clean build warning: - # QA Issue: udev: Files/directories were installed but not shipped - rmdir ${D}${sbindir} -}