[OE-core] [PATCH] udev: upgrade to 182

Otavio Salvador otavio at ossystems.com.br
Tue Jul 17 14:54:08 UTC 2012


On Tue, Jul 17, 2012 at 7:06 AM, Alex DAMIAN <alexandru.damian at intel.com> wrote:
> From: Alexandru DAMIAN <alexandru.damian at intel.com>
>
> This is the final upgrade of udev. Futher upgrades will only
> come in conjunction with systemd.

Nice!

>  .../initscripts/initscripts-1.0/volatiles          |    2 +-

You missed a PR bump in initscripts.

>  meta/recipes-core/udev/udev.inc                    |   13 +++--
>  ...yboard_force_release.sh-shell-script-path.patch |   30 ++++++++++++
>  meta/recipes-core/udev/udev/init                   |   14 +++---
>  meta/recipes-core/udev/udev/udev-166-v4l1-1.patch  |   50 --------------------
>  meta/recipes-core/udev/udev/udev-cache             |    2 +-
>  meta/recipes-core/udev/udev_164.bb                 |    8 ----
>  meta/recipes-core/udev/udev_182.bb                 |    9 ++++
>  8 files changed, 57 insertions(+), 71 deletions(-)
>  create mode 100644 meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
>  delete mode 100644 meta/recipes-core/udev/udev/udev-166-v4l1-1.patch
>  delete mode 100644 meta/recipes-core/udev/udev_164.bb
>  create mode 100644 meta/recipes-core/udev/udev_182.bb
>
> diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
> index b2ae279..e0741aa 100644
> --- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
> +++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
> @@ -36,4 +36,4 @@ f root root 0664 /var/log/wtmp none
>  f root root 0664 /var/run/utmp none
>  l root root 0644 /etc/resolv.conf /var/run/resolv.conf
>  f root root 0644 /var/run/resolv.conf none
> -
> +l root root 0755 /run /var/run
> diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
> index 3e72515..ebd760b 100644
> --- a/meta/recipes-core/udev/udev.inc
> +++ b/meta/recipes-core/udev/udev.inc
> @@ -6,9 +6,10 @@ LICENSE = "GPLv2.0+ & LGPLv2.1+"
>  LICENSE_${PN} = "GPLv2.0+"
>  LICENSE_libudev = "LGPLv2.1+"
>  LICENSE_libgudev = "LGPLv2.1+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> -                    file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> -                    file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +                    file://src/COPYING;md5=17c4e5fb495e6707ac92a3864926f979 \
> +                    file://src/gudev/COPYING;md5=fb494485a7d0505308cb68e4997cc266"
> +
>
>  DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native"
>  RPROVIDES_${PN} = "hotplug"
> @@ -16,6 +17,7 @@ RRECOMMENDS_${PN} += "udev-extraconf usbutils-ids pciutils-ids"
>  RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})"
>
>  SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
> +           file://0001-Fixing-keyboard_force_release.sh-shell-script-path.patch \
>             file://run.rules \
>             file://udev.rules \
>             file://devfs-udev.rules \
> @@ -32,7 +34,8 @@ inherit autotools pkgconfig update-rc.d
>
>  # udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
>  sbindir = "${base_sbindir}"
> -libexecdir = "${base_libdir}/udev"
> +#adamian - now udev appends the /udev for itself
> +libexecdir = "${base_libdir}"

This comment might be dropped from the source code but added to the commit log.

> diff --git a/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch b/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
> new file mode 100644
> index 0000000..cbd807f
> --- /dev/null
> +++ b/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
> @@ -0,0 +1,30 @@
> +From 0f8290c943da298abd269ca60fd8375dfb219971 Mon Sep 17 00:00:00 2001
> +From: Alexandru DAMIAN <alexandru.damian at intel.com>
> +Date: Thu, 12 Jul 2012 12:54:48 +0300
> +Subject: [PATCH] Fixing keyboard_force_release.sh shell script path
> +
> +With the introduction of rootprefix, the keyboard-force-release.sh.in
> +was modified to be executed with @rootprefix@/bin/sh, which is wrong
> +because @rootprefix@ defaults to /usr (which is correct), but the
> +shell is always at /bin/sh (IEEE Std 1003.2-1992).
> +
> +Therefore the interpreter for shell scripts needs to be /bin/sh at all times.
> +
> +Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>

Missing Upstream-Status header on the patch.


> -       /sbin/udevadm trigger --action=add
> -       /sbin/udevadm settle
> +       /usr/bin/udevadm trigger --action=add
> +       /usr/bin/udevadm settle
>  fi

This might cause problem for separated /usr partitions. Note that I
don't use this but Yocto seems to want to support it and thus this
needs to be adjusted.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br




More information about the Openembedded-core mailing list