* [PATCH 01/10] qt4-graphics-system: add
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 22:03 ` Saul Wold
2012-01-05 19:37 ` [PATCH 02/10] qt4e.bbclass: add QT_BASE_NAME for use in recipes Otavio Salvador
` (9 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
Allow setting default runtime graphics system engine for Qt4
applications per machine.
Depending on the GPU and Xorg driver, this can boost and impact
significantly the drawing performance. The default setting is to
'raster' as this offer best performance for most machines GPUs.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../qt4-graphics-system/qt4-graphics-system_1.0.bb | 27 ++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
diff --git a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
new file mode 100644
index 0000000..b3aa1e5
--- /dev/null
+++ b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Set default Qt4 Graphics System to ${QT_GRAPHICS_SYSTEM}"
+SECTION = "x11/base"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+QT_GRAPHICS_SYSTEM ?= "raster"
+
+# xserver-common, x11-common
+VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
+
+def _get_extra_rdepends(d):
+ gs = d.getVar('QT_GRAPHICS_SYSTEM', 1)
+ if gs == "opengl":
+ return "qt4-plugin-graphicssystems-glgraphicssystem"
+
+ return ""
+
+do_install () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d/
+ cfg_file=${D}/${sysconfdir}/X11/Xsession.d/85xqt-graphicssystem
+ echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file
+ chmod +x $cfg_file
+}
+
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_xserver_common} ${@_get_extra_rdepends(d)}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 01/10] qt4-graphics-system: add
2012-01-05 19:37 ` [PATCH 01/10] qt4-graphics-system: add Otavio Salvador
@ 2012-01-05 22:03 ` Saul Wold
2012-01-05 22:07 ` Otavio Salvador
0 siblings, 1 reply; 17+ messages in thread
From: Saul Wold @ 2012-01-05 22:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 01/05/2012 11:37 AM, Otavio Salvador wrote:
> Allow setting default runtime graphics system engine for Qt4
> applications per machine.
>
> Depending on the GPU and Xorg driver, this can boost and impact
> significantly the drawing performance. The default setting is to
> 'raster' as this offer best performance for most machines GPUs.
>
> Signed-off-by: Otavio Salvador<otavio@ossystems.com.br>
> ---
> .../qt4-graphics-system/qt4-graphics-system_1.0.bb | 27 ++++++++++++++++++++
> 1 files changed, 27 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
>
> diff --git a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
> new file mode 100644
> index 0000000..b3aa1e5
> --- /dev/null
> +++ b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
> @@ -0,0 +1,27 @@
> +DESCRIPTION = "Set default Qt4 Graphics System to ${QT_GRAPHICS_SYSTEM}"
> +SECTION = "x11/base"
> +LICENSE = "MIT-X"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +QT_GRAPHICS_SYSTEM ?= "raster"
> +
> +# xserver-common, x11-common
> +VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
> +
Should the be initialized here or in one of the Qt tasks?
> +def _get_extra_rdepends(d):
> + gs = d.getVar('QT_GRAPHICS_SYSTEM', 1)
> + if gs == "opengl":
> + return "qt4-plugin-graphicssystems-glgraphicssystem"
> +
Is this package available in OE-Core?
> + return ""
> +
> +do_install () {
> + install -d ${D}/${sysconfdir}/X11/Xsession.d/
> + cfg_file=${D}/${sysconfdir}/X11/Xsession.d/85xqt-graphicssystem
> + echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}"> $cfg_file
> + chmod +x $cfg_file
> +}
> +
> +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_xserver_common} ${@_get_extra_rdepends(d)}"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 01/10] qt4-graphics-system: add
2012-01-05 22:03 ` Saul Wold
@ 2012-01-05 22:07 ` Otavio Salvador
0 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 22:07 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2222 bytes --]
On Thu, Jan 5, 2012 at 20:03, Saul Wold <sgw@linux.intel.com> wrote:
> On 01/05/2012 11:37 AM, Otavio Salvador wrote:
>
>> Allow setting default runtime graphics system engine for Qt4
>> applications per machine.
>>
>> Depending on the GPU and Xorg driver, this can boost and impact
>> significantly the drawing performance. The default setting is to
>> 'raster' as this offer best performance for most machines GPUs.
>>
>> Signed-off-by: Otavio Salvador<otavio@ossystems.com.**br<otavio@ossystems.com.br>
>> >
>> ---
>> .../qt4-graphics-system/qt4-**graphics-system_1.0.bb<http://qt4-graphics-system_1.0.bb>| 27 ++++++++++++++++++++
>> 1 files changed, 27 insertions(+), 0 deletions(-)
>> create mode 100644 meta/recipes-qt/qt4-graphics-**system/
>> qt4-graphics-system_1.**0.bb <http://qt4-graphics-system_1.0.bb>
>>
>> diff --git a/meta/recipes-qt/qt4-**graphics-system/qt4-graphics-**
>> system_1.0.bb <http://qt4-graphics-system_1.0.bb> b/meta/recipes-qt/qt4-*
>> *graphics-system/qt4-graphics-**system_1.0.bb<http://qt4-graphics-system_1.0.bb>
>> new file mode 100644
>> index 0000000..b3aa1e5
>> --- /dev/null
>> +++ b/meta/recipes-qt/qt4-**graphics-system/qt4-graphics-**system_1.0.bb<http://qt4-graphics-system_1.0.bb>
>> @@ -0,0 +1,27 @@
>> +DESCRIPTION = "Set default Qt4 Graphics System to ${QT_GRAPHICS_SYSTEM}"
>> +SECTION = "x11/base"
>> +LICENSE = "MIT-X"
>> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/**COPYING.MIT;md5=**
>> 3da9cfbcb788c80a0384361b4de204**20"
>> +
>> +QT_GRAPHICS_SYSTEM ?= "raster"
>> +
>> +# xserver-common, x11-common
>> +VIRTUAL-RUNTIME_xserver_**common ?= "x11-common"
>> +
>>
> Should the be initialized here or in one of the Qt tasks?
Here or I'd be busted as I don't use the tasks ;-)
> +def _get_extra_rdepends(d):
>> + gs = d.getVar('QT_GRAPHICS_SYSTEM', 1)
>> + if gs == "opengl":
>> + return "qt4-plugin-graphicssystems-**glgraphicssystem"
>> +
>>
> Is this package available in OE-Core?
Yes.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
[-- Attachment #2: Type: text/html, Size: 3491 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 02/10] qt4e.bbclass: add QT_BASE_NAME for use in recipes
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
2012-01-05 19:37 ` [PATCH 01/10] qt4-graphics-system: add Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:37 ` [PATCH 03/10] qt4x11.bbclass: " Otavio Salvador
` (8 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/qt4e.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
index d955aca..f3d5caa 100644
--- a/meta/classes/qt4e.bbclass
+++ b/meta/classes/qt4e.bbclass
@@ -2,6 +2,7 @@ DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', 1)[:12] == 'qt4-embe
inherit qmake2
+QT_BASE_NAME = "qt4-embedded"
QT_DIR_NAME = "qtopia"
QT_LIBINFIX = "E"
# override variables set by qmake-base to compile Qt/Embedded apps
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 03/10] qt4x11.bbclass: add QT_BASE_NAME for use in recipes
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
2012-01-05 19:37 ` [PATCH 01/10] qt4-graphics-system: add Otavio Salvador
2012-01-05 19:37 ` [PATCH 02/10] qt4e.bbclass: add QT_BASE_NAME for use in recipes Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:37 ` [PATCH 04/10] qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass Otavio Salvador
` (7 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/qt4x11.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index 3f955d4..610397d 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -2,6 +2,7 @@ DEPENDS_prepend = "${@["qt4-x11-free ", ""][(d.getVar('BPN', True)[:12] == 'qt4-
inherit qmake2
+QT_BASE_NAME = "qt4"
QT_DIR_NAME = "qt4"
QT_LIBINFIX = ""
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 04/10] qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (2 preceding siblings ...)
2012-01-05 19:37 ` [PATCH 03/10] qt4x11.bbclass: " Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:37 ` [PATCH 05/10] qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass Otavio Salvador
` (6 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 39f7398..e472af5 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,9 +2,8 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r39"
+INC_PR = "r40"
-QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
# Set necessary variables in the profile
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 05/10] qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (3 preceding siblings ...)
2012-01-05 19:37 ` [PATCH 04/10] qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:37 ` [PATCH 06/10] initscripts: avoid mounting /sys if it is already mounted Otavio Salvador
` (5 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 5b93a98..40939de 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,13 +5,12 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r36"
+INC_PR = "r37"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
QT_GLFLAGS_qemuppc = "-opengl"
QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
-QT_BASE_NAME ?= "qt4"
QT_BASE_LIB ?= "libqt"
inherit qt4x11
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 06/10] initscripts: avoid mounting /sys if it is already mounted
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (4 preceding siblings ...)
2012-01-05 19:37 ` [PATCH 05/10] qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:37 ` [PATCH 07/10] busybox: disable syslogd configuration file support Otavio Salvador
` (4 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../initscripts/initscripts-1.0/sysfs.sh | 4 ++--
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
index be28bb3..bd87dcd 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
@@ -14,6 +14,6 @@ if [ -e /proc ] && ! [ -e /proc/mounts ]; then
mount -t proc proc /proc
fi
-if [ -e /sys ] && grep -q sysfs /proc/filesystems; then
- mount sysfs /sys -t sysfs
+if [ -e /sys ] && grep -q sysfs /proc/filesystems && ! [ -e /sys/class ]; then
+ mount -t sysfs sysfs /sys
fi
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index ffca817..98f5e9b 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r127"
+PR = "r128"
INHIBIT_DEFAULT_DEPS = "1"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 07/10] busybox: disable syslogd configuration file support
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (5 preceding siblings ...)
2012-01-05 19:37 ` [PATCH 06/10] initscripts: avoid mounting /sys if it is already mounted Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:37 ` [PATCH 08/10] udev: ensure /dev/pts and /dev/shm does exists Otavio Salvador
` (3 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
Most people and distro uses /etc/syslogd.conf as a set of environment
variables to configure the init script behavior however syslogd
configuration file support try to parse this file as a regular
syslogd.conf format making impossible to use the service.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/busybox/busybox-1.19.3/defconfig | 2 +-
meta/recipes-core/busybox/busybox_1.19.3.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
index 1990f28..4d04c54 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
@@ -998,7 +998,7 @@ CONFIG_SYSLOGD=y
CONFIG_FEATURE_ROTATE_LOGFILE=y
CONFIG_FEATURE_REMOTE_LOG=y
# CONFIG_FEATURE_SYSLOGD_DUP is not set
-CONFIG_FEATURE_SYSLOGD_CFG=y
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.3.bb
index f591856..a075407 100644
--- a/meta/recipes-core/busybox/busybox_1.19.3.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.3.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 08/10] udev: ensure /dev/pts and /dev/shm does exists
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (6 preceding siblings ...)
2012-01-05 19:37 ` [PATCH 07/10] busybox: disable syslogd configuration file support Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:37 ` [PATCH 09/10] udev: improve udev-cache robustness Otavio Salvador
` (2 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
---
meta/recipes-core/udev/udev/init | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index bfbac0d..6a4464c 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -30,9 +30,10 @@ echo "Starting udev"
# mount the tmpfs on /dev, if not already done
LANG=C awk '$2 == "/dev" && ($3 == "tmpfs" || $3 == "devtmpfs") { exit 1 }' /proc/mounts && {
mount -n -o mode=0755 -t tmpfs none "/dev"
- mkdir -m 0755 /dev/pts
- mkdir -m 1777 /dev/shm
}
+[ -e /dev/pts ] || mkdir -m 0755 /dev/pts
+[ -e /dev/shm ] || mkdir -m 1777 /dev/shm
+
if [ -e /etc/dev.tar ]; then
(cd /; tar xf /etc/dev.tar 2>&1 | grep -v 'time stamp' || true)
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 09/10] udev: improve udev-cache robustness
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (7 preceding siblings ...)
2012-01-05 19:37 ` [PATCH 08/10] udev: ensure /dev/pts and /dev/shm does exists Otavio Salvador
@ 2012-01-05 19:37 ` Otavio Salvador
2012-01-05 19:38 ` [PATCH 10/10] udev: drop depmod handling code as it ought to be done in kernel postinst Otavio Salvador
2012-01-09 6:00 ` [PATCH 00/10] Pending patches from O.S. Systems tree Saul Wold
10 siblings, 0 replies; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:37 UTC (permalink / raw)
To: openembedded-core
* allow udev-cache to be disabled at runtime (using
/etc/default/udev-cache);
* make cache invalidated if kernel, bootparams or device list
changes;
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/udev/udev.inc | 11 ++++++++++-
meta/recipes-core/udev/udev/init | 18 +++++++++++++++---
meta/recipes-core/udev/udev/udev-cache | 20 +++++++++++++++++---
meta/recipes-core/udev/udev/udev-cache.default | 4 ++++
4 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-core/udev/udev/udev-cache.default
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 0e571d6..65000b7 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -25,6 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://network.sh \
file://local.rules \
file://udev-cache \
+ file://udev-cache.default \
file://init"
inherit autotools pkgconfig update-rc.d
@@ -58,7 +59,7 @@ FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
FILES_libgudev-dbg = "${base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
-FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
+FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules"
@@ -72,6 +73,14 @@ do_install_append () {
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+ install -d ${D}${sysconfdir}/default
+ install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
+
+ touch ${D}${sysconfdir}/udev/saved.uname
+ touch ${D}${sysconfdir}/udev/saved.cmdline
+ touch ${D}${sysconfdir}/udev/saved.devices
+ touch ${D}${sysconfdir}/udev/saved.atags
+
install -d ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index 6a4464c..3e6e062 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -14,6 +14,7 @@ export TZ=/etc/localtime
[ -d /sys/class ] || exit 1
[ -r /proc/mounts ] || exit 1
[ -x /sbin/udevd ] || exit 1
+[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
kill_udevd() {
@@ -35,9 +36,20 @@ LANG=C awk '$2 == "/dev" && ($3 == "tmpfs" || $3 == "devtmpfs") { exit 1 }' /pro
[ -e /dev/shm ] || mkdir -m 1777 /dev/shm
-if [ -e /etc/dev.tar ]; then
- (cd /; tar xf /etc/dev.tar 2>&1 | grep -v 'time stamp' || true)
- not_first_boot=1
+if [ "$DEVCACHE" != "" ]; then
+ # Invalidate udev cache if the kernel or its bootargs/cmdline have changed
+ [ -x /bin/uname ] && /bin/uname -mrspv > /dev/shm/uname || touch /dev/shm/uname
+ [ -r /proc/cmdline ] && cat /proc/cmdline > /dev/shm/cmdline || touch /dev/shm/cmdline
+ [ -r /proc/devices ] && cat /proc/devices > /dev/shm/devices || touch /dev/shm/devices
+ [ -r /proc/atags ] && cat /proc/atags > /dev/shm/atags || touch /dev/shm/atags
+ if [ -e $DEVCACHE ] && \
+ cmp -s /dev/shm/uname /etc/udev/saved.uname && \
+ cmp -s /dev/shm/cmdline /etc/udev/saved.cmdline && \
+ cmp -s /dev/shm/devices /etc/udev/saved.devices && \
+ cmp -s /dev/shm/atags /etc/udev/saved.atags; then
+ (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
+ not_first_boot=1
+ fi
fi
# make_extra_nodes
diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache
index 77bbda6..d3a7dee 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/meta/recipes-core/udev/udev/udev-cache
@@ -9,12 +9,26 @@
# Short-Description: cache /dev to speedup the udev next boot
### END INIT INFO
-[ -d /sys/class ] || exit 1
+export TZ=/etc/localtime
+
[ -r /proc/mounts ] || exit 1
[ -x /sbin/udevd ] || exit 1
+[ -d /sys/class ] || exit 1
+
+[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
-if [ ! -e /etc/dev.tar ]; then
- (cd /; tar cf /etc/dev.tar dev)
+if [ "$DEVCACHE" != "" ]; then
+ echo "Populating dev cache"
+ (cd /; tar cf $DEVCACHE dev)
+ mv /dev/shm/uname /etc/udev/saved.uname
+ mv /dev/shm/cmdline /etc/udev/saved.cmdline
+ mv /dev/shm/devices /etc/udev/saved.devices
+ mv /dev/shm/atags /etc/udev/saved.atags
+else
+ rm -f /dev/shm/uname
+ rm -f /dev/shm/cmdline
+ rm -f /dev/shm/devices
+ rm -f /dev/shm/atags
fi
exit 0
diff --git a/meta/recipes-core/udev/udev/udev-cache.default b/meta/recipes-core/udev/udev/udev-cache.default
new file mode 100644
index 0000000..5c4937a
--- /dev/null
+++ b/meta/recipes-core/udev/udev/udev-cache.default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+DEVCACHE="/etc/dev.tar"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 10/10] udev: drop depmod handling code as it ought to be done in kernel postinst
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (8 preceding siblings ...)
2012-01-05 19:37 ` [PATCH 09/10] udev: improve udev-cache robustness Otavio Salvador
@ 2012-01-05 19:38 ` Otavio Salvador
2012-01-05 22:07 ` Saul Wold
2012-01-09 6:00 ` [PATCH 00/10] Pending patches from O.S. Systems tree Saul Wold
10 siblings, 1 reply; 17+ messages in thread
From: Otavio Salvador @ 2012-01-05 19:38 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/udev/udev_164.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index c89eab4..6d71f4d 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
include udev.inc
-PR = "r9"
+PR = "r10"
SRC_URI += "file://udev-166-v4l1-1.patch"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 00/10] Pending patches from O.S. Systems tree
2012-01-05 19:37 [PATCH 00/10] Pending patches from O.S. Systems tree Otavio Salvador
` (9 preceding siblings ...)
2012-01-05 19:38 ` [PATCH 10/10] udev: drop depmod handling code as it ought to be done in kernel postinst Otavio Salvador
@ 2012-01-09 6:00 ` Saul Wold
10 siblings, 0 replies; 17+ messages in thread
From: Saul Wold @ 2012-01-09 6:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 01/05/2012 11:37 AM, Otavio Salvador wrote:
> The following changes since commit 563828bad19a242bba9ce3db461bb5807037dfdf:
>
> multilib: Abstract class extension code into classextend.py (2012-01-05 12:36:08 +0000)
>
> are available in the git repository at:
> git://github.com/OSSystems/oe-core master
> https://github.com/OSSystems/oe-core/tree/HEAD
>
> Otavio Salvador (10):
> qt4-graphics-system: add
> qt4e.bbclass: add QT_BASE_NAME for use in recipes
> qt4x11.bbclass: add QT_BASE_NAME for use in recipes
> qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass
> qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass
Merged these into OE-COre
> initscripts: avoid mounting /sys if it is already mounted
Merged
> busybox: disable syslogd configuration file support
We talked about this one on #yocto, already fixed in master (differently)
> udev: ensure /dev/pts and /dev/shm does exists
Merged
> udev: improve udev-cache robustnes
I guess you are looking into improvements.
> udev: drop depmod handling code as it ought to be done in kernel
> postinst
Dropped per your request
Thanks
Sau!
>
> meta/classes/qt4e.bbclass | 1 +
> meta/classes/qt4x11.bbclass | 1 +
> meta/recipes-core/busybox/busybox-1.19.3/defconfig | 2 +-
> meta/recipes-core/busybox/busybox_1.19.3.bb | 2 +-
> .../initscripts/initscripts-1.0/sysfs.sh | 4 +-
> meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
> meta/recipes-core/udev/udev.inc | 11 +++++++-
> meta/recipes-core/udev/udev/init | 23 +++++++++++++---
> meta/recipes-core/udev/udev/udev-cache | 20 ++++++++++++--
> meta/recipes-core/udev/udev/udev-cache.default | 4 +++
> meta/recipes-core/udev/udev_164.bb | 2 +-
> .../qt4-graphics-system/qt4-graphics-system_1.0.bb | 27 ++++++++++++++++++++
> meta/recipes-qt/qt4/qt4-embedded.inc | 3 +-
> meta/recipes-qt/qt4/qt4-x11-free.inc | 3 +-
> 14 files changed, 86 insertions(+), 19 deletions(-)
> create mode 100644 meta/recipes-core/udev/udev/udev-cache.default
> create mode 100644 meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
>
^ permalink raw reply [flat|nested] 17+ messages in thread