From 0963f8282bc725aa6cc6582be083c36d7e4628f6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 1 Aug 2012 15:06:52 -0300 Subject: udev-extra-rules: follow meta-oe and use udev-extraconf This has been dropped from meta-oe so we append udev-extraconf now. For compatibility with udev-extraconf, we need to add an empty space to SRC_URI or the final SRC_URI will be broken. Signed-off-by: Otavio Salvador --- recipes-core/udev/udev-extra-rules.bbappend | 19 ------------------- recipes-core/udev/udev-extra-rules/10-imx.rules | 24 ------------------------ recipes-core/udev/udev-extraconf/10-imx.rules | 24 ++++++++++++++++++++++++ recipes-core/udev/udev-extraconf_0.0.bbappend | 19 +++++++++++++++++++ 4 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 recipes-core/udev/udev-extra-rules.bbappend delete mode 100644 recipes-core/udev/udev-extra-rules/10-imx.rules create mode 100644 recipes-core/udev/udev-extraconf/10-imx.rules create mode 100644 recipes-core/udev/udev-extraconf_0.0.bbappend diff --git a/recipes-core/udev/udev-extra-rules.bbappend b/recipes-core/udev/udev-extra-rules.bbappend deleted file mode 100644 index 81b584e..0000000 --- a/recipes-core/udev/udev-extra-rules.bbappend +++ /dev/null @@ -1,19 +0,0 @@ -# Freescale imx extra configuration udev rules -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 1}" - -SRC_URI_append_mxs = "file://10-imx.rules" -SRC_URI_append_mx5 = "file://10-imx.rules" -SRC_URI_append_mx6 = "file://10-imx.rules" - -do_install_prepend () { - if [ -e "${WORKDIR}/10-imx.rules" ]; then - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d - fi -} - -PACKAGE_ARCH_mxs = "${MACHINE_ARCH}" -PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" diff --git a/recipes-core/udev/udev-extra-rules/10-imx.rules b/recipes-core/udev/udev-extra-rules/10-imx.rules deleted file mode 100644 index 1fc32dc..0000000 --- a/recipes-core/udev/udev-extra-rules/10-imx.rules +++ /dev/null @@ -1,24 +0,0 @@ -# Create symlinks for i.mx keypads and touchscreens -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxckpd", SYMLINK+="input/keyboard0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxc_ts", SYMLINK+="input/ts0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="imx_adc_ts", SYMLINK+="input/ts0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mpr084", SYMLINK+="input/keyboard0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="tsc2007", SYMLINK+="input/ts0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="STMP3XXX touchscreen", SYMLINK+="input/ts0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="MXS touchscreen", SYMLINK+="input/ts0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="HannStar P1003 Touchscreen", SYMLINK+="input/ts0" -#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="eGalax Touch Screen", SYMLINK+="input/ts0" - -# The long class name gets cut off to be mc13783_connectiv in -# /sys/class/mc13783_connectivity/mc13783_connectivit -KERNEL=="mc13783_connectiv*", NAME="mc13783_connectivity" -# Anyone has readonly permission to IIM device file -KERNEL=="mxc_iim", MODE="0444", SYMLINK+="mxc_mem" -KERNEL=="mxs_viim", MODE="0444", SYMLINK+="mxc_mem" -KERNEL=="mxc_ipu", MODE="0666" -KERNEL=="fb0", MODE="0666" -KERNEL=="fb1", MODE="0666" -KERNEL=="fb2", MODE="0666" -KERNEL=="mxc_vpu", MODE="0666" -SUBSYSTEM=="video", MODE="0666" -KERNEL=="gsl_kmod", MODE="0666" diff --git a/recipes-core/udev/udev-extraconf/10-imx.rules b/recipes-core/udev/udev-extraconf/10-imx.rules new file mode 100644 index 0000000..1fc32dc --- /dev/null +++ b/recipes-core/udev/udev-extraconf/10-imx.rules @@ -0,0 +1,24 @@ +# Create symlinks for i.mx keypads and touchscreens +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxckpd", SYMLINK+="input/keyboard0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxc_ts", SYMLINK+="input/ts0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="imx_adc_ts", SYMLINK+="input/ts0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mpr084", SYMLINK+="input/keyboard0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="tsc2007", SYMLINK+="input/ts0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="STMP3XXX touchscreen", SYMLINK+="input/ts0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="MXS touchscreen", SYMLINK+="input/ts0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="HannStar P1003 Touchscreen", SYMLINK+="input/ts0" +#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="eGalax Touch Screen", SYMLINK+="input/ts0" + +# The long class name gets cut off to be mc13783_connectiv in +# /sys/class/mc13783_connectivity/mc13783_connectivit +KERNEL=="mc13783_connectiv*", NAME="mc13783_connectivity" +# Anyone has readonly permission to IIM device file +KERNEL=="mxc_iim", MODE="0444", SYMLINK+="mxc_mem" +KERNEL=="mxs_viim", MODE="0444", SYMLINK+="mxc_mem" +KERNEL=="mxc_ipu", MODE="0666" +KERNEL=="fb0", MODE="0666" +KERNEL=="fb1", MODE="0666" +KERNEL=="fb2", MODE="0666" +KERNEL=="mxc_vpu", MODE="0666" +SUBSYSTEM=="video", MODE="0666" +KERNEL=="gsl_kmod", MODE="0666" diff --git a/recipes-core/udev/udev-extraconf_0.0.bbappend b/recipes-core/udev/udev-extraconf_0.0.bbappend new file mode 100644 index 0000000..b8af0f1 --- /dev/null +++ b/recipes-core/udev/udev-extraconf_0.0.bbappend @@ -0,0 +1,19 @@ +# Freescale imx extra configuration udev rules +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 1}" + +SRC_URI_append_mxs = " file://10-imx.rules" +SRC_URI_append_mx5 = " file://10-imx.rules" +SRC_URI_append_mx6 = " file://10-imx.rules" + +do_install_prepend () { + if [ -e "${WORKDIR}/10-imx.rules" ]; then + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d + fi +} + +PACKAGE_ARCH_mxs = "${MACHINE_ARCH}" +PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" +PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf