* [PATCH 0/5] commits for yocto.git tree for x32 work
@ 2011-07-12 19:02 nitin.a.kamble
2011-07-12 19:02 ` [PATCH 1/5] siteinfo.bbclass: hack for x32 nitin.a.kamble
` (5 more replies)
0 siblings, 6 replies; 18+ messages in thread
From: nitin.a.kamble @ 2011-07-12 19:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
These are commits for yocto tree. I came up with as part of the x32 work.
I think these commits does not belong in the x32 layer and should go
in the yocto/oecore tree.
The siteinfo.bbclass commit is a hacky way to get the the right siteinfo for
x32 now. In the future a better solution will be implemented for that purpose.
The following changes since commit 7354fc9213f27aa1b643dbe88070437f1ee4c063:
insane.bbclass: skip rdepends QA checks for kernel / modules (2011-07-12 15:22:09 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/x32
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/x32
Nitin A Kamble (5):
siteinfo.bbclass: hack for x32
udev-172: add a newer version for newer kernel
runqemu: support qemux32 machine
kernel.bbclass: fix the broken lines
glibc: fix false failure
meta/classes/kernel.bbclass | 4 +-
meta/classes/siteinfo.bbclass | 3 +
meta/recipes-core/glibc/glibc.inc | 2 +-
meta/recipes-core/udev/udev-172/init | 59 +++++++++
meta/recipes-core/udev/udev-172/local.rules | 35 ++++++
meta/recipes-core/udev/udev-172/permissions.rules | 131 +++++++++++++++++++++
meta/recipes-core/udev/udev-172/run.rules | 14 +++
meta/recipes-core/udev/udev-172/udev.rules | 116 ++++++++++++++++++
meta/recipes-core/udev/udev_172.bb | 6 +
scripts/qemuimage-testlib | 2 +-
scripts/runqemu | 12 ++-
scripts/runqemu-internal | 25 ++++
12 files changed, 401 insertions(+), 8 deletions(-)
create mode 100644 meta/recipes-core/udev/udev-172/init
create mode 100644 meta/recipes-core/udev/udev-172/local.rules
create mode 100644 meta/recipes-core/udev/udev-172/permissions.rules
create mode 100644 meta/recipes-core/udev/udev-172/run.rules
create mode 100644 meta/recipes-core/udev/udev-172/udev.rules
create mode 100644 meta/recipes-core/udev/udev_172.bb
--
1.7.5.4
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 1/5] siteinfo.bbclass: hack for x32 2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble @ 2011-07-12 19:02 ` nitin.a.kamble 2011-07-13 6:20 ` Khem Raj 2011-07-12 19:02 ` [PATCH 2/5] udev-172: add a newer version for newer kernel nitin.a.kamble ` (4 subsequent siblings) 5 siblings, 1 reply; 18+ messages in thread From: nitin.a.kamble @ 2011-07-12 19:02 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> --- meta/classes/siteinfo.bbclass | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 78b7008..035355f 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -59,6 +59,9 @@ def get_siteinfo_list(d): "x86_64-linux": "endian-little bit-64 common-glibc",\ "x86_64-linux-uclibc": "endian-little bit-64 common-uclibc"} if target in targetinfo: + target_cc_arch = bb.data.getVar('TARGET_CC_ARCH', d, 1) + if target_cc_arch == "-mx32": + target = "i686-linux" info = targetinfo[target].split() info.append(target) info.append("common") -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 1/5] siteinfo.bbclass: hack for x32 2011-07-12 19:02 ` [PATCH 1/5] siteinfo.bbclass: hack for x32 nitin.a.kamble @ 2011-07-13 6:20 ` Khem Raj 2011-07-13 15:41 ` Kamble, Nitin A 0 siblings, 1 reply; 18+ messages in thread From: Khem Raj @ 2011-07-13 6:20 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: openembedded-core On Jul 12, 2011, at 12:02 PM, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > --- > meta/classes/siteinfo.bbclass | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass > index 78b7008..035355f 100644 > --- a/meta/classes/siteinfo.bbclass > +++ b/meta/classes/siteinfo.bbclass > @@ -59,6 +59,9 @@ def get_siteinfo_list(d): > "x86_64-linux": "endian-little bit-64 common-glibc",\ > "x86_64-linux-uclibc": "endian-little bit-64 common-uclibc"} > if target in targetinfo: > + target_cc_arch = bb.data.getVar('TARGET_CC_ARCH', d, 1) > + if target_cc_arch == "-mx32": > + target = "i686-linux" What would/could target be when using -mx32 ? I suppose it's one of the entries in dictionary above > info = targetinfo[target].split() > info.append(target) > info.append("common") > -- > 1.7.5.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/5] siteinfo.bbclass: hack for x32 2011-07-13 6:20 ` Khem Raj @ 2011-07-13 15:41 ` Kamble, Nitin A 2011-07-14 19:49 ` Khem Raj 0 siblings, 1 reply; 18+ messages in thread From: Kamble, Nitin A @ 2011-07-13 15:41 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > Khem Raj > Sent: Tuesday, July 12, 2011 11:20 PM > To: Patches and discussions about the oe-core layer > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH 1/5] siteinfo.bbclass: hack for x32 > > > > On Jul 12, 2011, at 12:02 PM, nitin.a.kamble@intel.com wrote: > > > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > > --- > > meta/classes/siteinfo.bbclass | 3 +++ > > 1 files changed, 3 insertions(+), 0 deletions(-) > > > > diff --git a/meta/classes/siteinfo.bbclass > b/meta/classes/siteinfo.bbclass > > index 78b7008..035355f 100644 > > --- a/meta/classes/siteinfo.bbclass > > +++ b/meta/classes/siteinfo.bbclass > > @@ -59,6 +59,9 @@ def get_siteinfo_list(d): > > "x86_64-linux": "endian-little bit-64 > common-glibc",\ > > "x86_64-linux-uclibc": "endian-little bit-64 > common-uclibc"} > > if target in targetinfo: > > + target_cc_arch = bb.data.getVar('TARGET_CC_ARCH', > d, 1) > > + if target_cc_arch == "-mx32": > > + target = "i686-linux" > > What would/could target be when using -mx32 ? > I suppose it's one of the entries in dictionary above > So far x86_64 is the target for x32. Nitin > > > > info = targetinfo[target].split() > > info.append(target) > > info.append("common") > > -- > > 1.7.5.4 > > > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/5] siteinfo.bbclass: hack for x32 2011-07-13 15:41 ` Kamble, Nitin A @ 2011-07-14 19:49 ` Khem Raj 0 siblings, 0 replies; 18+ messages in thread From: Khem Raj @ 2011-07-14 19:49 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Wed, Jul 13, 2011 at 8:41 AM, Kamble, Nitin A <nitin.a.kamble@intel.com> wrote: > > >> -----Original Message----- >> From: openembedded-core-bounces@lists.openembedded.org >> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of >> Khem Raj >> Sent: Tuesday, July 12, 2011 11:20 PM >> To: Patches and discussions about the oe-core layer >> Cc: openembedded-core@lists.openembedded.org >> Subject: Re: [OE-core] [PATCH 1/5] siteinfo.bbclass: hack for x32 >> >> >> >> On Jul 12, 2011, at 12:02 PM, nitin.a.kamble@intel.com wrote: >> >> > From: Nitin A Kamble <nitin.a.kamble@intel.com> >> > >> > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> >> > --- >> > meta/classes/siteinfo.bbclass | 3 +++ >> > 1 files changed, 3 insertions(+), 0 deletions(-) >> > >> > diff --git a/meta/classes/siteinfo.bbclass >> b/meta/classes/siteinfo.bbclass >> > index 78b7008..035355f 100644 >> > --- a/meta/classes/siteinfo.bbclass >> > +++ b/meta/classes/siteinfo.bbclass >> > @@ -59,6 +59,9 @@ def get_siteinfo_list(d): >> > "x86_64-linux": "endian-little bit-64 >> common-glibc",\ >> > "x86_64-linux-uclibc": "endian-little bit-64 >> common-uclibc"} >> > if target in targetinfo: >> > + target_cc_arch = bb.data.getVar('TARGET_CC_ARCH', >> d, 1) >> > + if target_cc_arch == "-mx32": >> > + target = "i686-linux" >> >> What would/could target be when using -mx32 ? >> I suppose it's one of the entries in dictionary above >> > So far x86_64 is the target for x32. yes I refreshed myself with the new ABI. x32 seems to be a true multilib case of amd64 ABI. > > Nitin > >> >> >> > info = targetinfo[target].split() >> > info.append(target) >> > info.append("common") >> > -- >> > 1.7.5.4 >> > >> > >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core@lists.openembedded.org >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/5] udev-172: add a newer version for newer kernel 2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble 2011-07-12 19:02 ` [PATCH 1/5] siteinfo.bbclass: hack for x32 nitin.a.kamble @ 2011-07-12 19:02 ` nitin.a.kamble 2011-07-13 6:22 ` Khem Raj 2011-07-12 19:02 ` [PATCH 3/5] runqemu: support qemux32 machine nitin.a.kamble ` (3 subsequent siblings) 5 siblings, 1 reply; 18+ messages in thread From: nitin.a.kamble @ 2011-07-12 19:02 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> the 2.6.38 kernel has dropped v4lv1 support. and udev-168 fails to compile because of that. So add a newer 172 version of udev to work with 2.6.38 kernel. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> --- meta/recipes-core/udev/udev-172/init | 59 +++++++++ meta/recipes-core/udev/udev-172/local.rules | 35 ++++++ meta/recipes-core/udev/udev-172/permissions.rules | 131 +++++++++++++++++++++ meta/recipes-core/udev/udev-172/run.rules | 14 +++ meta/recipes-core/udev/udev-172/udev.rules | 116 ++++++++++++++++++ meta/recipes-core/udev/udev_172.bb | 6 + 6 files changed, 361 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/udev/udev-172/init create mode 100644 meta/recipes-core/udev/udev-172/local.rules create mode 100644 meta/recipes-core/udev/udev-172/permissions.rules create mode 100644 meta/recipes-core/udev/udev-172/run.rules create mode 100644 meta/recipes-core/udev/udev-172/udev.rules create mode 100644 meta/recipes-core/udev/udev_172.bb diff --git a/meta/recipes-core/udev/udev-172/init b/meta/recipes-core/udev/udev-172/init new file mode 100644 index 0000000..9ce95ee --- /dev/null +++ b/meta/recipes-core/udev/udev-172/init @@ -0,0 +1,59 @@ +#!/bin/sh -e + +### 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 /sbin/udevd ] || exit 1 +[ -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 +} + +export ACTION=add +# propagate /dev from /sys +echo -n "Starting udev" + +# mount the tmpfs on /dev, if not already done +LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { + mount -n -o mode=0755 -t tmpfs none "/dev" + mkdir -m 0755 /dev/pts + 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 +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 + + /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=3; /sbin/udevadm control --env=STARTUP=)& + else + /sbin/udevadm trigger + /sbin/udevadm settle + fi + +echo +exit 0 diff --git a/meta/recipes-core/udev/udev-172/local.rules b/meta/recipes-core/udev/udev-172/local.rules new file mode 100644 index 0000000..625e49a --- /dev/null +++ b/meta/recipes-core/udev/udev-172/local.rules @@ -0,0 +1,35 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first framebuffer is symlinked to /dev/fb +KERNEL=="fb0", SYMLINK+="fb" + +# The first rtc device is symlinked to /dev/rtc +KERNEL=="rtc0", SYMLINK+="rtc" + +# Try and modprobe for drivers for new hardware +ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" + +# Create a symlink to any touchscreen input device +SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" + diff --git a/meta/recipes-core/udev/udev-172/permissions.rules b/meta/recipes-core/udev/udev-172/permissions.rules new file mode 100644 index 0000000..205b733 --- /dev/null +++ b/meta/recipes-core/udev/udev-172/permissions.rules @@ -0,0 +1,131 @@ +ACTION!="add", GOTO="permissions_end" + +# workarounds needed to synchronize with sysfs +# only needed for kernels < v2.6.18-rc1 +ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", WAIT_FOR_SYSFS="ioerr_cnt" +# only needed for kernels < 2.6.16 +SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" +# only needed for kernels < 2.6.17 +SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" + +# devices needed to load the drivers providing them +KERNEL=="tun", OPTIONS+="ignore_remove" +KERNEL=="ppp", OPTIONS+="ignore_remove" +KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" + +# default permissions for block devices +SUBSYSTEM=="block", GROUP="disk" +# the aacraid driver is broken and reports that disks removable (see #404927) +SUBSYSTEM=="block", ATTRS{removable}=="1", \ + DRIVERS!="aacraid", GROUP="floppy" +# all block devices on these buses are "removable" +SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy" + +# IDE devices +KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ + IMPORT{program}="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", GROUP="cdrom" +KERNEL=="ht[0-9]*", GROUP="tape" +KERNEL=="nht[0-9]*", GROUP="tape" + +# SCSI devices +KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" +SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" +SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP", GROUP="scanner" +SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson", GROUP="scanner" +SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", GROUP="scanner" +SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" +SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" +SUBSYSTEMS=="scsi", ATTRS{type}=="6", GROUP="scanner" +SUBSYSTEMS=="scsi", ATTRS{type}=="8", GROUP="tape" + +# USB devices +KERNEL=="legousbtower*", MODE="0666" +KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb", GROUP="lp" + +# usbfs-like devices +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \ + MODE="0664" + +# iRiver music players +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="plugdev", \ + ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]" + +# serial devices +SUBSYSTEM=="tty", GROUP="dialout" +SUBSYSTEM=="capi", GROUP="dialout" +SUBSYSTEM=="slamr", GROUP="dialout" +SUBSYSTEM=="zaptel", GROUP="dialout" + +# vc devices (all members of the tty subsystem) +KERNEL=="ptmx", MODE="0666", GROUP="root" +KERNEL=="console", MODE="0600", GROUP="root" +KERNEL=="tty", MODE="0666", GROUP="root" +KERNEL=="tty[0-9]*", GROUP="root" +KERNEL=="pty*", MODE="0666", GROUP="tty" + +# video devices +SUBSYSTEM=="video4linux", GROUP="video" +SUBSYSTEM=="drm", GROUP="video" +SUBSYSTEM=="dvb", GROUP="video" +SUBSYSTEM=="em8300", GROUP="video" +SUBSYSTEM=="graphics", GROUP="video" +SUBSYSTEM=="nvidia", GROUP="video" + +# misc devices +KERNEL=="random", MODE="0666" +KERNEL=="urandom", MODE="0666" +KERNEL=="mem", MODE="0640", GROUP="kmem" +KERNEL=="kmem", MODE="0640", GROUP="kmem" +KERNEL=="port", MODE="0640", GROUP="kmem" +KERNEL=="full", MODE="0666" +KERNEL=="null", MODE="0666" +KERNEL=="zero", MODE="0666" +KERNEL=="inotify", MODE="0666" +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" +KERNEL=="agpgart", GROUP="video" +KERNEL=="nvram", GROUP="nvram" +KERNEL=="rtc|rtc[0-9]*", GROUP="audio" +KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" +KERNEL=="fuse", GROUP="fuse" +KERNEL=="kqemu", MODE="0666" +KERNEL=="kvm", GROUP="kvm" +KERNEL=="tun", MODE="0666", + +KERNEL=="cdemu[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd", MODE="0644" + +KERNEL=="uverbs*", GROUP="rdma" +KERNEL=="ucm*", GROUP="rdma" +KERNEL=="rdma_ucm", GROUP="rdma" + +# printers and parallel devices +SUBSYSTEM=="printer", GROUP="lp" +SUBSYSTEM=="ppdev", GROUP="lp" +KERNEL=="irlpt*", GROUP="lp" +KERNEL=="pt[0-9]*", GROUP="tape" +KERNEL=="pht[0-9]*", GROUP="tape" + +# sound devices +SUBSYSTEM=="sound", GROUP="audio" + +# ieee1394 devices +KERNEL=="raw1394", GROUP="disk" +KERNEL=="dv1394*", GROUP="video" +KERNEL=="video1394*", GROUP="video" + +# input devices +KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \ + MODE="0664", GROUP="video" +KERNEL=="js[0-9]*", MODE="0664" +KERNEL=="lirc[0-9]*", GROUP="video" + +# AOE character devices +SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" +SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" + +LABEL="permissions_end" + diff --git a/meta/recipes-core/udev/udev-172/run.rules b/meta/recipes-core/udev/udev-172/run.rules new file mode 100644 index 0000000..75d7137 --- /dev/null +++ b/meta/recipes-core/udev/udev-172/run.rules @@ -0,0 +1,14 @@ +# debugging monitor +RUN+="socket:/org/kernel/udev/monitor" + +# run a command on remove events +ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" + +# ignore the events generated by virtual consoles +KERNEL=="ptmx", OPTIONS+="last_rule" +KERNEL=="console", OPTIONS+="last_rule" +KERNEL=="tty" , OPTIONS+="last_rule" +KERNEL=="tty[0-9]*", OPTIONS+="last_rule" +KERNEL=="pty*", OPTIONS+="last_rule" +SUBSYSTEM=="vc", OPTIONS+="last_rule" + diff --git a/meta/recipes-core/udev/udev-172/udev.rules b/meta/recipes-core/udev/udev-172/udev.rules new file mode 100644 index 0000000..a19d4a0 --- /dev/null +++ b/meta/recipes-core/udev/udev-172/udev.rules @@ -0,0 +1,116 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# workaround for devices which do not report media changes +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ + ENV{ID_MODEL}=="IOMEGA_ZIP*", NAME="%k", OPTIONS+="all_partitions" +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ + OPTIONS+="all_partitions" + +# SCSI devices +SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \ + ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \ + NAME="%c" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="dvb*", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \ + NAME="%c" +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" +KERNEL=="evtchn", NAME="xen/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm*", NAME="infiniband/%k" +KERNEL=="rdma_ucm", NAME="infiniband/%k" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh" + +# Samsung UARTS +KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" + +# MXC UARTs +KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" + diff --git a/meta/recipes-core/udev/udev_172.bb b/meta/recipes-core/udev/udev_172.bb new file mode 100644 index 0000000..7e3f956 --- /dev/null +++ b/meta/recipes-core/udev/udev_172.bb @@ -0,0 +1,6 @@ +include udev-new.inc + +PR = "r0" + +SRC_URI[md5sum] = "9af0a8457cc178d18661a5848f18c4c9" +SRC_URI[sha256sum] = "93222392488a52f8eb79c7d4f6b992d19bd375c79a87ead4b480be1cc25382d7" -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 2/5] udev-172: add a newer version for newer kernel 2011-07-12 19:02 ` [PATCH 2/5] udev-172: add a newer version for newer kernel nitin.a.kamble @ 2011-07-13 6:22 ` Khem Raj 2011-07-13 6:59 ` Koen Kooi 0 siblings, 1 reply; 18+ messages in thread From: Khem Raj @ 2011-07-13 6:22 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: openembedded-core On Jul 12, 2011, at 12:02 PM, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > the 2.6.38 kernel has dropped v4lv1 support. and udev-168 fails to > compile because of that. So add a newer 172 version of udev to work with > 2.6.38 kernel. > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > --- > meta/recipes-core/udev/udev-172/init | 59 +++++++++ > meta/recipes-core/udev/udev-172/local.rules | 35 ++++++ > meta/recipes-core/udev/udev-172/permissions.rules | 131 +++++++++++++++++++++ > meta/recipes-core/udev/udev-172/run.rules | 14 +++ > meta/recipes-core/udev/udev-172/udev.rules | 116 ++++++++++++++++++ > meta/recipes-core/udev/udev_172.bb | 6 + > 6 files changed, 361 insertions(+), 0 deletions(-) > create mode 100644 meta/recipes-core/udev/udev-172/init > create mode 100644 meta/recipes-core/udev/udev-172/local.rules > create mode 100644 meta/recipes-core/udev/udev-172/permissions.rules > create mode 100644 meta/recipes-core/udev/udev-172/run.rules > create mode 100644 meta/recipes-core/udev/udev-172/udev.rules > create mode 100644 meta/recipes-core/udev/udev_172.bb Meta-oe ha 171 it would be nice if you could look inti it and incorporate any differences into 172 Then we can retire 171 from meta-oe > > diff --git a/meta/recipes-core/udev/udev-172/init b/meta/recipes-core/udev/udev-172/init > new file mode 100644 > index 0000000..9ce95ee > --- /dev/null > +++ b/meta/recipes-core/udev/udev-172/init > @@ -0,0 +1,59 @@ > +#!/bin/sh -e > + > +### 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 /sbin/udevd ] || exit 1 > +[ -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 > +} > + > +export ACTION=add > +# propagate /dev from /sys > +echo -n "Starting udev" > + > +# mount the tmpfs on /dev, if not already done > +LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { > + mount -n -o mode=0755 -t tmpfs none "/dev" > + mkdir -m 0755 /dev/pts > + 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 > +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 > + > + /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=3; /sbin/udevadm control --env=STARTUP=)& > + else > + /sbin/udevadm trigger > + /sbin/udevadm settle > + fi > + > +echo > +exit 0 > diff --git a/meta/recipes-core/udev/udev-172/local.rules b/meta/recipes-core/udev/udev-172/local.rules > new file mode 100644 > index 0000000..625e49a > --- /dev/null > +++ b/meta/recipes-core/udev/udev-172/local.rules > @@ -0,0 +1,35 @@ > +# There are a number of modifiers that are allowed to be used in some > +# of the different fields. They provide the following subsitutions: > +# > +# %n the "kernel number" of the device. > +# For example, 'sda3' has a "kernel number" of '3' > +# %e the smallest number for that name which does not matches an existing node > +# %k the kernel name for the device > +# %M the kernel major number for the device > +# %m the kernel minor number for the device > +# %b the bus id for the device > +# %c the string returned by the PROGRAM > +# %s{filename} the content of a sysfs attribute > +# %% the '%' char itself > +# > + > +# Media automounting > +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" > +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" > + > +# Handle network interface setup > +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" > +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" > + > +# The first framebuffer is symlinked to /dev/fb > +KERNEL=="fb0", SYMLINK+="fb" > + > +# The first rtc device is symlinked to /dev/rtc > +KERNEL=="rtc0", SYMLINK+="rtc" > + > +# Try and modprobe for drivers for new hardware > +ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" > + > +# Create a symlink to any touchscreen input device > +SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" > + > diff --git a/meta/recipes-core/udev/udev-172/permissions.rules b/meta/recipes-core/udev/udev-172/permissions.rules > new file mode 100644 > index 0000000..205b733 > --- /dev/null > +++ b/meta/recipes-core/udev/udev-172/permissions.rules > @@ -0,0 +1,131 @@ > +ACTION!="add", GOTO="permissions_end" > + > +# workarounds needed to synchronize with sysfs > +# only needed for kernels < v2.6.18-rc1 > +ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" > +SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", WAIT_FOR_SYSFS="ioerr_cnt" > +# only needed for kernels < 2.6.16 > +SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" > +# only needed for kernels < 2.6.17 > +SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" > + > +# devices needed to load the drivers providing them > +KERNEL=="tun", OPTIONS+="ignore_remove" > +KERNEL=="ppp", OPTIONS+="ignore_remove" > +KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" > + > +# default permissions for block devices > +SUBSYSTEM=="block", GROUP="disk" > +# the aacraid driver is broken and reports that disks removable (see #404927) > +SUBSYSTEM=="block", ATTRS{removable}=="1", \ > + DRIVERS!="aacraid", GROUP="floppy" > +# all block devices on these buses are "removable" > +SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy" > + > +# IDE devices > +KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ > + IMPORT{program}="cdrom_id --export $tempnode" > +ENV{ID_CDROM}=="?*", GROUP="cdrom" > +KERNEL=="ht[0-9]*", GROUP="tape" > +KERNEL=="nht[0-9]*", GROUP="tape" > + > +# SCSI devices > +KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" > +SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" > +SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP", GROUP="scanner" > +SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson", GROUP="scanner" > +SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", GROUP="scanner" > +SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" > +SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" > +SUBSYSTEMS=="scsi", ATTRS{type}=="6", GROUP="scanner" > +SUBSYSTEMS=="scsi", ATTRS{type}=="8", GROUP="tape" > + > +# USB devices > +KERNEL=="legousbtower*", MODE="0666" > +KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb", GROUP="lp" > + > +# usbfs-like devices > +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \ > + MODE="0664" > + > +# iRiver music players > +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="plugdev", \ > + ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]" > + > +# serial devices > +SUBSYSTEM=="tty", GROUP="dialout" > +SUBSYSTEM=="capi", GROUP="dialout" > +SUBSYSTEM=="slamr", GROUP="dialout" > +SUBSYSTEM=="zaptel", GROUP="dialout" > + > +# vc devices (all members of the tty subsystem) > +KERNEL=="ptmx", MODE="0666", GROUP="root" > +KERNEL=="console", MODE="0600", GROUP="root" > +KERNEL=="tty", MODE="0666", GROUP="root" > +KERNEL=="tty[0-9]*", GROUP="root" > +KERNEL=="pty*", MODE="0666", GROUP="tty" > + > +# video devices > +SUBSYSTEM=="video4linux", GROUP="video" > +SUBSYSTEM=="drm", GROUP="video" > +SUBSYSTEM=="dvb", GROUP="video" > +SUBSYSTEM=="em8300", GROUP="video" > +SUBSYSTEM=="graphics", GROUP="video" > +SUBSYSTEM=="nvidia", GROUP="video" > + > +# misc devices > +KERNEL=="random", MODE="0666" > +KERNEL=="urandom", MODE="0666" > +KERNEL=="mem", MODE="0640", GROUP="kmem" > +KERNEL=="kmem", MODE="0640", GROUP="kmem" > +KERNEL=="port", MODE="0640", GROUP="kmem" > +KERNEL=="full", MODE="0666" > +KERNEL=="null", MODE="0666" > +KERNEL=="zero", MODE="0666" > +KERNEL=="inotify", MODE="0666" > +KERNEL=="sgi_fetchop", MODE="0666" > +KERNEL=="sonypi", MODE="0666" > +KERNEL=="agpgart", GROUP="video" > +KERNEL=="nvram", GROUP="nvram" > +KERNEL=="rtc|rtc[0-9]*", GROUP="audio" > +KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" > +KERNEL=="fuse", GROUP="fuse" > +KERNEL=="kqemu", MODE="0666" > +KERNEL=="kvm", GROUP="kvm" > +KERNEL=="tun", MODE="0666", > + > +KERNEL=="cdemu[0-9]*", GROUP="cdrom" > +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" > +KERNEL=="pktcdvd", MODE="0644" > + > +KERNEL=="uverbs*", GROUP="rdma" > +KERNEL=="ucm*", GROUP="rdma" > +KERNEL=="rdma_ucm", GROUP="rdma" > + > +# printers and parallel devices > +SUBSYSTEM=="printer", GROUP="lp" > +SUBSYSTEM=="ppdev", GROUP="lp" > +KERNEL=="irlpt*", GROUP="lp" > +KERNEL=="pt[0-9]*", GROUP="tape" > +KERNEL=="pht[0-9]*", GROUP="tape" > + > +# sound devices > +SUBSYSTEM=="sound", GROUP="audio" > + > +# ieee1394 devices > +KERNEL=="raw1394", GROUP="disk" > +KERNEL=="dv1394*", GROUP="video" > +KERNEL=="video1394*", GROUP="video" > + > +# input devices > +KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \ > + MODE="0664", GROUP="video" > +KERNEL=="js[0-9]*", MODE="0664" > +KERNEL=="lirc[0-9]*", GROUP="video" > + > +# AOE character devices > +SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" > +SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" > + > +LABEL="permissions_end" > + > diff --git a/meta/recipes-core/udev/udev-172/run.rules b/meta/recipes-core/udev/udev-172/run.rules > new file mode 100644 > index 0000000..75d7137 > --- /dev/null > +++ b/meta/recipes-core/udev/udev-172/run.rules > @@ -0,0 +1,14 @@ > +# debugging monitor > +RUN+="socket:/org/kernel/udev/monitor" > + > +# run a command on remove events > +ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" > + > +# ignore the events generated by virtual consoles > +KERNEL=="ptmx", OPTIONS+="last_rule" > +KERNEL=="console", OPTIONS+="last_rule" > +KERNEL=="tty" , OPTIONS+="last_rule" > +KERNEL=="tty[0-9]*", OPTIONS+="last_rule" > +KERNEL=="pty*", OPTIONS+="last_rule" > +SUBSYSTEM=="vc", OPTIONS+="last_rule" > + > diff --git a/meta/recipes-core/udev/udev-172/udev.rules b/meta/recipes-core/udev/udev-172/udev.rules > new file mode 100644 > index 0000000..a19d4a0 > --- /dev/null > +++ b/meta/recipes-core/udev/udev-172/udev.rules > @@ -0,0 +1,116 @@ > +# There are a number of modifiers that are allowed to be used in some > +# of the different fields. They provide the following subsitutions: > +# > +# %n the "kernel number" of the device. > +# For example, 'sda3' has a "kernel number" of '3' > +# %e the smallest number for that name which does not matches an existing node > +# %k the kernel name for the device > +# %M the kernel major number for the device > +# %m the kernel minor number for the device > +# %b the bus id for the device > +# %c the string returned by the PROGRAM > +# %s{filename} the content of a sysfs attribute > +# %% the '%' char itself > +# > + > +# workaround for devices which do not report media changes > +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ > + ENV{ID_MODEL}=="IOMEGA_ZIP*", NAME="%k", OPTIONS+="all_partitions" > +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ > + OPTIONS+="all_partitions" > + > +# SCSI devices > +SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" > + > +# USB devices > +SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" > +SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" > +SUBSYSTEMS=="usb", KERNEL=="dabusb*", NAME="usb/%k" > +SUBSYSTEMS=="usb", KERNEL=="hiddev*", NAME="usb/%k" > +SUBSYSTEMS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" > +SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" > +SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \ > + ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \ > + SYMLINK+="pilot" > + > +# usbfs-like devices > +SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \ > + NAME="%c" > +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}" > + > +# serial devices > +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" > +KERNEL=="capi[0-9]*", NAME="capi/%n" > + > +# video devices > +KERNEL=="dvb*", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \ > + NAME="%c" > +KERNEL=="card[0-9]*", NAME="dri/%k" > + > +# misc devices > +KERNEL=="hw_random", NAME="hwrng" > +KERNEL=="tun", NAME="net/%k" > +KERNEL=="evtchn", NAME="xen/%k" > + > +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" > +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" > +KERNEL=="pktcdvd", NAME="pktcdvd/control" > + > +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" > +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" > +KERNEL=="microcode", NAME="cpu/microcode" > + > +KERNEL=="umad*", NAME="infiniband/%k" > +KERNEL=="issm*", NAME="infiniband/%k" > +KERNEL=="uverbs*", NAME="infiniband/%k" > +KERNEL=="ucm*", NAME="infiniband/%k" > +KERNEL=="rdma_ucm", NAME="infiniband/%k" > + > +# ALSA devices > +KERNEL=="controlC[0-9]*", NAME="snd/%k" > +KERNEL=="hwC[D0-9]*", NAME="snd/%k" > +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" > +KERNEL=="midiC[D0-9]*", NAME="snd/%k" > +KERNEL=="timer", NAME="snd/%k" > +KERNEL=="seq", NAME="snd/%k" > + > +# ieee1394 devices > +KERNEL=="dv1394*", NAME="dv1394/%n" > +KERNEL=="video1394*", NAME="video1394/%n" > + > +# input devices > +KERNEL=="mice", NAME="input/%k" > +KERNEL=="mouse[0-9]*", NAME="input/%k" > +KERNEL=="event[0-9]*", NAME="input/%k" > +KERNEL=="js[0-9]*", NAME="input/%k" > +KERNEL=="ts[0-9]*", NAME="input/%k" > +KERNEL=="uinput", NAME="input/%k" > + > +# Zaptel > +KERNEL=="zapctl", NAME="zap/ctl" > +KERNEL=="zaptimer", NAME="zap/timer" > +KERNEL=="zapchannel", NAME="zap/channel" > +KERNEL=="zappseudo", NAME="zap/pseudo" > +KERNEL=="zap[0-9]*", NAME="zap/%n" > + > +# AOE character devices > +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" > +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" > +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" > +SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k" > + > +# device mapper creates its own device nodes, so ignore these > +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" > +KERNEL=="device-mapper", NAME="mapper/control" > + > +KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" > + > +# Firmware Helper > +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh" > + > +# Samsung UARTS > +KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" > + > +# MXC UARTs > +KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" > + > diff --git a/meta/recipes-core/udev/udev_172.bb b/meta/recipes-core/udev/udev_172.bb > new file mode 100644 > index 0000000..7e3f956 > --- /dev/null > +++ b/meta/recipes-core/udev/udev_172.bb > @@ -0,0 +1,6 @@ > +include udev-new.inc > + > +PR = "r0" > + > +SRC_URI[md5sum] = "9af0a8457cc178d18661a5848f18c4c9" > +SRC_URI[sha256sum] = "93222392488a52f8eb79c7d4f6b992d19bd375c79a87ead4b480be1cc25382d7" > -- > 1.7.5.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/5] udev-172: add a newer version for newer kernel 2011-07-13 6:22 ` Khem Raj @ 2011-07-13 6:59 ` Koen Kooi 2011-07-13 15:43 ` Kamble, Nitin A 0 siblings, 1 reply; 18+ messages in thread From: Koen Kooi @ 2011-07-13 6:59 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 13 jul 2011, om 08:22 heeft Khem Raj het volgende geschreven: > > > On Jul 12, 2011, at 12:02 PM, nitin.a.kamble@intel.com wrote: > >> From: Nitin A Kamble <nitin.a.kamble@intel.com> >> >> the 2.6.38 kernel has dropped v4lv1 support. and udev-168 fails to >> compile because of that. So add a newer 172 version of udev to work with >> 2.6.38 kernel. >> >> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> >> --- >> meta/recipes-core/udev/udev-172/init | 59 +++++++++ >> meta/recipes-core/udev/udev-172/local.rules | 35 ++++++ >> meta/recipes-core/udev/udev-172/permissions.rules | 131 +++++++++++++++++++++ >> meta/recipes-core/udev/udev-172/run.rules | 14 +++ >> meta/recipes-core/udev/udev-172/udev.rules | 116 ++++++++++++++++++ >> meta/recipes-core/udev/udev_172.bb | 6 + >> 6 files changed, 361 insertions(+), 0 deletions(-) >> create mode 100644 meta/recipes-core/udev/udev-172/init >> create mode 100644 meta/recipes-core/udev/udev-172/local.rules >> create mode 100644 meta/recipes-core/udev/udev-172/permissions.rules >> create mode 100644 meta/recipes-core/udev/udev-172/run.rules >> create mode 100644 meta/recipes-core/udev/udev-172/udev.rules >> create mode 100644 meta/recipes-core/udev/udev_172.bb > > Meta-oe ha 171 it would be nice if you could look inti it and incorporate any differences into 172 > Then we can retire 171 from meta-oe Meta-oe has had 172 since yesterday :) The main difference between the oe-core and meta-oe version is that the meta-oe version has removed a lot of udev rules that weren't needed and made booting slow. Where udev trigger used to take >8 seconds I can now boot X in less than a second on a cortex A9. regards, Koen ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/5] udev-172: add a newer version for newer kernel 2011-07-13 6:59 ` Koen Kooi @ 2011-07-13 15:43 ` Kamble, Nitin A 0 siblings, 0 replies; 18+ messages in thread From: Kamble, Nitin A @ 2011-07-13 15:43 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > Koen Kooi > Sent: Wednesday, July 13, 2011 12:00 AM > To: Patches and discussions about the oe-core layer > Subject: Re: [OE-core] [PATCH 2/5] udev-172: add a newer version for > newer kernel > > > Op 13 jul 2011, om 08:22 heeft Khem Raj het volgende geschreven: > > > > > > > On Jul 12, 2011, at 12:02 PM, nitin.a.kamble@intel.com wrote: > > > >> From: Nitin A Kamble <nitin.a.kamble@intel.com> > >> > >> the 2.6.38 kernel has dropped v4lv1 support. and udev-168 fails to > >> compile because of that. So add a newer 172 version of udev to work > with > >> 2.6.38 kernel. > >> > >> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > >> --- > >> meta/recipes-core/udev/udev-172/init | 59 +++++++++ > >> meta/recipes-core/udev/udev-172/local.rules | 35 ++++++ > >> meta/recipes-core/udev/udev-172/permissions.rules | 131 > +++++++++++++++++++++ > >> meta/recipes-core/udev/udev-172/run.rules | 14 +++ > >> meta/recipes-core/udev/udev-172/udev.rules | 116 > ++++++++++++++++++ > >> meta/recipes-core/udev/udev_172.bb | 6 + > >> 6 files changed, 361 insertions(+), 0 deletions(-) > >> create mode 100644 meta/recipes-core/udev/udev-172/init > >> create mode 100644 meta/recipes-core/udev/udev-172/local.rules > >> create mode 100644 meta/recipes-core/udev/udev-172/permissions.rules > >> create mode 100644 meta/recipes-core/udev/udev-172/run.rules > >> create mode 100644 meta/recipes-core/udev/udev-172/udev.rules > >> create mode 100644 meta/recipes-core/udev/udev_172.bb > > > > Meta-oe ha 171 it would be nice if you could look inti it and > incorporate any differences into 172 > > Then we can retire 171 from meta-oe > > Meta-oe has had 172 since yesterday :) The main difference between the > oe-core and meta-oe version is that the meta-oe version has removed a > lot of udev rules that weren't needed and made booting slow. Where udev > trigger used to take >8 seconds I can now boot X in less than a second > on a cortex A9. > > regards, > > Koen Great, then we can take meta-oe version of 172 into oe-core. Thanks, Nitin > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/5] runqemu: support qemux32 machine 2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble 2011-07-12 19:02 ` [PATCH 1/5] siteinfo.bbclass: hack for x32 nitin.a.kamble 2011-07-12 19:02 ` [PATCH 2/5] udev-172: add a newer version for newer kernel nitin.a.kamble @ 2011-07-12 19:02 ` nitin.a.kamble 2011-07-13 1:35 ` Bruce Ashfield 2011-07-12 19:02 ` [PATCH 4/5] kernel.bbclass: fix the broken lines nitin.a.kamble ` (2 subsequent siblings) 5 siblings, 1 reply; 18+ messages in thread From: nitin.a.kamble @ 2011-07-12 19:02 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> --- scripts/qemuimage-testlib | 2 +- scripts/runqemu | 12 ++++++++---- scripts/runqemu-internal | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index c2dbf60..05df11a 100755 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib @@ -424,7 +424,7 @@ Test_Create_Qemu() return 1 fi - if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux86-64" ]; then + if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux32" -o "$QEMUARCH" = "qemux86-64" ]; then KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k bzImage -a ${QEMUARCH}) elif [ "$QEMUARCH" = "qemuarm" -o "$QEMUARCH" = "spitz" -o "$QEMUARCH" = "borzoi" -o "$QEMUARCH" = "akita" -o "$QEMUARCH" = "nokia800" -o "$QEMUARCH" = "qemuppc" ]; then KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k zImage -a ${QEMUARCH}) diff --git a/scripts/runqemu b/scripts/runqemu index 5aed25a..ef57638 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -93,7 +93,7 @@ i=1 while [ $i -le $# ]; do arg=${!i} case $arg in - "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc") + "qemux86" | "qemux32" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc") if [ -z "$MACHINE" ]; then MACHINE=$arg else @@ -136,7 +136,7 @@ while [ $i -le $# ]; do SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0" ;; "audio") - if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux86-64" ]]; then + if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux32" || "x$MACHINE" == "xqemux86-64" ]]; then echo "Enable audio on qemu. Pls. install snd_intel8x0 or snd_ens1370 driver in linux guest."; QEMU_AUDIO_DRV="alsa" SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -soundhw ac97,es1370" @@ -192,7 +192,7 @@ if [[ "x$KVM_ENABLED" == "xyes" ]]; then echo "$YOCTO_KVM_WIKI"; exit 1; fi - if [[ "x$MACHINE" != "xqemux86" && "x$MACHINE" != "xqemux86-64" ]]; then + if [[ "x$MACHINE" != "xqemux86" && "x$MACHINE" != "xqemux32" && "x$MACHINE" != "xqemux86-64" ]]; then echo "KVM only support x86 & x86-64. Remove kvm from the command-line"; exit 1; fi @@ -221,7 +221,7 @@ if [[ "$FSTYPE" == "nfs" && -z "$ROOTFS" ]]; then fi if [ -z "$MACHINE" ]; then - MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux86\|qemuarm\|qemumips\|qemuppc\).*/\1/'` + MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux32\|qemux86\|qemuarm\|qemumips\|qemuppc\).*/\1/'` if [ -z "$MACHINE" ]; then echo "Error: Unable to set MACHINE from kernel filename [$KERNEL]" usage @@ -236,6 +236,10 @@ QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin QEMUX86_DEFAULT_FSTYPE=ext3 QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" +QEMUX32_DEFAULT_KERNEL=bzImage-qemux32.bin +QEMUX32_DEFAULT_FSTYPE=ext3 +QEMUX32_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" + QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin QEMUX86_64_DEFAULT_FSTYPE=ext3 QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index c15632d..9f204e0 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -45,6 +45,9 @@ else "qemux86") mem_size=128 ;; + "qemux32") + mem_size=128 + ;; "qemux86-64") mem_size=128 ;; @@ -218,6 +221,7 @@ case "$MACHINE" in "qemuarmv6") ;; "qemuarmv7") ;; "qemux86") ;; + "qemux32") ;; "qemux86-64") ;; "akita") ;; "spitz") ;; @@ -319,6 +323,27 @@ if [ "$MACHINE" = "qemux86" ]; then KERNCMDLINE="$KERNCMDLINE oprofile.timer=1" fi +if [ "$MACHINE" = "qemux32" ]; then + QEMU=qemu-system-x86_64 + QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" + if [ "$FSTYPE" = "ext3" ]; then + KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" + QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" + fi + if [ "$FSTYPE" = "nfs" ]; then + if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then + echo "Error: NFS mount point $ROOTFS doesn't exist." + cleanup + return + fi + KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" + QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" + fi + # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in + # qemux86 and qemux86-64. We can use timer interrupt mode for now. + KERNCMDLINE="$KERNCMDLINE oprofile.timer=1" +fi + if [ "$MACHINE" = "qemux86-64" ]; then QEMU=qemu-system-x86_64 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 3/5] runqemu: support qemux32 machine 2011-07-12 19:02 ` [PATCH 3/5] runqemu: support qemux32 machine nitin.a.kamble @ 2011-07-13 1:35 ` Bruce Ashfield 0 siblings, 0 replies; 18+ messages in thread From: Bruce Ashfield @ 2011-07-13 1:35 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, Jul 12, 2011 at 3:02 PM, <nitin.a.kamble@intel.com> wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > --- > scripts/qemuimage-testlib | 2 +- > scripts/runqemu | 12 ++++++++---- > scripts/runqemu-internal | 25 +++++++++++++++++++++++++ > 3 files changed, 34 insertions(+), 5 deletions(-) > > diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib > index c2dbf60..05df11a 100755 > --- a/scripts/qemuimage-testlib > +++ b/scripts/qemuimage-testlib > @@ -424,7 +424,7 @@ Test_Create_Qemu() > return 1 > fi > > - if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux86-64" ]; then > + if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux32" -o "$QEMUARCH" = "qemux86-64" ]; then > KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k bzImage -a ${QEMUARCH}) > elif [ "$QEMUARCH" = "qemuarm" -o "$QEMUARCH" = "spitz" -o "$QEMUARCH" = "borzoi" -o "$QEMUARCH" = "akita" -o "$QEMUARCH" = "nokia800" -o "$QEMUARCH" = "qemuppc" ]; then > KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k zImage -a ${QEMUARCH}) > diff --git a/scripts/runqemu b/scripts/runqemu > index 5aed25a..ef57638 100755 > --- a/scripts/runqemu > +++ b/scripts/runqemu > @@ -93,7 +93,7 @@ i=1 > while [ $i -le $# ]; do > arg=${!i} > case $arg in > - "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc") > + "qemux86" | "qemux32" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc") > if [ -z "$MACHINE" ]; then > MACHINE=$arg > else > @@ -136,7 +136,7 @@ while [ $i -le $# ]; do > SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0" > ;; > "audio") > - if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux86-64" ]]; then > + if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux32" || "x$MACHINE" == "xqemux86-64" ]]; then > echo "Enable audio on qemu. Pls. install snd_intel8x0 or snd_ens1370 driver in linux guest."; > QEMU_AUDIO_DRV="alsa" > SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -soundhw ac97,es1370" > @@ -192,7 +192,7 @@ if [[ "x$KVM_ENABLED" == "xyes" ]]; then > echo "$YOCTO_KVM_WIKI"; > exit 1; > fi > - if [[ "x$MACHINE" != "xqemux86" && "x$MACHINE" != "xqemux86-64" ]]; then > + if [[ "x$MACHINE" != "xqemux86" && "x$MACHINE" != "xqemux32" && "x$MACHINE" != "xqemux86-64" ]]; then > echo "KVM only support x86 & x86-64. Remove kvm from the command-line"; > exit 1; > fi > @@ -221,7 +221,7 @@ if [[ "$FSTYPE" == "nfs" && -z "$ROOTFS" ]]; then > fi > > if [ -z "$MACHINE" ]; then > - MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux86\|qemuarm\|qemumips\|qemuppc\).*/\1/'` > + MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux32\|qemux86\|qemuarm\|qemumips\|qemuppc\).*/\1/'` > if [ -z "$MACHINE" ]; then > echo "Error: Unable to set MACHINE from kernel filename [$KERNEL]" > usage > @@ -236,6 +236,10 @@ QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin > QEMUX86_DEFAULT_FSTYPE=ext3 > QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" > > +QEMUX32_DEFAULT_KERNEL=bzImage-qemux32.bin > +QEMUX32_DEFAULT_FSTYPE=ext3 > +QEMUX32_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" > + > QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin > QEMUX86_64_DEFAULT_FSTYPE=ext3 > QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" > diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal > index c15632d..9f204e0 100755 > --- a/scripts/runqemu-internal > +++ b/scripts/runqemu-internal > @@ -45,6 +45,9 @@ else > "qemux86") > mem_size=128 > ;; > + "qemux32") > + mem_size=128 > + ;; > "qemux86-64") > mem_size=128 > ;; > @@ -218,6 +221,7 @@ case "$MACHINE" in > "qemuarmv6") ;; > "qemuarmv7") ;; > "qemux86") ;; > + "qemux32") ;; > "qemux86-64") ;; > "akita") ;; > "spitz") ;; > @@ -319,6 +323,27 @@ if [ "$MACHINE" = "qemux86" ]; then > KERNCMDLINE="$KERNCMDLINE oprofile.timer=1" > fi > > +if [ "$MACHINE" = "qemux32" ]; then > + QEMU=qemu-system-x86_64 > + QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" > + if [ "$FSTYPE" = "ext3" ]; then > + KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" > + QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" Nitin, I've been watching the x32 work, and I'm wondering what kernel/configuration you've been using to test this ? If this is to go into core, I'd want to have the consistent features of the other qemu* machines applied, but I haven't heard anything about this in quite a while, so I'm unsure what's being used. Cheers, Bruce > + fi > + if [ "$FSTYPE" = "nfs" ]; then > + if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then > + echo "Error: NFS mount point $ROOTFS doesn't exist." > + cleanup > + return > + fi > + KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" > + QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" > + fi > + # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in > + # qemux86 and qemux86-64. We can use timer interrupt mode for now. > + KERNCMDLINE="$KERNCMDLINE oprofile.timer=1" > +fi > + > if [ "$MACHINE" = "qemux86-64" ]; then > QEMU=qemu-system-x86_64 > QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" > -- > 1.7.5.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 4/5] kernel.bbclass: fix the broken lines 2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble ` (2 preceding siblings ...) 2011-07-12 19:02 ` [PATCH 3/5] runqemu: support qemux32 machine nitin.a.kamble @ 2011-07-12 19:02 ` nitin.a.kamble 2011-07-13 11:16 ` Richard Purdie 2011-07-12 19:02 ` [PATCH 5/5] glibc: fix false failure nitin.a.kamble 2011-07-13 11:20 ` [PATCH 0/5] commits for yocto.git tree for x32 work Richard Purdie 5 siblings, 1 reply; 18+ messages in thread From: nitin.a.kamble @ 2011-07-12 19:02 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- meta/classes/kernel.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index e441748..b71a650 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -188,8 +188,8 @@ kernel_do_configure() { if [ ! -z "${INITRAMFS_IMAGE}" ]; then for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do - if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" - cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i + if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then + cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img fi done fi -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 4/5] kernel.bbclass: fix the broken lines 2011-07-12 19:02 ` [PATCH 4/5] kernel.bbclass: fix the broken lines nitin.a.kamble @ 2011-07-13 11:16 ` Richard Purdie 0 siblings, 0 replies; 18+ messages in thread From: Richard Purdie @ 2011-07-13 11:16 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-07-12 at 12:02 -0700, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > Signed-off-by: Andrea Adami <andrea.adami@gmail.com> > --- > meta/classes/kernel.bbclass | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Merged to master, thanks. Richard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 5/5] glibc: fix false failure 2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble ` (3 preceding siblings ...) 2011-07-12 19:02 ` [PATCH 4/5] kernel.bbclass: fix the broken lines nitin.a.kamble @ 2011-07-12 19:02 ` nitin.a.kamble 2011-07-13 11:16 ` Richard Purdie 2011-07-13 11:20 ` [PATCH 0/5] commits for yocto.git tree for x32 work Richard Purdie 5 siblings, 1 reply; 18+ messages in thread From: nitin.a.kamble @ 2011-07-12 19:02 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> do not just fail if grep does not match the locale name in the list Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> --- meta/recipes-core/glibc/glibc.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index b16ebd3..57d693c 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -48,7 +48,7 @@ do_rig_locales() { head -n 3 $INFILE > $OUTFILE for i in ${LIMIT_BUILT_LOCALES}; do echo - grep $i $INFILE >> $OUTFILE + grep $i $INFILE >> $OUTFILE || true done head --lines=-1 $OUTFILE > $INFILE tail --lines=1 $OUTFILE | sed 's#\\##' >> $INFILE -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 5/5] glibc: fix false failure 2011-07-12 19:02 ` [PATCH 5/5] glibc: fix false failure nitin.a.kamble @ 2011-07-13 11:16 ` Richard Purdie 0 siblings, 0 replies; 18+ messages in thread From: Richard Purdie @ 2011-07-13 11:16 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-07-12 at 12:02 -0700, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > do not just fail if grep does not match the locale name in the list > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > --- > meta/recipes-core/glibc/glibc.inc | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Merged to master, thanks. Richard ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/5] commits for yocto.git tree for x32 work 2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble ` (4 preceding siblings ...) 2011-07-12 19:02 ` [PATCH 5/5] glibc: fix false failure nitin.a.kamble @ 2011-07-13 11:20 ` Richard Purdie 2011-07-13 14:14 ` Tom Rini 2011-07-13 14:38 ` Khem Raj 5 siblings, 2 replies; 18+ messages in thread From: Richard Purdie @ 2011-07-13 11:20 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-07-12 at 12:02 -0700, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > These are commits for yocto tree. I came up with as part of the x32 work. > I think these commits does not belong in the x32 layer and should go > in the yocto/oecore tree. > > The siteinfo.bbclass commit is a hacky way to get the the right siteinfo for > x32 now. In the future a better solution will be implemented for that purpose. > > The following changes since commit 7354fc9213f27aa1b643dbe88070437f1ee4c063: > > insane.bbclass: skip rdepends QA checks for kernel / modules (2011-07-12 15:22:09 +0100) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib nitin/x32 > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/x32 > > Nitin A Kamble (5): > siteinfo.bbclass: hack for x32 > udev-172: add a newer version for newer kernel > runqemu: support qemux32 machine These first three need a little more thought. They're fine to as proof of concept work but we need to find better ways to integrate them. Specifically: The siteinfo change is a hack and can't be merged as is. We need to find a way to change the target_arch or target_os in such a way we can signal to siteinfo to do something different. I also wonder if using i686-linux is actually correct for x32 in all cases since x32 does support 64 bit data types. The udev update needs various other work as people have commented. We need to resolve the udev differences between meta-oe and oe-core. runqemu looks like it can be simplified as it looks like just the kernel name is different? Is x32 using a different machine config at present? Can we use the qemux86-64 machine directly and just add some tweaks to it? That would avoid the need to change the qemu scripting? Cheers, Richard ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/5] commits for yocto.git tree for x32 work 2011-07-13 11:20 ` [PATCH 0/5] commits for yocto.git tree for x32 work Richard Purdie @ 2011-07-13 14:14 ` Tom Rini 2011-07-13 14:38 ` Khem Raj 1 sibling, 0 replies; 18+ messages in thread From: Tom Rini @ 2011-07-13 14:14 UTC (permalink / raw) To: openembedded-core On 07/13/2011 04:20 AM, Richard Purdie wrote: > On Tue, 2011-07-12 at 12:02 -0700, nitin.a.kamble@intel.com wrote: >> From: Nitin A Kamble <nitin.a.kamble@intel.com> >> >> These are commits for yocto tree. I came up with as part of the x32 work. >> I think these commits does not belong in the x32 layer and should go >> in the yocto/oecore tree. >> >> The siteinfo.bbclass commit is a hacky way to get the the right siteinfo for >> x32 now. In the future a better solution will be implemented for that purpose. >> >> The following changes since commit 7354fc9213f27aa1b643dbe88070437f1ee4c063: >> >> insane.bbclass: skip rdepends QA checks for kernel / modules (2011-07-12 15:22:09 +0100) >> >> are available in the git repository at: >> git://git.pokylinux.org/poky-contrib nitin/x32 >> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/x32 >> >> Nitin A Kamble (5): >> siteinfo.bbclass: hack for x32 >> udev-172: add a newer version for newer kernel >> runqemu: support qemux32 machine > > These first three need a little more thought. They're fine to as proof > of concept work but we need to find better ways to integrate them. > > Specifically: > > The siteinfo change is a hack and can't be merged as is. We need to find > a way to change the target_arch or target_os in such a way we can signal > to siteinfo to do something different. I also wonder if using i686-linux > is actually correct for x32 in all cases since x32 does support 64 bit > data types. Hopefully this will be easier with the siteinfo dictionary bits we've got in oe.dev that I'm working on moving to oe-core (world finished overnight so time to diff the config.log's and kick off some of the automated tests). -- Tom Rini Mentor Graphics Corporation ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/5] commits for yocto.git tree for x32 work 2011-07-13 11:20 ` [PATCH 0/5] commits for yocto.git tree for x32 work Richard Purdie 2011-07-13 14:14 ` Tom Rini @ 2011-07-13 14:38 ` Khem Raj 1 sibling, 0 replies; 18+ messages in thread From: Khem Raj @ 2011-07-13 14:38 UTC (permalink / raw) To: openembedded-core On 07/13/2011 04:20 AM, Richard Purdie wrote: > On Tue, 2011-07-12 at 12:02 -0700, nitin.a.kamble@intel.com wrote: >> From: Nitin A Kamble<nitin.a.kamble@intel.com> >> >> These are commits for yocto tree. I came up with as part of the x32 work. >> I think these commits does not belong in the x32 layer and should go >> in the yocto/oecore tree. >> >> The siteinfo.bbclass commit is a hacky way to get the the right siteinfo for >> x32 now. In the future a better solution will be implemented for that purpose. >> >> The following changes since commit 7354fc9213f27aa1b643dbe88070437f1ee4c063: >> >> insane.bbclass: skip rdepends QA checks for kernel / modules (2011-07-12 15:22:09 +0100) >> >> are available in the git repository at: >> git://git.pokylinux.org/poky-contrib nitin/x32 >> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/x32 >> >> Nitin A Kamble (5): >> siteinfo.bbclass: hack for x32 >> udev-172: add a newer version for newer kernel >> runqemu: support qemux32 machine > > These first three need a little more thought. They're fine to as proof > of concept work but we need to find better ways to integrate them. > > Specifically: > > The siteinfo change is a hack and can't be merged as is. We need to find > a way to change the target_arch or target_os in such a way we can signal > to siteinfo to do something different. I also wonder if using i686-linux > is actually correct for x32 in all cases since x32 does support 64 bit > data types. I think it should have its own bits in separate file. > > The udev update needs various other work as people have commented. We > need to resolve the udev differences between meta-oe and oe-core. > > runqemu looks like it can be simplified as it looks like just the kernel > name is different? Is x32 using a different machine config at present? > Can we use the qemux86-64 machine directly and just add some tweaks to > it? That would avoid the need to change the qemu scripting? > > Cheers, > > Richard > > > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2011-07-14 19:53 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble 2011-07-12 19:02 ` [PATCH 1/5] siteinfo.bbclass: hack for x32 nitin.a.kamble 2011-07-13 6:20 ` Khem Raj 2011-07-13 15:41 ` Kamble, Nitin A 2011-07-14 19:49 ` Khem Raj 2011-07-12 19:02 ` [PATCH 2/5] udev-172: add a newer version for newer kernel nitin.a.kamble 2011-07-13 6:22 ` Khem Raj 2011-07-13 6:59 ` Koen Kooi 2011-07-13 15:43 ` Kamble, Nitin A 2011-07-12 19:02 ` [PATCH 3/5] runqemu: support qemux32 machine nitin.a.kamble 2011-07-13 1:35 ` Bruce Ashfield 2011-07-12 19:02 ` [PATCH 4/5] kernel.bbclass: fix the broken lines nitin.a.kamble 2011-07-13 11:16 ` Richard Purdie 2011-07-12 19:02 ` [PATCH 5/5] glibc: fix false failure nitin.a.kamble 2011-07-13 11:16 ` Richard Purdie 2011-07-13 11:20 ` [PATCH 0/5] commits for yocto.git tree for x32 work Richard Purdie 2011-07-13 14:14 ` Tom Rini 2011-07-13 14:38 ` Khem Raj
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.