From 14bf87bc4cf2c389c624ffdb1a6d09c24e3ab9d0 Mon Sep 17 00:00:00 2001 From: Jeff Hatch Date: Mon, 13 Feb 2017 14:34:48 -0600 Subject: Initial commit of Yocto 2.1 changes --- conf/distro/mlinux.conf | 2 +- .../hostapd/hostap-daemon_1.0.bbappend | 8 -- recipes-connectivity/openssh/openssh_%.bbappend | 21 ++++ .../openssh/openssh_6.5p1.bbappend | 21 ---- recipes-connectivity/openssl/openssl.inc | 4 +- recipes-connectivity/ppp/ppp_2.4.7.bb | 2 +- recipes-core/busybox/busybox_%.bbappend | 10 ++ recipes-core/busybox/busybox_1.22.1.bbappend | 10 -- recipes-core/images/mlinux-base-image.bb | 2 +- recipes-core/mlinux/mlinux-version.bb | 22 ---- recipes-core/mlinux/mlinux-version.bb.orig | 22 ++++ .../udev/eudev-3.1.5/cellular_radios.rules | 59 +++++++++ recipes-core/udev/eudev-3.1.5/init | 138 +++++++++++++++++++++ recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules | 8 ++ .../eudev-3.1.5/mtcdt/accessory_ethernet.rules | 21 ++++ recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules | 14 +++ recipes-core/udev/eudev-3.1.5/udev-cache.default | 5 + recipes-core/udev/eudev_3.1.5.bbappend | 20 +++ recipes-core/udev/udev-182/cellular_radios.rules | 69 ----------- recipes-core/udev/udev-182/init | 138 --------------------- recipes-core/udev/udev-182/mtcap/mtcap.rules | 8 -- .../udev/udev-182/mtcdt/accessory_ethernet.rules | 21 ---- recipes-core/udev/udev-182/mtcdt/mtcdt.rules | 14 --- recipes-core/udev/udev-182/udev-cache.default | 5 - recipes-core/udev/udev-extraconf_%.bbappend | 2 + recipes-core/udev/udev-extraconf_1.0.bbappend | 2 - recipes-core/udev/udev_182.bbappend | 20 --- recipes-extended/lighttpd/lighttpd_%.bbappend | 21 ++++ recipes-extended/lighttpd/lighttpd_1.4.33.bbappend | 21 ---- recipes-extended/logrotate/logrotate_%.bbappend | 15 +++ .../logrotate/logrotate_3.8.7.bbappend | 15 --- recipes-java/openjdk/openjdk-7/jvm.cfg | 43 ------- .../openjdk/openjdk-7_25b30-2.3.12.bbappend | 6 - recipes-java/openjdk/openjdk-8/jvm.cfg | 43 +++++++ recipes-java/openjdk/openjdk-8_102b14.bbappend | 6 + recipes-ruby/ruby/ruby_%.bbappend | 4 + recipes-ruby/ruby/ruby_1.9.3-p429.bbappend | 4 - recipes-support/multitech/jsparser_0.3.bb | 2 - recipes-support/ntp/ntp_%.bbappend | 30 +++++ recipes-support/ntp/ntp_4.2.6p5.bbappend | 33 ----- 40 files changed, 444 insertions(+), 467 deletions(-) delete mode 100644 recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend create mode 100644 recipes-connectivity/openssh/openssh_%.bbappend delete mode 100644 recipes-connectivity/openssh/openssh_6.5p1.bbappend create mode 100644 recipes-core/busybox/busybox_%.bbappend delete mode 100644 recipes-core/busybox/busybox_1.22.1.bbappend delete mode 100644 recipes-core/mlinux/mlinux-version.bb create mode 100644 recipes-core/mlinux/mlinux-version.bb.orig create mode 100644 recipes-core/udev/eudev-3.1.5/cellular_radios.rules create mode 100644 recipes-core/udev/eudev-3.1.5/init create mode 100644 recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules create mode 100644 recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules create mode 100644 recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules create mode 100644 recipes-core/udev/eudev-3.1.5/udev-cache.default create mode 100644 recipes-core/udev/eudev_3.1.5.bbappend delete mode 100644 recipes-core/udev/udev-182/cellular_radios.rules delete mode 100644 recipes-core/udev/udev-182/init delete mode 100644 recipes-core/udev/udev-182/mtcap/mtcap.rules delete mode 100644 recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules delete mode 100644 recipes-core/udev/udev-182/mtcdt/mtcdt.rules delete mode 100644 recipes-core/udev/udev-182/udev-cache.default create mode 100644 recipes-core/udev/udev-extraconf_%.bbappend delete mode 100644 recipes-core/udev/udev-extraconf_1.0.bbappend delete mode 100644 recipes-core/udev/udev_182.bbappend create mode 100644 recipes-extended/lighttpd/lighttpd_%.bbappend delete mode 100644 recipes-extended/lighttpd/lighttpd_1.4.33.bbappend create mode 100644 recipes-extended/logrotate/logrotate_%.bbappend delete mode 100644 recipes-extended/logrotate/logrotate_3.8.7.bbappend delete mode 100644 recipes-java/openjdk/openjdk-7/jvm.cfg delete mode 100644 recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend create mode 100644 recipes-java/openjdk/openjdk-8/jvm.cfg create mode 100644 recipes-java/openjdk/openjdk-8_102b14.bbappend create mode 100644 recipes-ruby/ruby/ruby_%.bbappend delete mode 100644 recipes-ruby/ruby/ruby_1.9.3-p429.bbappend create mode 100644 recipes-support/ntp/ntp_%.bbappend delete mode 100644 recipes-support/ntp/ntp_4.2.6p5.bbappend diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index 1ad1f27..17b68c0 100644 --- a/conf/distro/mlinux.conf +++ b/conf/distro/mlinux.conf @@ -30,7 +30,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" # extra packages to add to images -DISTRO_EXTRA_RDEPENDS += "mlinux-version" +#DISTRO_EXTRA_RDEPENDS += "mlinux-version" # add mlinux source mirror INHERIT += "mlinux-mirrors" diff --git a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend b/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend deleted file mode 100644 index 48af903..0000000 --- a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -SRC_URI += "file://default" - -do_install_append() { - mkdir -p ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/default ${D}${sysconfdir}/default/hostapd -} diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend new file mode 100644 index 0000000..87891c8 --- /dev/null +++ b/recipes-connectivity/openssh/openssh_%.bbappend @@ -0,0 +1,21 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://ssh.default" + +KEYFILES = "ssh_host_dsa_key \ +ssh_host_dsa_key.pub \ +ssh_host_ecdsa_key \ +ssh_host_ecdsa_key.pub \ +ssh_host_rsa_key \ +ssh_host_rsa_key.pub \ +ssh_host_ed25519_key \ +ssh_host_ed25519_key.pub \ +" + +do_install_append() { + install -d ${D}${sysconfdir}/default + install -m 644 ${WORKDIR}/ssh.default ${D}${sysconfdir}/default/ssh + for f in ${KEYFILES}; do + ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f + done +} diff --git a/recipes-connectivity/openssh/openssh_6.5p1.bbappend b/recipes-connectivity/openssh/openssh_6.5p1.bbappend deleted file mode 100644 index 87891c8..0000000 --- a/recipes-connectivity/openssh/openssh_6.5p1.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://ssh.default" - -KEYFILES = "ssh_host_dsa_key \ -ssh_host_dsa_key.pub \ -ssh_host_ecdsa_key \ -ssh_host_ecdsa_key.pub \ -ssh_host_rsa_key \ -ssh_host_rsa_key.pub \ -ssh_host_ed25519_key \ -ssh_host_ed25519_key.pub \ -" - -do_install_append() { - install -d ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/ssh.default ${D}${sysconfdir}/default/ssh - for f in ${KEYFILES}; do - ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f - done -} diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl.inc index 3b59e96..7533e8a 100644 --- a/recipes-connectivity/openssl/openssl.inc +++ b/recipes-connectivity/openssl/openssl.inc @@ -8,8 +8,8 @@ SECTION = "libs/network" LICENSE = "openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" -# DEPENDS = "makedepend-native hostperl-runtime-native" -DEPENDS = "makedepend-native perl-native-runtime" +DEPENDS = "makedepend-native hostperl-runtime-native" +#DEPENDS = "makedepend-native perl-native-runtime" DEPENDS_append_class-target = " openssl-native" SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ diff --git a/recipes-connectivity/ppp/ppp_2.4.7.bb b/recipes-connectivity/ppp/ppp_2.4.7.bb index 881c40e..4d9094c 100644 --- a/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -34,7 +34,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a" SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30" -inherit autotools +inherit autotools-brokensep TARGET_CC_ARCH += " ${LDFLAGS}" EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend new file mode 100644 index 0000000..40094e9 --- /dev/null +++ b/recipes-core/busybox/busybox_%.bbappend @@ -0,0 +1,10 @@ +PR .= ".mlinux1" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:${THISDIR}/files:" + +SRC_URI += "file://udhcpd.conf.example" + +do_install_append () { + install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf.example + install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf +} diff --git a/recipes-core/busybox/busybox_1.22.1.bbappend b/recipes-core/busybox/busybox_1.22.1.bbappend deleted file mode 100644 index 40094e9..0000000 --- a/recipes-core/busybox/busybox_1.22.1.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -PR .= ".mlinux1" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:${THISDIR}/files:" - -SRC_URI += "file://udhcpd.conf.example" - -do_install_append () { - install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf.example - install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf -} diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb index a0c460d..3ba6b2f 100644 --- a/recipes-core/images/mlinux-base-image.bb +++ b/recipes-core/images/mlinux-base-image.bb @@ -29,7 +29,7 @@ WIFI_FEATURES = " \ hostap-daemon hostap-utils \ " -BLUETOOTH_FEATURES = "bluez4" +BLUETOOTH_FEATURES = "bluez5" # Add all timezones available # ntpdate will sync time every 30 min by default via cron diff --git a/recipes-core/mlinux/mlinux-version.bb b/recipes-core/mlinux/mlinux-version.bb deleted file mode 100644 index f2debe1..0000000 --- a/recipes-core/mlinux/mlinux-version.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit mlinux_metadata_scm - -# always parse this file so PV can change automatically -__BB_DONT_CACHE = "1" - -PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}" -PR = "r2" -PE = "1" - -PACKAGES = "${PN}" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_install() { - mkdir -p ${D}${sysconfdir} - echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version - echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version - echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version - echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers -} diff --git a/recipes-core/mlinux/mlinux-version.bb.orig b/recipes-core/mlinux/mlinux-version.bb.orig new file mode 100644 index 0000000..f2debe1 --- /dev/null +++ b/recipes-core/mlinux/mlinux-version.bb.orig @@ -0,0 +1,22 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit mlinux_metadata_scm + +# always parse this file so PV can change automatically +__BB_DONT_CACHE = "1" + +PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}" +PR = "r2" +PE = "1" + +PACKAGES = "${PN}" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + mkdir -p ${D}${sysconfdir} + echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version + echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version + echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version + echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers +} diff --git a/recipes-core/udev/eudev-3.1.5/cellular_radios.rules b/recipes-core/udev/eudev-3.1.5/cellular_radios.rules new file mode 100644 index 0000000..aa05e96 --- /dev/null +++ b/recipes-core/udev/eudev-3.1.5/cellular_radios.rules @@ -0,0 +1,59 @@ +ACTION=="remove", GOTO="mlinux_end" +SUBSYSTEM!="tty", GOTO="mlinux_end" +KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="mlinux_end" + +SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" +ENV{ID_IFACE}=="", GOTO="mlinux_end" + +# All modem ports +# H5 +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="02", SYMLINK+="modem1" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="04", SYMLINK+="modem2" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem3" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6" +# EV3 +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem2" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem3" +# H4 +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="00", SYMLINK+="modem0" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="01", SYMLINK+="modem1" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="02", SYMLINK+="modem2" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem3" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem4" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem5" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="06", SYMLINK+="modem6" +# EV2 +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}" + +# AT Command ports +# H5: ttyACM0, ttyACM3 +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1" +# EV3: ttyUSB2, ttyUSB3 +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1" +# H4: ttyUSB3, ttyUSB4, ttyUSB5 +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem_at0" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem_at1" +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem_at2" +# EV2: ttyUSB0 +ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0" +# LAT1, LEU1, LVW2: ttyUSB2, ttyUSB3 (port 04 and port 05) +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="04", SYMLINK+="modem_at0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="05", SYMLINK+="modem_at1" +# LJP1(LE910-JN1), LNA3(LE910-NA1): ttyACM0, ttyACM3 (port 00 and port 03) +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1" +# G3: ttyACM0, ttyACM1 +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="02", SYMLINK+="modem_at1" +# C2: ttyUSB0, ttyUSB1 (Telit Documentation: Modem Port = USB1, Aux Port = USB0) +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="01", SYMLINK+="modem_at0" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="00", SYMLINK+="modem_at1" + +LABEL="mlinux_end" diff --git a/recipes-core/udev/eudev-3.1.5/init b/recipes-core/udev/eudev-3.1.5/init new file mode 100644 index 0000000..bd716b0 --- /dev/null +++ b/recipes-core/udev/eudev-3.1.5/init @@ -0,0 +1,138 @@ +#!/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 @UDEVD@ ] || exit 1 +[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache +[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf +[ -f /etc/default/rcS ] && . /etc/default/rcS + +readfiles () { + READDATA="" + for filename in $@; do + if [ -r $filename ]; then + while read line; do + READDATA="$READDATA$line" + done < $filename + fi + done +} + +kill_udevd () { + pid=`pidof -x udevd` + [ -n "$pid" ] && kill $pid +} + +case "$1" in + start) + export ACTION=add + # propagate /dev from /sys + echo "Starting udev" + + # Check for requireed devtmpfs before trying to start udev and + # mount a no-existant fs. + if ! grep -q devtmpfs /proc/filesystems + then + echo "Missing devtmpfs, which is required for udev to run"; + echo "Halting..." + halt + fi + # mount the devtmpfs on /dev, if not already done + LANG=C awk '$2 == "/dev" && ($3 == "devtmpfs") { exit 1 }' /proc/mounts && { + mount -n -o mode=0755 -t devtmpfs none "/dev" + } + [ -e /dev/pts ] || mkdir -m 0755 /dev/pts + [ -e /dev/shm ] || mkdir -m 1777 /dev/shm + # the automount rule for udev needs /tmp directory available, as /tmp is a symlink + # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure + # /var/volatile/tmp directory to be available. + mkdir -p /var/volatile/tmp + + # Cache handling. + # A list of files which are used as a criteria to judge whether the udev cache could be reused. + CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices /proc/atags" + if [ "$DEVCACHE" != "" ]; then + if [ -e $DEVCACHE ]; then + readfiles $CMP_FILE_LIST + NEWDATA="$READDATA" + readfiles /etc/udev/cache.data + OLDDATA="$READDATA" + if [ "$OLDDATA" = "$NEWDATA" ]; then + (cd /; tar xf $DEVCACHE > /dev/null 2>&1) + not_first_boot=1 + [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE" + [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache + else + # Output detailed reason why the cached /dev is not used + if [ "$VERBOSE" != "no" ]; then + echo "udev: udev cache not used" + echo "udev: we use $CMP_FILE_LIST as criteria to judge whether the cache /dev could be resued" + echo "udev: olddata: $OLDDATA" + echo "udev: newdata: $NEWDATA" + fi + echo "$NEWDATA" > /dev/shm/udev.cache + fi + else + if [ "$ROOTFS_READ_ONLY" != "yes" ]; then + # If rootfs is not read-only, it's possible that a new udev cache would be generated; + # otherwise, we do not bother to read files. + readfiles $CMP_FILE_LIST + echo "$READDATA" > /dev/shm/udev.cache + fi + fi + fi + + # make_extra_nodes + kill_udevd > "/dev/null" 2>&1 + + # trigger the sorted events + echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + @UDEVD@ -d + + udevadm control --env=STARTUP=1 + if [ "$not_first_boot" != "" ];then + if [ "$PROBE_PLATFORM_BUS" != "yes" ]; then + PLATFORM_BUS_NOMATCH="--subsystem-nomatch=platform" + else + PLATFORM_BUS_NOMATCH="" + fi + udevadm trigger --action=add --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 $PLATFORM_BUS_NOMATCH + (udevadm settle --timeout=10; udevadm control --env=STARTUP=)& + else + udevadm trigger --action=add + udevadm settle + fi + ;; + stop) + echo "Stopping udevd" + start-stop-daemon --stop --name udevd --quiet + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + status) + pid=`pidof -x udevd` + if [ -n "$pid" ]; then + echo "udevd (pid $pid) is running ..." + else + echo "udevd is stopped" + fi + ;; + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 +esac +exit 0 diff --git a/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules b/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules new file mode 100644 index 0000000..a0dc9fb --- /dev/null +++ b/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules @@ -0,0 +1,8 @@ +ACTION=="remove", GOTO="mlinux_end" +SUBSYSTEM!="tty", GOTO="mlinux_end" +KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end" + +SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" +ENV{ID_IFACE}=="", GOTO="mlinux_end" + +LABEL="mlinux_end" diff --git a/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules new file mode 100644 index 0000000..376486b --- /dev/null +++ b/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules @@ -0,0 +1,21 @@ +#To add new rule for new device you have to run (in case if you want to add eth1 interface) +#admin@mtcdt:~# udevadm info --attribute-walk --path=/sys/class/net/eth1 +# looking at device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0/net/eth1': +# KERNEL=="eth1" +# SUBSYSTEM=="net" +# DRIVER=="" +# ATTR{mtu}=="1500" +# ATTR{type}=="1" +# ........... +# ........... + +# looking at parent device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0': +# KERNELS=="1-2.1.1:1.0" <------------------- extract this record to add to the rule +# SUBSYSTEMS=="usb" +# DRIVERS=="smsc75xx" +# ATTRS{bInterfaceClass}=="ff" +# ATTRS{bInterfaceSubClass}=="00" +# ........... + +KERNELS=="1-2.1.1:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth1" +KERNELS=="1-2.1.2:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth2" diff --git a/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules new file mode 100644 index 0000000..5d528e6 --- /dev/null +++ b/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules @@ -0,0 +1,14 @@ +ACTION=="remove", GOTO="mlinux_end" +SUBSYSTEM!="tty", GOTO="mlinux_end" +KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end" + +SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" +ENV{ID_IFACE}=="", GOTO="mlinux_end" + +# Accessory Ports +ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" +ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" +ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" +ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" + +LABEL="mlinux_end" diff --git a/recipes-core/udev/eudev-3.1.5/udev-cache.default b/recipes-core/udev/eudev-3.1.5/udev-cache.default new file mode 100644 index 0000000..b1aa63f --- /dev/null +++ b/recipes-core/udev/eudev-3.1.5/udev-cache.default @@ -0,0 +1,5 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" +PROBE_PLATFORM_BUS="yes" diff --git a/recipes-core/udev/eudev_3.1.5.bbappend b/recipes-core/udev/eudev_3.1.5.bbappend new file mode 100644 index 0000000..e793d1d --- /dev/null +++ b/recipes-core/udev/eudev_3.1.5.bbappend @@ -0,0 +1,20 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" + +PR .= ".mlinux2" + +# add custom rules for persistent modem device names +SRC_URI += " file://cellular_radios.rules \ + file://${MACHINE}.rules \ + " + +SRC_URI_append_mtcdt = " file://accessory_ethernet.rules \ + " + +do_install_append() { + install -m 644 ${WORKDIR}/cellular_radios.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 644 ${WORKDIR}/${MACHINE}.rules ${D}${sysconfdir}/udev/rules.d/ +} + +do_install_append_mtcdt() { + install -m 644 ${WORKDIR}/accessory_ethernet.rules ${D}${sysconfdir}/udev/rules.d/ +} diff --git a/recipes-core/udev/udev-182/cellular_radios.rules b/recipes-core/udev/udev-182/cellular_radios.rules deleted file mode 100644 index fd36bbd..0000000 --- a/recipes-core/udev/udev-182/cellular_radios.rules +++ /dev/null @@ -1,69 +0,0 @@ -ACTION=="remove", GOTO="mlinux_end" -SUBSYSTEM!="tty", GOTO="mlinux_end" -KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="mlinux_end" - -SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" -ENV{ID_IFACE}=="", GOTO="mlinux_end" - -# All modem ports -# H5 -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="02", SYMLINK+="modem1" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="04", SYMLINK+="modem2" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem3" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6" -# LAT3, LVW3 and LEU3 -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="02", SYMLINK+="modem1" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="04", SYMLINK+="modem2" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem3" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="08", SYMLINK+="modem4" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="0a", SYMLINK+="modem5" -# EV3 -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem2" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem3" -# H4 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="00", SYMLINK+="modem0" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="01", SYMLINK+="modem1" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="02", SYMLINK+="modem2" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem3" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem4" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem5" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="06", SYMLINK+="modem6" -# EV2 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}" - -# AT Command ports -# H5: ttyACM0, ttyACM3 -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1" -# LAT3, LVW3 and LEU3 -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1" -# EV3: ttyUSB2, ttyUSB3 -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1" -# H4: ttyUSB3, ttyUSB4, ttyUSB5 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem_at1" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem_at2" -# EV2: ttyUSB0 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0" -# LAT1, LEU1, LVW2: ttyUSB2, ttyUSB3 (port 04 and port 05) -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="04", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="05", SYMLINK+="modem_at1" -# LJP1(LE910-JN1), LNA3(LE910-NA1): ttyACM0, ttyACM3 (port 00 and port 03) -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1" -# G3: ttyACM0, ttyACM1 -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="02", SYMLINK+="modem_at1" -# C2: ttyUSB0, ttyUSB1 (Telit Documentation: Modem Port = USB1, Aux Port = USB0) -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="01", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="00", SYMLINK+="modem_at1" - -LABEL="mlinux_end" diff --git a/recipes-core/udev/udev-182/init b/recipes-core/udev/udev-182/init deleted file mode 100644 index bd716b0..0000000 --- a/recipes-core/udev/udev-182/init +++ /dev/null @@ -1,138 +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 @UDEVD@ ] || exit 1 -[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache -[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf -[ -f /etc/default/rcS ] && . /etc/default/rcS - -readfiles () { - READDATA="" - for filename in $@; do - if [ -r $filename ]; then - while read line; do - READDATA="$READDATA$line" - done < $filename - fi - done -} - -kill_udevd () { - pid=`pidof -x udevd` - [ -n "$pid" ] && kill $pid -} - -case "$1" in - start) - export ACTION=add - # propagate /dev from /sys - echo "Starting udev" - - # Check for requireed devtmpfs before trying to start udev and - # mount a no-existant fs. - if ! grep -q devtmpfs /proc/filesystems - then - echo "Missing devtmpfs, which is required for udev to run"; - echo "Halting..." - halt - fi - # mount the devtmpfs on /dev, if not already done - LANG=C awk '$2 == "/dev" && ($3 == "devtmpfs") { exit 1 }' /proc/mounts && { - mount -n -o mode=0755 -t devtmpfs none "/dev" - } - [ -e /dev/pts ] || mkdir -m 0755 /dev/pts - [ -e /dev/shm ] || mkdir -m 1777 /dev/shm - # the automount rule for udev needs /tmp directory available, as /tmp is a symlink - # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure - # /var/volatile/tmp directory to be available. - mkdir -p /var/volatile/tmp - - # Cache handling. - # A list of files which are used as a criteria to judge whether the udev cache could be reused. - CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices /proc/atags" - if [ "$DEVCACHE" != "" ]; then - if [ -e $DEVCACHE ]; then - readfiles $CMP_FILE_LIST - NEWDATA="$READDATA" - readfiles /etc/udev/cache.data - OLDDATA="$READDATA" - if [ "$OLDDATA" = "$NEWDATA" ]; then - (cd /; tar xf $DEVCACHE > /dev/null 2>&1) - not_first_boot=1 - [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE" - [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache - else - # Output detailed reason why the cached /dev is not used - if [ "$VERBOSE" != "no" ]; then - echo "udev: udev cache not used" - echo "udev: we use $CMP_FILE_LIST as criteria to judge whether the cache /dev could be resued" - echo "udev: olddata: $OLDDATA" - echo "udev: newdata: $NEWDATA" - fi - echo "$NEWDATA" > /dev/shm/udev.cache - fi - else - if [ "$ROOTFS_READ_ONLY" != "yes" ]; then - # If rootfs is not read-only, it's possible that a new udev cache would be generated; - # otherwise, we do not bother to read files. - readfiles $CMP_FILE_LIST - echo "$READDATA" > /dev/shm/udev.cache - fi - fi - fi - - # make_extra_nodes - kill_udevd > "/dev/null" 2>&1 - - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - @UDEVD@ -d - - udevadm control --env=STARTUP=1 - if [ "$not_first_boot" != "" ];then - if [ "$PROBE_PLATFORM_BUS" != "yes" ]; then - PLATFORM_BUS_NOMATCH="--subsystem-nomatch=platform" - else - PLATFORM_BUS_NOMATCH="" - fi - udevadm trigger --action=add --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 $PLATFORM_BUS_NOMATCH - (udevadm settle --timeout=10; udevadm control --env=STARTUP=)& - else - udevadm trigger --action=add - udevadm settle - fi - ;; - stop) - echo "Stopping udevd" - start-stop-daemon --stop --name udevd --quiet - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - pid=`pidof -x udevd` - if [ -n "$pid" ]; then - echo "udevd (pid $pid) is running ..." - else - echo "udevd is stopped" - fi - ;; - *) - echo "Usage: $0 {start|stop|status|restart}" - exit 1 -esac -exit 0 diff --git a/recipes-core/udev/udev-182/mtcap/mtcap.rules b/recipes-core/udev/udev-182/mtcap/mtcap.rules deleted file mode 100644 index a0dc9fb..0000000 --- a/recipes-core/udev/udev-182/mtcap/mtcap.rules +++ /dev/null @@ -1,8 +0,0 @@ -ACTION=="remove", GOTO="mlinux_end" -SUBSYSTEM!="tty", GOTO="mlinux_end" -KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end" - -SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" -ENV{ID_IFACE}=="", GOTO="mlinux_end" - -LABEL="mlinux_end" diff --git a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules b/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules deleted file mode 100644 index 376486b..0000000 --- a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules +++ /dev/null @@ -1,21 +0,0 @@ -#To add new rule for new device you have to run (in case if you want to add eth1 interface) -#admin@mtcdt:~# udevadm info --attribute-walk --path=/sys/class/net/eth1 -# looking at device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0/net/eth1': -# KERNEL=="eth1" -# SUBSYSTEM=="net" -# DRIVER=="" -# ATTR{mtu}=="1500" -# ATTR{type}=="1" -# ........... -# ........... - -# looking at parent device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0': -# KERNELS=="1-2.1.1:1.0" <------------------- extract this record to add to the rule -# SUBSYSTEMS=="usb" -# DRIVERS=="smsc75xx" -# ATTRS{bInterfaceClass}=="ff" -# ATTRS{bInterfaceSubClass}=="00" -# ........... - -KERNELS=="1-2.1.1:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth1" -KERNELS=="1-2.1.2:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth2" diff --git a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules b/recipes-core/udev/udev-182/mtcdt/mtcdt.rules deleted file mode 100644 index 5d528e6..0000000 --- a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules +++ /dev/null @@ -1,14 +0,0 @@ -ACTION=="remove", GOTO="mlinux_end" -SUBSYSTEM!="tty", GOTO="mlinux_end" -KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end" - -SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" -ENV{ID_IFACE}=="", GOTO="mlinux_end" - -# Accessory Ports -ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" -ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" -ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" -ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" - -LABEL="mlinux_end" diff --git a/recipes-core/udev/udev-182/udev-cache.default b/recipes-core/udev/udev-182/udev-cache.default deleted file mode 100644 index b1aa63f..0000000 --- a/recipes-core/udev/udev-182/udev-cache.default +++ /dev/null @@ -1,5 +0,0 @@ -# Default for /etc/init.d/udev - -# Comment this out to disable device cache -#DEVCACHE="/etc/dev.tar" -PROBE_PLATFORM_BUS="yes" diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend new file mode 100644 index 0000000..6d4804d --- /dev/null +++ b/recipes-core/udev/udev-extraconf_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + diff --git a/recipes-core/udev/udev-extraconf_1.0.bbappend b/recipes-core/udev/udev-extraconf_1.0.bbappend deleted file mode 100644 index 6d4804d..0000000 --- a/recipes-core/udev/udev-extraconf_1.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - diff --git a/recipes-core/udev/udev_182.bbappend b/recipes-core/udev/udev_182.bbappend deleted file mode 100644 index e793d1d..0000000 --- a/recipes-core/udev/udev_182.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -PR .= ".mlinux2" - -# add custom rules for persistent modem device names -SRC_URI += " file://cellular_radios.rules \ - file://${MACHINE}.rules \ - " - -SRC_URI_append_mtcdt = " file://accessory_ethernet.rules \ - " - -do_install_append() { - install -m 644 ${WORKDIR}/cellular_radios.rules ${D}${sysconfdir}/udev/rules.d/ - install -m 644 ${WORKDIR}/${MACHINE}.rules ${D}${sysconfdir}/udev/rules.d/ -} - -do_install_append_mtcdt() { - install -m 644 ${WORKDIR}/accessory_ethernet.rules ${D}${sysconfdir}/udev/rules.d/ -} diff --git a/recipes-extended/lighttpd/lighttpd_%.bbappend b/recipes-extended/lighttpd/lighttpd_%.bbappend new file mode 100644 index 0000000..473a113 --- /dev/null +++ b/recipes-extended/lighttpd/lighttpd_%.bbappend @@ -0,0 +1,21 @@ +PR .= ".mlinux1" + +# build with openssl support +DEPENDS += " openssl " +RDEPENDS_${PN} += " openssl logrotate " + +EXTRA_OECONF += "--with-openssl" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" + +SRC_URI += "file://lighttpd.logrotate.conf \ + file://lighttpd.default" + +do_install_append() { + install -d ${D}${sysconfdir}/logrotate.d + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf + install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd +} + +CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf" diff --git a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend deleted file mode 100644 index 473a113..0000000 --- a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -PR .= ".mlinux1" - -# build with openssl support -DEPENDS += " openssl " -RDEPENDS_${PN} += " openssl logrotate " - -EXTRA_OECONF += "--with-openssl" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" - -SRC_URI += "file://lighttpd.logrotate.conf \ - file://lighttpd.default" - -do_install_append() { - install -d ${D}${sysconfdir}/logrotate.d - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf - install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd -} - -CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf" diff --git a/recipes-extended/logrotate/logrotate_%.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend new file mode 100644 index 0000000..efebecb --- /dev/null +++ b/recipes-extended/logrotate/logrotate_%.bbappend @@ -0,0 +1,15 @@ +PR .= ".mlinux2" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" + +SRC_URI += "file://logrotate.conf" + +do_install_append() { + # setup cron to run logrotate more often + rm -f ${D}${sysconfdir}/cron.daily/logrotate + install -d ${D}${sysconfdir}/cron.d + echo "*/5 * * * * root /usr/sbin/logrotate /etc/logrotate.conf" > ${D}${sysconfdir}/cron.d/logrotate + + install -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/ +} + diff --git a/recipes-extended/logrotate/logrotate_3.8.7.bbappend b/recipes-extended/logrotate/logrotate_3.8.7.bbappend deleted file mode 100644 index efebecb..0000000 --- a/recipes-extended/logrotate/logrotate_3.8.7.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -PR .= ".mlinux2" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" - -SRC_URI += "file://logrotate.conf" - -do_install_append() { - # setup cron to run logrotate more often - rm -f ${D}${sysconfdir}/cron.daily/logrotate - install -d ${D}${sysconfdir}/cron.d - echo "*/5 * * * * root /usr/sbin/logrotate /etc/logrotate.conf" > ${D}${sysconfdir}/cron.d/logrotate - - install -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/ -} - diff --git a/recipes-java/openjdk/openjdk-7/jvm.cfg b/recipes-java/openjdk/openjdk-7/jvm.cfg deleted file mode 100644 index 5a21e4e..0000000 --- a/recipes-java/openjdk/openjdk-7/jvm.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# -# -# List of JVMs that can be used as an option to java, javac, etc. -# Order is important -- first in this list is the default JVM. -# NOTE that this both this file and its format are UNSUPPORTED and -# WILL GO AWAY in a future release. -# -# You may also select a JVM in an arbitrary location with the -# "-XXaltjvm=" option, but that too is unsupported -# and may not be available in a future release. -# --jamvm ERROR --server ERROR --client IGNORE --hotspot ERROR --classic WARN --native ERROR --green ERROR --zero ALIASED_TO -server --shark ERROR --cacao ERROR diff --git a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend b/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend deleted file mode 100644 index c7a6e78..0000000 --- a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# provides custom jvm.cfg to set the default JVM - -# openjdk-7 recipe is prepending to FILESPATH, so use -# FILESPATH instead of FILESEXTRAPATH or our file doesn't -# get picked up -FILESPATH_prepend := "${THISDIR}/openjdk-7:" diff --git a/recipes-java/openjdk/openjdk-8/jvm.cfg b/recipes-java/openjdk/openjdk-8/jvm.cfg new file mode 100644 index 0000000..5a21e4e --- /dev/null +++ b/recipes-java/openjdk/openjdk-8/jvm.cfg @@ -0,0 +1,43 @@ +# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# +# +# List of JVMs that can be used as an option to java, javac, etc. +# Order is important -- first in this list is the default JVM. +# NOTE that this both this file and its format are UNSUPPORTED and +# WILL GO AWAY in a future release. +# +# You may also select a JVM in an arbitrary location with the +# "-XXaltjvm=" option, but that too is unsupported +# and may not be available in a future release. +# +-jamvm ERROR +-server ERROR +-client IGNORE +-hotspot ERROR +-classic WARN +-native ERROR +-green ERROR +-zero ALIASED_TO -server +-shark ERROR +-cacao ERROR diff --git a/recipes-java/openjdk/openjdk-8_102b14.bbappend b/recipes-java/openjdk/openjdk-8_102b14.bbappend new file mode 100644 index 0000000..4a258d2 --- /dev/null +++ b/recipes-java/openjdk/openjdk-8_102b14.bbappend @@ -0,0 +1,6 @@ +# provides custom jvm.cfg to set the default JVM + +# openjdk-7 recipe is prepending to FILESPATH, so use +# FILESPATH instead of FILESEXTRAPATH or our file doesn't +# get picked up +FILESPATH_prepend := "${THISDIR}/openjdk-8:" diff --git a/recipes-ruby/ruby/ruby_%.bbappend b/recipes-ruby/ruby/ruby_%.bbappend new file mode 100644 index 0000000..b31d44c --- /dev/null +++ b/recipes-ruby/ruby/ruby_%.bbappend @@ -0,0 +1,4 @@ +# remove /usr/share/ri from main ruby package +# using FILES_${PN}_remove doesn't work... +FILES_ruby_remove = "${datadir}/ri" +FILES_${PN}-doc += "${datadir}/ri" diff --git a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend b/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend deleted file mode 100644 index b31d44c..0000000 --- a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# remove /usr/share/ri from main ruby package -# using FILES_${PN}_remove doesn't work... -FILES_ruby_remove = "${datadir}/ri" -FILES_${PN}-doc += "${datadir}/ri" diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb index b3c7313..e5e2687 100644 --- a/recipes-support/multitech/jsparser_0.3.bb +++ b/recipes-support/multitech/jsparser_0.3.bb @@ -12,8 +12,6 @@ SRC_URI = "git://git.multitech.net/jsparser;branch=master \ S = "${WORKDIR}/git" -inherit autotools - do_install_append() { install -d ${D}/usr/bin install -m 755 ${WORKDIR}/jspp ${D}/usr/bin/jspp diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend new file mode 100644 index 0000000..6546de2 --- /dev/null +++ b/recipes-support/ntp/ntp_%.bbappend @@ -0,0 +1,30 @@ +PR .= ".mlinux2" + +SRC_URI += " file://ntpd-default \ + " +FILESEXTRAPATHS_prepend := "${THISDIR}/files" + +python do_patch_prepend () { + import os +} + +do_install_append() { + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/ntpd-default ${D}${sysconfdir}/default/ntpd.default + + drdir=${D}${localstatedir}/lib/ntp + install -d -m 0755 -p ${drdir} + drfile="${drdir}/ntp.drift" + touch ${drfile} + chmod 664 ${drfile} + chown -R ntp:ntp ${drdir} +} +pkg_postinst_${PN}_append() { + update-alternatives --install ${sysconfdir}/default/ntpd ntpd-defaults ${sysconfdir}/default/ntpd.default 10 +} + +pkg_postrm_${PN}_append() { + update-alternatives --remove ntpd-defaults ${sysconfdir}/default/ntpd.default +} +FILES_${PN} += "${sysconfdir}/default/ntpd.default ${localstatedir}/lib/*" +CONFFILES_${PN} += "${sysconfdir}/default/ntpd.default" diff --git a/recipes-support/ntp/ntp_4.2.6p5.bbappend b/recipes-support/ntp/ntp_4.2.6p5.bbappend deleted file mode 100644 index 8460fda..0000000 --- a/recipes-support/ntp/ntp_4.2.6p5.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -PR .= ".mlinux2" - -SRC_URI += " file://ntpd-init.patch;patchdir=.. \ - file://ntp.conf.patch;patchdir=.. \ - file://ntpd-default \ - file://logtime.patch \ - " -FILESEXTRAPATHS_prepend := "${THISDIR}/files" - -python do_patch_prepend () { - import os -} - -do_install_append() { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/ntpd-default ${D}${sysconfdir}/default/ntpd.default - - drdir=${D}${localstatedir}/lib/ntp - install -d -m 0755 -p ${drdir} - drfile="${drdir}/ntp.drift" - touch ${drfile} - chmod 664 ${drfile} - chown -R ntp:ntp ${drdir} -} -pkg_postinst_${PN}_append() { - update-alternatives --install ${sysconfdir}/default/ntpd ntpd-defaults ${sysconfdir}/default/ntpd.default 10 -} - -pkg_postrm_${PN}_append() { - update-alternatives --remove ntpd-defaults ${sysconfdir}/default/ntpd.default -} -FILES_${PN} += "${sysconfdir}/default/ntpd.default ${localstatedir}/lib/*" -CONFFILES_${PN} += "${sysconfdir}/default/ntpd.default" -- cgit v1.2.3