From 6e5501a24f8aeff731896b59d27cbbe0e0425e46 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 6 Mar 2014 17:17:26 +0100 Subject: [PATCH] meta-digi-arm: remove udev bbappend It was added to fix [DEL-898] but it is no longer needed after the underlying changes in the rootfs hierarchy (added '/run' mountpoint) Signed-off-by: Javier Viguera --- .../conf/machine/include/imx-digi-base.inc | 3 +++ .../conf/machine/include/mxs-digi-base.inc | 3 +++ meta-digi-arm/recipes-core/udev/udev_182.bbappend | 15 --------------- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 meta-digi-arm/recipes-core/udev/udev_182.bbappend diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index edbad677e..350cbd9ef 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -15,6 +15,9 @@ XSERVER = "xserver-xorg \ # Ship kernel modules MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" +# Extra udev rules +MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf" + # Float-Point setting DEFAULTTUNE_mx6 ?= "cortexa9hf-neon" diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc index 74be2ff8e..12ae0d927 100644 --- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc @@ -22,6 +22,9 @@ INHERIT += "fsl-dynamic-packagearch" # Ship kernel modules MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" +# Extra udev rules +MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf" + EXTRA_IMAGEDEPENDS = "u-boot" # Flash image types diff --git a/meta-digi-arm/recipes-core/udev/udev_182.bbappend b/meta-digi-arm/recipes-core/udev/udev_182.bbappend deleted file mode 100644 index 010d18881..000000000 --- a/meta-digi-arm/recipes-core/udev/udev_182.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2013 Digi International. - -do_install_append () { - # On the fly fix udev init script and config file to avoid udev failing - # on boot a read-only NFSROOT: - # bind failed: No such file or directory - # bind failed: Address already in use - # error binding udev control socket - sed -i -e '/mkdir.*pts/a\ [ -e /dev/run ] || mkdir -m 0755 /dev/run' ${D}${sysconfdir}/init.d/udev - sed -i -e '/^udev_run=/c\udev_run="/dev/run/udev"' ${D}${sysconfdir}/udev/udev.conf -} - -# Add 'udev-extraconf' recommendation as most of the imx/mxs settings are in -# that package. -RRECOMMENDS_${PN} += "udev-extraconf"