* [meta-oe][PATCH 1/4] udev: fix init script indenting
2011-05-23 13:30 [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree Otavio Salvador
@ 2011-05-23 13:30 ` Otavio Salvador
2011-05-23 13:30 ` [meta-oe][PATCH 2/4] udev: fix action used during startup Otavio Salvador
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2011-05-23 13:30 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/udev/udev/init | 44 +++++++++++++++++-----------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/meta-oe/recipes-core/udev/udev/init b/meta-oe/recipes-core/udev/udev/init
index c0ecdfc..808d9e9 100644
--- a/meta-oe/recipes-core/udev/udev/init
+++ b/meta-oe/recipes-core/udev/udev/init
@@ -18,10 +18,10 @@ export TZ=/etc/localtime
[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
kill_udevd() {
- if [ -x /sbin/pidof ]; then
- pid=`/sbin/pidof -x udevd`
- [ -n "$pid" ] && kill $pid
- fi
+ if [ -x /sbin/pidof ]; then
+ pid=`/sbin/pidof -x udevd`
+ [ -n "$pid" ] && kill $pid
+ fi
}
export ACTION=add
@@ -30,9 +30,9 @@ 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
+ mount -n -o mode=0755 -t tmpfs none "/dev"
+ mkdir -m 0755 /dev/pts
+ mkdir -m 1777 /dev/shm
}
if [ "$DEVCACHE" != "" ]; then
@@ -42,10 +42,10 @@ if [ "$DEVCACHE" != "" ]; then
[ -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
+ 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
@@ -59,17 +59,17 @@ 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
+# 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
- (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
- else
- /sbin/udevadm trigger
- /sbin/udevadm settle
- fi
+/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
+ (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
+else
+ /sbin/udevadm trigger
+ /sbin/udevadm settle
+fi
exit 0
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-oe][PATCH 2/4] udev: fix action used during startup
2011-05-23 13:30 [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree Otavio Salvador
2011-05-23 13:30 ` [meta-oe][PATCH 1/4] udev: fix init script indenting Otavio Salvador
@ 2011-05-23 13:30 ` Otavio Salvador
2011-05-23 13:30 ` [meta-oe][PATCH 3/4] udev: remove udev.inc since it was not being in use Otavio Salvador
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2011-05-23 13:30 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/udev/udev/init | 4 ++--
meta-oe/recipes-core/udev/udev_168.bb | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-core/udev/udev/init b/meta-oe/recipes-core/udev/udev/init
index 808d9e9..ecc357d 100644
--- a/meta-oe/recipes-core/udev/udev/init
+++ b/meta-oe/recipes-core/udev/udev/init
@@ -65,10 +65,10 @@ echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
/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
+ /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
+ /sbin/udevadm trigger --action=add
/sbin/udevadm settle
fi
diff --git a/meta-oe/recipes-core/udev/udev_168.bb b/meta-oe/recipes-core/udev/udev_168.bb
index 4e34c0d..eaba889 100644
--- a/meta-oe/recipes-core/udev/udev_168.bb
+++ b/meta-oe/recipes-core/udev/udev_168.bb
@@ -35,6 +35,8 @@ SRC_URI += " \
file://udev-compat-wrapper-patch \
"
+PR = "r1"
+
inherit update-rc.d autotools
EXTRA_OECONF += " --with-udev-prefix= \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-oe][PATCH 3/4] udev: remove udev.inc since it was not being in use
2011-05-23 13:30 [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree Otavio Salvador
2011-05-23 13:30 ` [meta-oe][PATCH 1/4] udev: fix init script indenting Otavio Salvador
2011-05-23 13:30 ` [meta-oe][PATCH 2/4] udev: fix action used during startup Otavio Salvador
@ 2011-05-23 13:30 ` Otavio Salvador
2011-05-23 13:30 ` [meta-oe][PATCH 4/4] udev: move ConsoleKit files to udev-consolekit Otavio Salvador
2011-05-23 14:29 ` [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree Koen Kooi
4 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2011-05-23 13:30 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/udev/udev.inc | 101 ------------------------------------
1 files changed, 0 insertions(+), 101 deletions(-)
delete mode 100644 meta-oe/recipes-core/udev/udev.inc
diff --git a/meta-oe/recipes-core/udev/udev.inc b/meta-oe/recipes-core/udev/udev.inc
deleted file mode 100644
index 0c8a662..0000000
--- a/meta-oe/recipes-core/udev/udev.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
-/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
-
-LICENSE = "GPLv2+"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
- file://udev.rules \
- file://devfs-udev.rules \
- file://links.conf \
- file://permissions.rules \
- file://mount.sh \
- file://network.sh \
- file://local.rules \
- file://init \
- file://udev-compat-wrapper-patch"
-
-INC_PR = "r30"
-
-inherit update-rc.d autotools pkgconfig
-
-PARALLEL_MAKE = ""
-UDEV_DEVFS_RULES ?= "0"
-PKG_libvolume-id-dev = "libvolume-id-dev"
-
-RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
-
-INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 03 S ."
-
-export CROSS = "${TARGET_PREFIX}"
-export HOSTCC = "${BUILD_CC}"
-export udevdir ?= "/dev"
-# Put stuff in /lib and /sbin
-export bindir := "${base_bindir}"
-export sbindir := "${base_sbindir}"
-export usrbindir := "${bindir}"
-export usrsbindir := "${sbindir}"
-export etcdir := "${sysconfdir}"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-UDEV_EXTRAS = "<override me>"
-EXTRA_OEMAKE = "-e \
- 'EXTRAS=${UDEV_EXTRAS}' \
- 'STRIP=echo'"
-
-RPROVIDES_udev_append = " udev-compat-wrapper"
-RDEPENDS_udev_spitz += "udev-compat"
-do_unpack_append_spitz() {
- bb.build.exec_func('do_apply_compat_wrapper', d)
-}
-RDEPENDS_udev_akita += "udev-compat"
-do_unpack_append_akita() {
- bb.build.exec_func('do_apply_compat_wrapper', d)
-}
-RDEPENDS_udev_c7x0 += "udev-compat"
-do_unpack_append_c7x0() {
- bb.build.exec_func('do_apply_compat_wrapper', d)
-}
-RDEPENDS_udev_poodle += "udev-compat"
-do_unpack_append_poodle() {
- bb.build.exec_func('do_apply_compat_wrapper', d)
-}
-
-# Modify init script on platforms that need to boot old kernels:
-do_apply_compat_wrapper() {
- cd ${WORKDIR}
- sed -i "s:/sbin/udevd:\$UDEVD:g;s:/sbin/udevadm:\$UDEVADM:g" init
- patch <udev-compat-wrapper-patch
- cd -
-}
-
-do_install () {
- install -d ${D}${usrsbindir} \
- ${D}${sbindir}
- oe_runmake 'DESTDIR=${D}' INSTALL=install install
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
-
- install -d ${D}${sysconfdir}/udev/rules.d/
-
- install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
- install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
- install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
- if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
- install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
- fi
-
- install -d ${D}${sysconfdir}/udev/scripts/
-
- install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
- install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
- install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${D}${includedir}
- oe_libinstall -C extras/volume_id/lib libvolume_id ${D}${libdir}
-}
-
-PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest ${sbindir}/udevadm"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-oe][PATCH 4/4] udev: move ConsoleKit files to udev-consolekit
2011-05-23 13:30 [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree Otavio Salvador
` (2 preceding siblings ...)
2011-05-23 13:30 ` [meta-oe][PATCH 3/4] udev: remove udev.inc since it was not being in use Otavio Salvador
@ 2011-05-23 13:30 ` Otavio Salvador
2011-05-23 14:29 ` [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree Koen Kooi
4 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2011-05-23 13:30 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/udev/udev_168.bb | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-core/udev/udev_168.bb b/meta-oe/recipes-core/udev/udev_168.bb
index eaba889..17600b7 100644
--- a/meta-oe/recipes-core/udev/udev_168.bb
+++ b/meta-oe/recipes-core/udev/udev_168.bb
@@ -35,7 +35,7 @@ SRC_URI += " \
file://udev-compat-wrapper-patch \
"
-PR = "r1"
+PR = "r2"
inherit update-rc.d autotools
@@ -54,7 +54,7 @@ EXTRA_OECONF += " --with-udev-prefix= \
INITSCRIPT_NAME = "udev"
INITSCRIPT_PARAMS = "start 04 S ."
-PACKAGES =+ "libudev libgudev udev-utils"
+PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
FILES_libudev = "${base_libdir}/libudev.so.*"
FILES_libgudev = "${base_libdir}/libgudev*.so.*"
@@ -68,9 +68,12 @@ RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
# is ${prefix}/lib64
-FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit"
+FILES_${PN} += "/lib/udev*"
FILES_${PN}-dbg += "/lib/udev/.debug"
+FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
+RDEPENDS_${PN}-consolekit += "consolekit"
+
# Package up systemd files
FILES_${PN} += "${base_libdir}/systemd"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree
2011-05-23 13:30 [meta-oe][PATCH 0/4] Pull request with udev changes from O.S. Systems tree Otavio Salvador
` (3 preceding siblings ...)
2011-05-23 13:30 ` [meta-oe][PATCH 4/4] udev: move ConsoleKit files to udev-consolekit Otavio Salvador
@ 2011-05-23 14:29 ` Koen Kooi
4 siblings, 0 replies; 6+ messages in thread
From: Koen Kooi @ 2011-05-23 14:29 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 23-05-11 15:30, Otavio Salvador wrote:
> The following changes since commit c6b34871dc0fdd3c1e6a24f2a635505deaa28b20:
>
> freerdp: fix homepage field (2011-05-21 08:27:10 +0200)
>
> are available in the git repository at:
> git://github.com/OSSystems/meta-oe.git master
> https://github.com/OSSystems/meta-oe/tree/master
>
> Otavio Salvador (4):
> udev: fix init script indenting
> udev: fix action used during startup
> udev: remove udev.inc since it was not being in use
> udev: move ConsoleKit files to udev-consolekit
Thanks for the changes, I will push them after some testing.
>
> meta-oe/recipes-core/udev/udev.inc | 101 ---------------------------------
> meta-oe/recipes-core/udev/udev/init | 44 +++++++-------
> meta-oe/recipes-core/udev/udev_168.bb | 9 ++-
> 3 files changed, 29 insertions(+), 125 deletions(-)
> delete mode 100644 meta-oe/recipes-core/udev/udev.inc
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFN2m84MkyGM64RGpERAl3rAJwInyhCcQ7KdkkjPemMCRxranyNmQCePVSJ
EThW8Soef07bvPn1CMaELNM=
=cquM
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread