diff options
Diffstat (limited to 'meta/packages')
26 files changed, 562 insertions, 165 deletions
diff --git a/meta/packages/acpid/acpid.inc b/meta/packages/acpid/acpid.inc index 6e79915527..8ac523d19a 100644 --- a/meta/packages/acpid/acpid.inc +++ b/meta/packages/acpid/acpid.inc | |||
| @@ -11,8 +11,9 @@ INITSCRIPT_NAME = "acpid" | |||
| 11 | INITSCRIPT_PARAMS = "defaults" | 11 | INITSCRIPT_PARAMS = "defaults" |
| 12 | 12 | ||
| 13 | EXTRA_OEMAKE = "" | 13 | EXTRA_OEMAKE = "" |
| 14 | |||
| 14 | do_compile () { | 15 | do_compile () { |
| 15 | oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' | 16 | oe_runmake 'CC=${CC} -D_GNU_SOURCE' 'CROSS=${HOST_PREFIX}' |
| 16 | } | 17 | } |
| 17 | 18 | ||
| 18 | do_install () { | 19 | do_install () { |
diff --git a/meta/packages/acpid/acpid/gcc40.patch b/meta/packages/acpid/acpid/gcc40.patch deleted file mode 100644 index 8e3b31da60..0000000000 --- a/meta/packages/acpid/acpid/gcc40.patch +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341 | ||
| 2 | status: not necessary anymore at least from version 1.0.6 onwards where this patch reverse-applies cleanly | ||
| 3 | |||
| 4 | Index: acpid-1.0.3/ud_socket.c | ||
| 5 | =================================================================== | ||
| 6 | --- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 | ||
| 7 | +++ acpid-1.0.3/ud_socket.c 2005-06-27 14:44:17.785576106 -0700 | ||
| 8 | @@ -58,7 +58,7 @@ | ||
| 9 | while (1) { | ||
| 10 | int newsock = 0; | ||
| 11 | struct sockaddr_un cliaddr; | ||
| 12 | - int len = sizeof(struct sockaddr_un); | ||
| 13 | + socklen_t len = sizeof(struct sockaddr_un); | ||
| 14 | |||
| 15 | newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len); | ||
| 16 | if (newsock < 0) { | ||
diff --git a/meta/packages/acpid/files/init b/meta/packages/acpid/acpid/init index ef08b59596..ef08b59596 100755 --- a/meta/packages/acpid/files/init +++ b/meta/packages/acpid/acpid/init | |||
diff --git a/meta/packages/acpid/acpid_1.0.2.bb b/meta/packages/acpid/acpid_1.0.2.bb deleted file mode 100644 index 2a305eeac4..0000000000 --- a/meta/packages/acpid/acpid_1.0.2.bb +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | require acpid.inc | ||
| 2 | PR = "r2" | ||
| 3 | |||
diff --git a/meta/packages/acpid/acpid_1.0.3.bb b/meta/packages/acpid/acpid_1.0.3.bb deleted file mode 100644 index 640acd5203..0000000000 --- a/meta/packages/acpid/acpid_1.0.3.bb +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | require acpid.inc | ||
| 2 | SRC_URI += "file://gcc40.patch;patch=1" | ||
| 3 | PR = "r2" | ||
| 4 | |||
diff --git a/meta/packages/acpid/acpid_1.0.4.bb b/meta/packages/acpid/acpid_1.0.4.bb deleted file mode 100644 index f48c262254..0000000000 --- a/meta/packages/acpid/acpid_1.0.4.bb +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | require acpid.inc | ||
| 2 | SRC_URI += "file://gcc40.patch;patch=1" | ||
| 3 | PR = "r3" | ||
| 4 | |||
diff --git a/meta/packages/acpid/acpid_1.0.6.bb b/meta/packages/acpid/acpid_1.0.6.bb index e096796fbd..364aa8200b 100644 --- a/meta/packages/acpid/acpid_1.0.6.bb +++ b/meta/packages/acpid/acpid_1.0.6.bb | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | require acpid.inc | 1 | require acpid.inc |
| 2 | 2 | ||
| 3 | PR = "r4" | 3 | PR = "r5" |
diff --git a/meta/packages/dhcp/dhcp_4.1.0.bb b/meta/packages/dhcp/dhcp_4.1.0.bb index 4d68389234..cb6b267f30 100644 --- a/meta/packages/dhcp/dhcp_4.1.0.bb +++ b/meta/packages/dhcp/dhcp_4.1.0.bb | |||
| @@ -2,7 +2,7 @@ SECTION = "console/network" | |||
| 2 | DESCRIPTION = "Internet Software Consortium DHCP package" | 2 | DESCRIPTION = "Internet Software Consortium DHCP package" |
| 3 | HOMEPAGE = "http://www.isc.org/" | 3 | HOMEPAGE = "http://www.isc.org/" |
| 4 | LICENSE = "BSD" | 4 | LICENSE = "BSD" |
| 5 | PR = "r6" | 5 | PR = "r7" |
| 6 | SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ | 6 | SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ |
| 7 | file://fixincludes.patch;patch=1 \ | 7 | file://fixincludes.patch;patch=1 \ |
| 8 | file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ | 8 | file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ |
| @@ -12,6 +12,8 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ | |||
| 12 | 12 | ||
| 13 | inherit autotools | 13 | inherit autotools |
| 14 | 14 | ||
| 15 | TARGET_CFLAGS += "-D_GNU_SOURCE" | ||
| 16 | |||
| 15 | do_compile() { | 17 | do_compile() { |
| 16 | make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ | 18 | make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ |
| 17 | -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \ | 19 | -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \ |
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb index 95ecbf2747..f209240810 100644 --- a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb +++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require e2fsprogs.inc | 1 | require e2fsprogs.inc |
| 2 | 2 | ||
| 3 | PR = "r12" | 3 | PR = "r14" |
| 4 | 4 | ||
| 5 | SRC_URI += "file://no-hardlinks.patch;patch=1" | 5 | SRC_URI += "file://no-hardlinks.patch;patch=1" |
| 6 | 6 | ||
| @@ -41,6 +41,7 @@ do_stage () { | |||
| 41 | install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h" | 41 | install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h" |
| 42 | 42 | ||
| 43 | install -d ${STAGING_LIBDIR}/pkgconfig | 43 | install -d ${STAGING_LIBDIR}/pkgconfig |
| 44 | rm lib/*/blkid.pc | ||
| 44 | for pc in lib/*/*.pc; do | 45 | for pc in lib/*/*.pc; do |
| 45 | install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h" | 46 | install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h" |
| 46 | done | 47 | done |
diff --git a/meta/packages/hal/hal_0.5.13.bb b/meta/packages/hal/hal_0.5.13.bb new file mode 100644 index 0000000000..dde33fabbf --- /dev/null +++ b/meta/packages/hal/hal_0.5.13.bb | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | require hal.inc | ||
| 2 | |||
| 3 | PR = "r3" | ||
| 4 | |||
| 5 | SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.13.tar.gz \ | ||
| 6 | file://99_hal \ | ||
| 7 | file://20hal" | ||
| 8 | |||
| 9 | S = "${WORKDIR}/hal-0.5.13" | ||
| 10 | |||
| 11 | EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" | ||
| 12 | |||
| 13 | PACKAGES =+ "libhal libhal-storage" | ||
| 14 | |||
| 15 | DEPENDS += "util-linux" | ||
| 16 | |||
| 17 | FILES_libhal = "${libdir}/libhal.so.*" | ||
| 18 | FILES_libhal-storage = "${libdir}/libhal-storage.so.*" | ||
| 19 | |||
| 20 | FILES_${PN} =+ "${bindir}/hal-disable-polling \ | ||
| 21 | ${bindir}/hal-setup-keymap" | ||
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch new file mode 100644 index 0000000000..b2ebf40632 --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | Index: linux-2.6.30/include/linux/if_tunnel.h | ||
| 2 | =================================================================== | ||
| 3 | --- linux-2.6.30.orig/include/linux/if_tunnel.h 2009-08-27 14:34:49.000000000 +0100 | ||
| 4 | +++ linux-2.6.30/include/linux/if_tunnel.h 2009-08-27 14:35:04.000000000 +0100 | ||
| 5 | @@ -2,6 +2,7 @@ | ||
| 6 | #define _IF_TUNNEL_H_ | ||
| 7 | |||
| 8 | #include <linux/types.h> | ||
| 9 | +#include <asm/byteorder.h> | ||
| 10 | |||
| 11 | #ifdef __KERNEL__ | ||
| 12 | #include <linux/ip.h> | ||
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb index d9f3fab80d..9d1412d61a 100644 --- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb +++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb | |||
| @@ -2,9 +2,10 @@ require linux-libc-headers.inc | |||
| 2 | 2 | ||
| 3 | INHIBIT_DEFAULT_DEPS = "1" | 3 | INHIBIT_DEFAULT_DEPS = "1" |
| 4 | DEPENDS += "unifdef-native" | 4 | DEPENDS += "unifdef-native" |
| 5 | PR = "r2" | 5 | PR = "r3" |
| 6 | 6 | ||
| 7 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " | 7 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ |
| 8 | file://headerfix.patch;patch=1" | ||
| 8 | 9 | ||
| 9 | S = "${WORKDIR}/linux-${PV}" | 10 | S = "${WORKDIR}/linux-${PV}" |
| 10 | 11 | ||
diff --git a/meta/packages/mesa/mesa-dri/cross2.patch b/meta/packages/mesa/mesa-dri/cross2.patch index 3c62a469ed..d2147910ae 100644 --- a/meta/packages/mesa/mesa-dri/cross2.patch +++ b/meta/packages/mesa/mesa-dri/cross2.patch | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | Index: git/configure.ac | 1 | Index: git/configure.ac |
| 2 | =================================================================== | 2 | =================================================================== |
| 3 | --- git.orig/configure.ac 2009-08-14 16:16:23.000000000 +0100 | 3 | --- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100 |
| 4 | +++ git/configure.ac 2009-08-14 16:17:27.000000000 +0100 | 4 | +++ git/configure.ac 2009-09-01 16:38:47.000000000 +0100 |
| 5 | @@ -268,15 +268,6 @@ | 5 | @@ -269,15 +269,6 @@ |
| 6 | GLAPI_ASM_SOURCES="" | 6 | GLAPI_ASM_SOURCES="" |
| 7 | AC_MSG_CHECKING([whether to enable assembly]) | 7 | AC_MSG_CHECKING([whether to enable assembly]) |
| 8 | test "x$enable_asm" = xno && AC_MSG_RESULT([no]) | 8 | test "x$enable_asm" = xno && AC_MSG_RESULT([no]) |
| @@ -20,8 +20,8 @@ Index: git/configure.ac | |||
| 20 | case "$host_cpu" in | 20 | case "$host_cpu" in |
| 21 | Index: git/src/mesa/x86/Makefile | 21 | Index: git/src/mesa/x86/Makefile |
| 22 | =================================================================== | 22 | =================================================================== |
| 23 | --- git.orig/src/mesa/x86/Makefile 2009-08-14 16:18:23.000000000 +0100 | 23 | --- git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.000000000 +0100 |
| 24 | +++ git/src/mesa/x86/Makefile 2009-08-14 16:19:10.000000000 +0100 | 24 | +++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.000000000 +0100 |
| 25 | @@ -14,19 +14,6 @@ | 25 | @@ -14,19 +14,6 @@ |
| 26 | -I../tnl | 26 | -I../tnl |
| 27 | 27 | ||
| @@ -33,7 +33,7 @@ Index: git/src/mesa/x86/Makefile | |||
| 33 | - | 33 | - |
| 34 | - | 34 | - |
| 35 | -gen_matypes: gen_matypes.c | 35 | -gen_matypes: gen_matypes.c |
| 36 | - $(HOST_CC) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes | 36 | - $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes |
| 37 | - | 37 | - |
| 38 | -# need some special rules here, unfortunately | 38 | -# need some special rules here, unfortunately |
| 39 | -matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes | 39 | -matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes |
diff --git a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch index bafc2f6a1c..e4a548156f 100644 --- a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch +++ b/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch | |||
| @@ -1,7 +1,14 @@ | |||
| 1 | If we're building an image and some package rebuilds while this is happening | ||
| 2 | some package can be removed/added to the ipk deploy directory. The image will | ||
| 3 | not depend on this package so we can safely ignore these cases rather than | ||
| 4 | error out. | ||
| 5 | |||
| 6 | RP - 26/8/09 | ||
| 7 | |||
| 1 | Index: opkg-utils/opkg-make-index | 8 | Index: opkg-utils/opkg-make-index |
| 2 | =================================================================== | 9 | =================================================================== |
| 3 | --- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 | 10 | --- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 |
| 4 | +++ opkg-utils/opkg-make-index 2009-08-26 20:49:52.000000000 +0100 | 11 | +++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100 |
| 5 | @@ -96,6 +96,7 @@ | 12 | @@ -96,6 +96,7 @@ |
| 6 | files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') | 13 | files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') |
| 7 | files.sort() | 14 | files.sort() |
| @@ -10,17 +17,20 @@ Index: opkg-utils/opkg-make-index | |||
| 10 | basename = os.path.basename(filename) | 17 | basename = os.path.basename(filename) |
| 11 | pkg = None | 18 | pkg = None |
| 12 | fnameStat = os.stat(filename) | 19 | fnameStat = os.stat(filename) |
| 13 | @@ -130,6 +131,9 @@ | 20 | @@ -130,6 +131,12 @@ |
| 14 | to_morgue(basename) | 21 | to_morgue(basename) |
| 15 | if opt_s: | 22 | if opt_s: |
| 16 | print filename | 23 | print filename |
| 17 | + except OSError: | 24 | + except OSError: |
| 18 | + sys.stderr.write("Package %s disappeared on us!\n" % (filename)) | 25 | + sys.stderr.write("Package %s disappeared on us!\n" % (filename)) |
| 19 | + continue | 26 | + continue |
| 27 | + except IOError: | ||
| 28 | + sys.stderr.write("Package %s disappeared on us!\n" % (filename)) | ||
| 29 | + continue | ||
| 20 | 30 | ||
| 21 | pkgsStampsFile = open(stamplist_filename, "w") | 31 | pkgsStampsFile = open(stamplist_filename, "w") |
| 22 | for f in pkgsStamps.keys(): | 32 | for f in pkgsStamps.keys(): |
| 23 | @@ -148,6 +152,7 @@ | 33 | @@ -148,6 +155,7 @@ |
| 24 | names = packages.packages.keys() | 34 | names = packages.packages.keys() |
| 25 | names.sort() | 35 | names.sort() |
| 26 | for name in names: | 36 | for name in names: |
| @@ -28,13 +38,17 @@ Index: opkg-utils/opkg-make-index | |||
| 28 | pkg = packages.packages[name] | 38 | pkg = packages.packages[name] |
| 29 | if locales_dir and pkg.depends: | 39 | if locales_dir and pkg.depends: |
| 30 | depends = string.split(pkg.depends, ',') | 40 | depends = string.split(pkg.depends, ',') |
| 31 | @@ -165,6 +170,9 @@ | 41 | @@ -165,6 +173,13 @@ |
| 32 | if (verbose): | 42 | if (verbose): |
| 33 | sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) | 43 | sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) |
| 34 | print pkg | 44 | print pkg |
| 35 | + except OSError: | 45 | + except OSError: |
| 36 | + sys.stderr.write("Package %s disappeared on us!\n" % (name)) | 46 | + sys.stderr.write("Package %s disappeared on us!\n" % (name)) |
| 37 | + continue | 47 | + continue |
| 48 | + except IOError: | ||
| 49 | + sys.stderr.write("Package %s disappeared on us!\n" % (name)) | ||
| 50 | + continue | ||
| 51 | + | ||
| 38 | if packages_filename: | 52 | if packages_filename: |
| 39 | sys.stdout.close() | 53 | sys.stdout.close() |
| 40 | sys.stdout = old_stdout | 54 | sys.stdout = old_stdout |
diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/packages/opkg-utils/opkg-utils_svn.bb index a141505710..b06ea6a68e 100644 --- a/meta/packages/opkg-utils/opkg-utils_svn.bb +++ b/meta/packages/opkg-utils/opkg-utils_svn.bb | |||
| @@ -4,7 +4,7 @@ PRIORITY = "optional" | |||
| 4 | LICENSE = "GPL" | 4 | LICENSE = "GPL" |
| 5 | RDEPENDS = "python" | 5 | RDEPENDS = "python" |
| 6 | RDEPENDS_virtclass-native = "" | 6 | RDEPENDS_virtclass-native = "" |
| 7 | PR = "r5" | 7 | PR = "r6" |
| 8 | 8 | ||
| 9 | SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ | 9 | SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ |
| 10 | file://index-ignore-filenotfound.patch;patch=1" | 10 | file://index-ignore-filenotfound.patch;patch=1" |
diff --git a/meta/packages/udev/udev-141/1 b/meta/packages/udev/udev-141/1 deleted file mode 100644 index 87c8977347..0000000000 --- a/meta/packages/udev/udev-141/1 +++ /dev/null | |||
| @@ -1,119 +0,0 @@ | |||
| 1 | # do not edit this file, it will be overwritten on update | ||
| 2 | |||
| 3 | SUBSYSTEM=="block", SYMLINK+="block/%M:%m" | ||
| 4 | SUBSYSTEM!="block", SYMLINK+="char/%M:%m" | ||
| 5 | |||
| 6 | KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660" | ||
| 7 | KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660" | ||
| 8 | KERNEL=="ptmx", GROUP="tty", MODE="0666" | ||
| 9 | KERNEL=="tty", GROUP="tty", MODE="0666" | ||
| 10 | KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" | ||
| 11 | KERNEL=="console", MODE="0600" | ||
| 12 | KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty" | ||
| 13 | |||
| 14 | # serial | ||
| 15 | KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" | ||
| 16 | KERNEL=="ppp", MODE="0600" | ||
| 17 | KERNEL=="mwave", NAME="modems/mwave", GROUP="dialout" | ||
| 18 | KERNEL=="hvc*|hvsi*", GROUP="dialout" | ||
| 19 | |||
| 20 | # mem | ||
| 21 | KERNEL=="null|zero|full|random|urandom", MODE="0666" | ||
| 22 | KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640" | ||
| 23 | |||
| 24 | # input | ||
| 25 | KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0640" | ||
| 26 | KERNEL=="ts[0-9]*|uinput", NAME="input/%k", MODE="0640" | ||
| 27 | KERNEL=="js[0-9]*", NAME="input/%k", MODE="0644" | ||
| 28 | |||
| 29 | # video4linux | ||
| 30 | SUBSYSTEM=="video4linux", GROUP="video" | ||
| 31 | KERNEL=="vttuner*", GROUP="video" | ||
| 32 | KERNEL=="vtx*|vbi*", GROUP="video" | ||
| 33 | KERNEL=="winradio*", GROUP="video" | ||
| 34 | |||
| 35 | # graphics | ||
| 36 | KERNEL=="agpgart", MODE="0600", GROUP="video" | ||
| 37 | KERNEL=="card[0-9]*", NAME="dri/%k" | ||
| 38 | KERNEL=="pmu", GROUP="video" | ||
| 39 | KERNEL=="nvidia*|nvidiactl*", GROUP="video" | ||
| 40 | SUBSYSTEM=="graphics", GROUP="video" | ||
| 41 | SUBSYSTEM=="drm", GROUP="video" | ||
| 42 | |||
| 43 | # DVB (video) | ||
| 44 | SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video" | ||
| 45 | |||
| 46 | # Firewire | ||
| 47 | KERNEL=="dv1394-[0-9]*", NAME="dv1394/%n", GROUP="video" | ||
| 48 | KERNEL=="video1394-[0-9]*", NAME="video1394/%n", GROUP="video" | ||
| 49 | |||
| 50 | # libusb device nodes | ||
| 51 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664" | ||
| 52 | |||
| 53 | # printer | ||
| 54 | KERNEL=="parport[0-9]*", GROUP="lp" | ||
| 55 | SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp" | ||
| 56 | SUBSYSTEM=="ppdev", GROUP="lp" | ||
| 57 | SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp" | ||
| 58 | KERNEL=="lp[0-9]*", GROUP="lp" | ||
| 59 | KERNEL=="irlpt[0-9]*", GROUP="lp" | ||
| 60 | |||
| 61 | # block | ||
| 62 | SUBSYSTEM=="block", GROUP="disk" | ||
| 63 | |||
| 64 | # floppy | ||
| 65 | KERNEL=="fd[0-9]", GROUP="floppy" | ||
| 66 | KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k" | ||
| 67 | KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions" | ||
| 68 | |||
| 69 | # cdrom | ||
| 70 | SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" | ||
| 71 | SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" | ||
| 72 | SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" | ||
| 73 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom" | ||
| 74 | KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom" | ||
| 75 | |||
| 76 | # tape | ||
| 77 | KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape" | ||
| 78 | KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape" | ||
| 79 | SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" | ||
| 80 | |||
| 81 | # block-releated | ||
| 82 | KERNEL=="sch[0-9]*", GROUP="disk" | ||
| 83 | SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" | ||
| 84 | KERNEL=="pg[0-9]*", GROUP="disk" | ||
| 85 | KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" | ||
| 86 | KERNEL=="rawctl", NAME="raw/rawctl", GROUP="disk" | ||
| 87 | SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk" | ||
| 88 | SUBSYSTEM=="bsg", NAME="bsg/%k" | ||
| 89 | SUBSYSTEM=="aoe", NAME="etherd/%k", GROUP="disk", MODE="0220" | ||
| 90 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | ||
| 91 | |||
| 92 | # network | ||
| 93 | KERNEL=="tun", NAME="net/%k", MODE="0666" | ||
| 94 | |||
| 95 | # CPU | ||
| 96 | KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid", MODE="0444" | ||
| 97 | KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" | ||
| 98 | KERNEL=="microcode", NAME="cpu/microcode", MODE="0600" | ||
| 99 | |||
| 100 | # miscellaneous | ||
| 101 | KERNEL=="fuse", MODE="0666" | ||
| 102 | SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc" | ||
| 103 | KERNEL=="auer[0-9]*", NAME="usb/%k" | ||
| 104 | KERNEL=="hw_random", NAME="hwrng" | ||
| 105 | KERNEL=="mmtimer", MODE="0644" | ||
| 106 | KERNEL=="rflash[0-9]*", MODE="0400" | ||
| 107 | KERNEL=="rrom[0-9]*", MODE="0400" | ||
| 108 | KERNEL=="sxctl", NAME="specialix_sxctl" | ||
| 109 | KERNEL=="rioctl", NAME="specialix_rioctl" | ||
| 110 | KERNEL=="iowarrior[0-9]*", NAME="usb/%k" | ||
| 111 | KERNEL=="hiddev[0-9]*", NAME="usb/%k" | ||
| 112 | KERNEL=="legousbtower[0-9]*", NAME="usb/%k" | ||
| 113 | KERNEL=="dabusb[0-9]*", NAME="usb/%k" | ||
| 114 | KERNEL=="usbdpfp[0-9]*", NAME="usb/%k" | ||
| 115 | KERNEL=="cpad[0-9]*", NAME="usb/%k" | ||
| 116 | |||
| 117 | # do not delete static device nodes | ||
| 118 | ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove" | ||
| 119 | ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove" | ||
diff --git a/meta/packages/udev/udev-145/init b/meta/packages/udev/udev-145/init new file mode 100644 index 0000000000..f38a0aa36e --- /dev/null +++ b/meta/packages/udev/udev-145/init | |||
| @@ -0,0 +1,60 @@ | |||
| 1 | #!/bin/sh -e | ||
| 2 | |||
| 3 | ### BEGIN INIT INFO | ||
| 4 | # Provides: udev | ||
| 5 | # Required-Start: mountvirtfs | ||
| 6 | # Required-Stop: | ||
| 7 | # Default-Start: S | ||
| 8 | # Default-Stop: | ||
| 9 | # Short-Description: Start udevd, populate /dev and load drivers. | ||
| 10 | ### END INIT INFO | ||
| 11 | |||
| 12 | export TZ=/etc/localtime | ||
| 13 | |||
| 14 | [ -d /sys/class ] || exit 1 | ||
| 15 | [ -r /proc/mounts ] || exit 1 | ||
| 16 | [ -x /sbin/udevd ] || exit 1 | ||
| 17 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf | ||
| 18 | |||
| 19 | kill_udevd() { | ||
| 20 | if [ -x /sbin/pidof ]; then | ||
| 21 | pid=`/sbin/pidof -x udevd` | ||
| 22 | [ -n "$pid" ] && kill $pid | ||
| 23 | fi | ||
| 24 | } | ||
| 25 | |||
| 26 | export ACTION=add | ||
| 27 | # propagate /dev from /sys | ||
| 28 | echo -n "Starting udev" | ||
| 29 | |||
| 30 | # mount the tmpfs on /dev, if not already done | ||
| 31 | LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { | ||
| 32 | mount -n -o mode=0755 -t tmpfs none "/dev" | ||
| 33 | mkdir -m 0755 /dev/pts | ||
| 34 | mkdir -m 1777 /dev/shm | ||
| 35 | } | ||
| 36 | |||
| 37 | if [ -e /etc/dev.tar ]; then | ||
| 38 | (cd /; tar xf /etc/dev.tar) | ||
| 39 | not_first_boot=1 | ||
| 40 | fi | ||
| 41 | |||
| 42 | # make_extra_nodes | ||
| 43 | kill_udevd > "/dev/null" 2>&1 | ||
| 44 | |||
| 45 | # trigger the sorted events | ||
| 46 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | ||
| 47 | /sbin/udevd -d | ||
| 48 | |||
| 49 | /sbin/udevadm control --env=STARTUP=1 | ||
| 50 | if [ "$not_first_boot" != "" ];then | ||
| 51 | /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 | ||
| 52 | (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)& | ||
| 53 | else | ||
| 54 | /sbin/udevadm trigger | ||
| 55 | /sbin/udevadm settle | ||
| 56 | (cd /; tar cf /etc/dev.tar /dev) | ||
| 57 | fi | ||
| 58 | |||
| 59 | echo | ||
| 60 | exit 0 | ||
diff --git a/meta/packages/udev/udev-145/local.rules b/meta/packages/udev/udev-145/local.rules new file mode 100644 index 0000000000..5b926018f5 --- /dev/null +++ b/meta/packages/udev/udev-145/local.rules | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | # There are a number of modifiers that are allowed to be used in some | ||
| 2 | # of the different fields. They provide the following subsitutions: | ||
| 3 | # | ||
| 4 | # %n the "kernel number" of the device. | ||
| 5 | # For example, 'sda3' has a "kernel number" of '3' | ||
| 6 | # %e the smallest number for that name which does not matches an existing node | ||
| 7 | # %k the kernel name for the device | ||
| 8 | # %M the kernel major number for the device | ||
| 9 | # %m the kernel minor number for the device | ||
| 10 | # %b the bus id for the device | ||
| 11 | # %c the string returned by the PROGRAM | ||
| 12 | # %s{filename} the content of a sysfs attribute | ||
| 13 | # %% the '%' char itself | ||
| 14 | # | ||
| 15 | |||
| 16 | # Media automounting | ||
| 17 | SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" | ||
| 18 | SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" | ||
| 19 | |||
| 20 | # Handle network interface setup | ||
| 21 | SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" | ||
| 22 | SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" | ||
| 23 | |||
| 24 | # The first rtc device is symlinked to /dev/rtc | ||
| 25 | KERNEL=="rtc0", SYMLINK+="rtc" | ||
| 26 | |||
| 27 | # Try and modprobe for drivers for new hardware | ||
| 28 | ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" | ||
| 29 | |||
| 30 | # Create a symlink to any touchscreen input device | ||
| 31 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
diff --git a/meta/packages/udev/udev-145/noasmlinkage.patch b/meta/packages/udev/udev-145/noasmlinkage.patch new file mode 100644 index 0000000000..6f9fe948f2 --- /dev/null +++ b/meta/packages/udev/udev-145/noasmlinkage.patch | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | Index: udev-141/udev/test-udev.c | ||
| 2 | =================================================================== | ||
| 3 | --- udev-141.orig/udev/test-udev.c 2008-10-24 09:07:24.000000000 +0100 | ||
| 4 | +++ udev-141/udev/test-udev.c 2009-04-14 15:34:01.000000000 +0100 | ||
| 5 | @@ -30,7 +30,7 @@ | ||
| 6 | |||
| 7 | #include "udev.h" | ||
| 8 | |||
| 9 | -static void asmlinkage sig_handler(int signum) | ||
| 10 | +static void sig_handler(int signum) | ||
| 11 | { | ||
| 12 | switch (signum) { | ||
| 13 | case SIGALRM: | ||
| 14 | Index: udev-141/udev/udevadm-monitor.c | ||
| 15 | =================================================================== | ||
| 16 | --- udev-141.orig/udev/udevadm-monitor.c 2009-03-29 19:07:01.000000000 +0100 | ||
| 17 | +++ udev-141/udev/udevadm-monitor.c 2009-04-14 15:34:01.000000000 +0100 | ||
| 18 | @@ -35,7 +35,7 @@ | ||
| 19 | |||
| 20 | static int udev_exit; | ||
| 21 | |||
| 22 | -static void asmlinkage sig_handler(int signum) | ||
| 23 | +static void sig_handler(int signum) | ||
| 24 | { | ||
| 25 | if (signum == SIGINT || signum == SIGTERM) | ||
| 26 | udev_exit = 1; | ||
| 27 | Index: udev-141/udev/udevd.c | ||
| 28 | =================================================================== | ||
| 29 | --- udev-141.orig/udev/udevd.c 2009-03-29 19:07:01.000000000 +0100 | ||
| 30 | +++ udev-141/udev/udevd.c 2009-04-14 15:34:56.000000000 +0100 | ||
| 31 | @@ -172,7 +172,7 @@ | ||
| 32 | udev_event_unref(event); | ||
| 33 | } | ||
| 34 | |||
| 35 | -static void asmlinkage event_sig_handler(int signum) | ||
| 36 | +static void event_sig_handler(int signum) | ||
| 37 | { | ||
| 38 | if (signum == SIGALRM) | ||
| 39 | exit(1); | ||
| 40 | @@ -583,7 +583,7 @@ | ||
| 41 | return 0; | ||
| 42 | } | ||
| 43 | |||
| 44 | -static void asmlinkage sig_handler(int signum) | ||
| 45 | +static void sig_handler(int signum) | ||
| 46 | { | ||
| 47 | switch (signum) { | ||
| 48 | case SIGINT: | ||
diff --git a/meta/packages/udev/udev-145/permissions.rules b/meta/packages/udev/udev-145/permissions.rules new file mode 100644 index 0000000000..205b733292 --- /dev/null +++ b/meta/packages/udev/udev-145/permissions.rules | |||
| @@ -0,0 +1,131 @@ | |||
| 1 | ACTION!="add", GOTO="permissions_end" | ||
| 2 | |||
| 3 | # workarounds needed to synchronize with sysfs | ||
| 4 | # only needed for kernels < v2.6.18-rc1 | ||
| 5 | ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" | ||
| 6 | SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", WAIT_FOR_SYSFS="ioerr_cnt" | ||
| 7 | # only needed for kernels < 2.6.16 | ||
| 8 | SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" | ||
| 9 | # only needed for kernels < 2.6.17 | ||
| 10 | SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" | ||
| 11 | |||
| 12 | # devices needed to load the drivers providing them | ||
| 13 | KERNEL=="tun", OPTIONS+="ignore_remove" | ||
| 14 | KERNEL=="ppp", OPTIONS+="ignore_remove" | ||
| 15 | KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" | ||
| 16 | |||
| 17 | # default permissions for block devices | ||
| 18 | SUBSYSTEM=="block", GROUP="disk" | ||
| 19 | # the aacraid driver is broken and reports that disks removable (see #404927) | ||
| 20 | SUBSYSTEM=="block", ATTRS{removable}=="1", \ | ||
| 21 | DRIVERS!="aacraid", GROUP="floppy" | ||
| 22 | # all block devices on these buses are "removable" | ||
| 23 | SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy" | ||
| 24 | |||
| 25 | # IDE devices | ||
| 26 | KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ | ||
| 27 | IMPORT{program}="cdrom_id --export $tempnode" | ||
| 28 | ENV{ID_CDROM}=="?*", GROUP="cdrom" | ||
| 29 | KERNEL=="ht[0-9]*", GROUP="tape" | ||
| 30 | KERNEL=="nht[0-9]*", GROUP="tape" | ||
| 31 | |||
| 32 | # SCSI devices | ||
| 33 | KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" | ||
| 34 | SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" | ||
| 35 | SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP", GROUP="scanner" | ||
| 36 | SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson", GROUP="scanner" | ||
| 37 | SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", GROUP="scanner" | ||
| 38 | SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" | ||
| 39 | SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" | ||
| 40 | SUBSYSTEMS=="scsi", ATTRS{type}=="6", GROUP="scanner" | ||
| 41 | SUBSYSTEMS=="scsi", ATTRS{type}=="8", GROUP="tape" | ||
| 42 | |||
| 43 | # USB devices | ||
| 44 | KERNEL=="legousbtower*", MODE="0666" | ||
| 45 | KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb", GROUP="lp" | ||
| 46 | |||
| 47 | # usbfs-like devices | ||
| 48 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \ | ||
| 49 | MODE="0664" | ||
| 50 | |||
| 51 | # iRiver music players | ||
| 52 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="plugdev", \ | ||
| 53 | ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]" | ||
| 54 | |||
| 55 | # serial devices | ||
| 56 | SUBSYSTEM=="tty", GROUP="dialout" | ||
| 57 | SUBSYSTEM=="capi", GROUP="dialout" | ||
| 58 | SUBSYSTEM=="slamr", GROUP="dialout" | ||
| 59 | SUBSYSTEM=="zaptel", GROUP="dialout" | ||
| 60 | |||
| 61 | # vc devices (all members of the tty subsystem) | ||
| 62 | KERNEL=="ptmx", MODE="0666", GROUP="root" | ||
| 63 | KERNEL=="console", MODE="0600", GROUP="root" | ||
| 64 | KERNEL=="tty", MODE="0666", GROUP="root" | ||
| 65 | KERNEL=="tty[0-9]*", GROUP="root" | ||
| 66 | KERNEL=="pty*", MODE="0666", GROUP="tty" | ||
| 67 | |||
| 68 | # video devices | ||
| 69 | SUBSYSTEM=="video4linux", GROUP="video" | ||
| 70 | SUBSYSTEM=="drm", GROUP="video" | ||
| 71 | SUBSYSTEM=="dvb", GROUP="video" | ||
| 72 | SUBSYSTEM=="em8300", GROUP="video" | ||
| 73 | SUBSYSTEM=="graphics", GROUP="video" | ||
| 74 | SUBSYSTEM=="nvidia", GROUP="video" | ||
| 75 | |||
| 76 | # misc devices | ||
| 77 | KERNEL=="random", MODE="0666" | ||
| 78 | KERNEL=="urandom", MODE="0666" | ||
| 79 | KERNEL=="mem", MODE="0640", GROUP="kmem" | ||
| 80 | KERNEL=="kmem", MODE="0640", GROUP="kmem" | ||
| 81 | KERNEL=="port", MODE="0640", GROUP="kmem" | ||
| 82 | KERNEL=="full", MODE="0666" | ||
| 83 | KERNEL=="null", MODE="0666" | ||
| 84 | KERNEL=="zero", MODE="0666" | ||
| 85 | KERNEL=="inotify", MODE="0666" | ||
| 86 | KERNEL=="sgi_fetchop", MODE="0666" | ||
| 87 | KERNEL=="sonypi", MODE="0666" | ||
| 88 | KERNEL=="agpgart", GROUP="video" | ||
| 89 | KERNEL=="nvram", GROUP="nvram" | ||
| 90 | KERNEL=="rtc|rtc[0-9]*", GROUP="audio" | ||
| 91 | KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" | ||
| 92 | KERNEL=="fuse", GROUP="fuse" | ||
| 93 | KERNEL=="kqemu", MODE="0666" | ||
| 94 | KERNEL=="kvm", GROUP="kvm" | ||
| 95 | KERNEL=="tun", MODE="0666", | ||
| 96 | |||
| 97 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" | ||
| 98 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | ||
| 99 | KERNEL=="pktcdvd", MODE="0644" | ||
| 100 | |||
| 101 | KERNEL=="uverbs*", GROUP="rdma" | ||
| 102 | KERNEL=="ucm*", GROUP="rdma" | ||
| 103 | KERNEL=="rdma_ucm", GROUP="rdma" | ||
| 104 | |||
| 105 | # printers and parallel devices | ||
| 106 | SUBSYSTEM=="printer", GROUP="lp" | ||
| 107 | SUBSYSTEM=="ppdev", GROUP="lp" | ||
| 108 | KERNEL=="irlpt*", GROUP="lp" | ||
| 109 | KERNEL=="pt[0-9]*", GROUP="tape" | ||
| 110 | KERNEL=="pht[0-9]*", GROUP="tape" | ||
| 111 | |||
| 112 | # sound devices | ||
| 113 | SUBSYSTEM=="sound", GROUP="audio" | ||
| 114 | |||
| 115 | # ieee1394 devices | ||
| 116 | KERNEL=="raw1394", GROUP="disk" | ||
| 117 | KERNEL=="dv1394*", GROUP="video" | ||
| 118 | KERNEL=="video1394*", GROUP="video" | ||
| 119 | |||
| 120 | # input devices | ||
| 121 | KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \ | ||
| 122 | MODE="0664", GROUP="video" | ||
| 123 | KERNEL=="js[0-9]*", MODE="0664" | ||
| 124 | KERNEL=="lirc[0-9]*", GROUP="video" | ||
| 125 | |||
| 126 | # AOE character devices | ||
| 127 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" | ||
| 128 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | ||
| 129 | |||
| 130 | LABEL="permissions_end" | ||
| 131 | |||
diff --git a/meta/packages/udev/udev-145/run.rules b/meta/packages/udev/udev-145/run.rules new file mode 100644 index 0000000000..75d71375bb --- /dev/null +++ b/meta/packages/udev/udev-145/run.rules | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | # debugging monitor | ||
| 2 | RUN+="socket:/org/kernel/udev/monitor" | ||
| 3 | |||
| 4 | # run a command on remove events | ||
| 5 | ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" | ||
| 6 | |||
| 7 | # ignore the events generated by virtual consoles | ||
| 8 | KERNEL=="ptmx", OPTIONS+="last_rule" | ||
| 9 | KERNEL=="console", OPTIONS+="last_rule" | ||
| 10 | KERNEL=="tty" , OPTIONS+="last_rule" | ||
| 11 | KERNEL=="tty[0-9]*", OPTIONS+="last_rule" | ||
| 12 | KERNEL=="pty*", OPTIONS+="last_rule" | ||
| 13 | SUBSYSTEM=="vc", OPTIONS+="last_rule" | ||
| 14 | |||
diff --git a/meta/packages/udev/udev-145/udev.rules b/meta/packages/udev/udev-145/udev.rules new file mode 100644 index 0000000000..a19d4a0bf6 --- /dev/null +++ b/meta/packages/udev/udev-145/udev.rules | |||
| @@ -0,0 +1,116 @@ | |||
| 1 | # There are a number of modifiers that are allowed to be used in some | ||
| 2 | # of the different fields. They provide the following subsitutions: | ||
| 3 | # | ||
| 4 | # %n the "kernel number" of the device. | ||
| 5 | # For example, 'sda3' has a "kernel number" of '3' | ||
| 6 | # %e the smallest number for that name which does not matches an existing node | ||
| 7 | # %k the kernel name for the device | ||
| 8 | # %M the kernel major number for the device | ||
| 9 | # %m the kernel minor number for the device | ||
| 10 | # %b the bus id for the device | ||
| 11 | # %c the string returned by the PROGRAM | ||
| 12 | # %s{filename} the content of a sysfs attribute | ||
| 13 | # %% the '%' char itself | ||
| 14 | # | ||
| 15 | |||
| 16 | # workaround for devices which do not report media changes | ||
| 17 | SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ | ||
| 18 | ENV{ID_MODEL}=="IOMEGA_ZIP*", NAME="%k", OPTIONS+="all_partitions" | ||
| 19 | SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ | ||
| 20 | OPTIONS+="all_partitions" | ||
| 21 | |||
| 22 | # SCSI devices | ||
| 23 | SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" | ||
| 24 | |||
| 25 | # USB devices | ||
| 26 | SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" | ||
| 27 | SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" | ||
| 28 | SUBSYSTEMS=="usb", KERNEL=="dabusb*", NAME="usb/%k" | ||
| 29 | SUBSYSTEMS=="usb", KERNEL=="hiddev*", NAME="usb/%k" | ||
| 30 | SUBSYSTEMS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" | ||
| 31 | SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" | ||
| 32 | SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \ | ||
| 33 | ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \ | ||
| 34 | SYMLINK+="pilot" | ||
| 35 | |||
| 36 | # usbfs-like devices | ||
| 37 | SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \ | ||
| 38 | NAME="%c" | ||
| 39 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}" | ||
| 40 | |||
| 41 | # serial devices | ||
| 42 | KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" | ||
| 43 | KERNEL=="capi[0-9]*", NAME="capi/%n" | ||
| 44 | |||
| 45 | # video devices | ||
| 46 | KERNEL=="dvb*", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \ | ||
| 47 | NAME="%c" | ||
| 48 | KERNEL=="card[0-9]*", NAME="dri/%k" | ||
| 49 | |||
| 50 | # misc devices | ||
| 51 | KERNEL=="hw_random", NAME="hwrng" | ||
| 52 | KERNEL=="tun", NAME="net/%k" | ||
| 53 | KERNEL=="evtchn", NAME="xen/%k" | ||
| 54 | |||
| 55 | KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" | ||
| 56 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" | ||
| 57 | KERNEL=="pktcdvd", NAME="pktcdvd/control" | ||
| 58 | |||
| 59 | KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" | ||
| 60 | KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" | ||
| 61 | KERNEL=="microcode", NAME="cpu/microcode" | ||
| 62 | |||
| 63 | KERNEL=="umad*", NAME="infiniband/%k" | ||
| 64 | KERNEL=="issm*", NAME="infiniband/%k" | ||
| 65 | KERNEL=="uverbs*", NAME="infiniband/%k" | ||
| 66 | KERNEL=="ucm*", NAME="infiniband/%k" | ||
| 67 | KERNEL=="rdma_ucm", NAME="infiniband/%k" | ||
| 68 | |||
| 69 | # ALSA devices | ||
| 70 | KERNEL=="controlC[0-9]*", NAME="snd/%k" | ||
| 71 | KERNEL=="hwC[D0-9]*", NAME="snd/%k" | ||
| 72 | KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" | ||
| 73 | KERNEL=="midiC[D0-9]*", NAME="snd/%k" | ||
| 74 | KERNEL=="timer", NAME="snd/%k" | ||
| 75 | KERNEL=="seq", NAME="snd/%k" | ||
| 76 | |||
| 77 | # ieee1394 devices | ||
| 78 | KERNEL=="dv1394*", NAME="dv1394/%n" | ||
| 79 | KERNEL=="video1394*", NAME="video1394/%n" | ||
| 80 | |||
| 81 | # input devices | ||
| 82 | KERNEL=="mice", NAME="input/%k" | ||
| 83 | KERNEL=="mouse[0-9]*", NAME="input/%k" | ||
| 84 | KERNEL=="event[0-9]*", NAME="input/%k" | ||
| 85 | KERNEL=="js[0-9]*", NAME="input/%k" | ||
| 86 | KERNEL=="ts[0-9]*", NAME="input/%k" | ||
| 87 | KERNEL=="uinput", NAME="input/%k" | ||
| 88 | |||
| 89 | # Zaptel | ||
| 90 | KERNEL=="zapctl", NAME="zap/ctl" | ||
| 91 | KERNEL=="zaptimer", NAME="zap/timer" | ||
| 92 | KERNEL=="zapchannel", NAME="zap/channel" | ||
| 93 | KERNEL=="zappseudo", NAME="zap/pseudo" | ||
| 94 | KERNEL=="zap[0-9]*", NAME="zap/%n" | ||
| 95 | |||
| 96 | # AOE character devices | ||
| 97 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" | ||
| 98 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" | ||
| 99 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" | ||
| 100 | SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k" | ||
| 101 | |||
| 102 | # device mapper creates its own device nodes, so ignore these | ||
| 103 | KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" | ||
| 104 | KERNEL=="device-mapper", NAME="mapper/control" | ||
| 105 | |||
| 106 | KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" | ||
| 107 | |||
| 108 | # Firmware Helper | ||
| 109 | ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh" | ||
| 110 | |||
| 111 | # Samsung UARTS | ||
| 112 | KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" | ||
| 113 | |||
| 114 | # MXC UARTs | ||
| 115 | KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" | ||
| 116 | |||
diff --git a/meta/packages/udev/udev-145/unbreak.patch b/meta/packages/udev/udev-145/unbreak.patch new file mode 100644 index 0000000000..bb5988dca4 --- /dev/null +++ b/meta/packages/udev/udev-145/unbreak.patch | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | Index: udev-141/extras/volume_id/lib/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- udev-141.orig/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:16.000000000 +0100 | ||
| 4 | +++ udev-141/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:26.000000000 +0100 | ||
| 5 | @@ -54,19 +54,6 @@ | ||
| 6 | -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \ | ||
| 7 | -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols | ||
| 8 | |||
| 9 | -# move devel files to $(prefix)$(libdir_name) if needed | ||
| 10 | -install-data-hook: | ||
| 11 | - rm $(DESTDIR)$(rootlibdir)/libvolume_id.la | ||
| 12 | - if test "$(prefix)" != "$(exec_prefix)"; then \ | ||
| 13 | - mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \ | ||
| 14 | - mv $(DESTDIR)$(rootlibdir)/libvolume_id.a $(DESTDIR)$(prefix)/$(libdir_name)/; \ | ||
| 15 | - so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libvolume_id.so); \ | ||
| 16 | - rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \ | ||
| 17 | - so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ | ||
| 18 | - ln -sf $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \ | ||
| 19 | - $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \ | ||
| 20 | - fi | ||
| 21 | - | ||
| 22 | EXTRA_DIST = \ | ||
| 23 | exported_symbols | ||
| 24 | |||
diff --git a/meta/packages/udev/udev_145.bb b/meta/packages/udev/udev_145.bb new file mode 100644 index 0000000000..8db92b8206 --- /dev/null +++ b/meta/packages/udev/udev_145.bb | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ | ||
| 2 | /dev/, handles hotplug events and loads drivers at boot time. It replaces \ | ||
| 3 | the hotplug package and requires a kernel not older than 2.6.12." | ||
| 4 | RPROVIDES_${PN} = "hotplug" | ||
| 5 | |||
| 6 | PR = "r4" | ||
| 7 | |||
| 8 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | ||
| 9 | file://run.rules \ | ||
| 10 | " | ||
| 11 | |||
| 12 | SRC_URI_append_h2200 = " file://50-hostap_cs.rules " | ||
| 13 | PACKAGE_ARCH_h2200 = "h2200" | ||
| 14 | |||
| 15 | require udev.inc | ||
| 16 | |||
| 17 | INITSCRIPT_PARAMS = "start 03 S ." | ||
| 18 | |||
| 19 | FILES_${PN} += "${base_libdir}/udev/*" | ||
| 20 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug" | ||
| 21 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" | ||
| 22 | #EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" | ||
| 23 | |||
| 24 | exec_prefix = "" | ||
| 25 | |||
| 26 | EXTRA_OECONF = "--with-udev-prefix= --disable-extras" | ||
| 27 | |||
| 28 | do_install () { | ||
| 29 | install -d ${D}${usrsbindir} \ | ||
| 30 | ${D}${sbindir} | ||
| 31 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
| 32 | install -d ${D}${sysconfdir}/init.d | ||
| 33 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
| 34 | |||
| 35 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
| 36 | |||
| 37 | cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ | ||
| 38 | cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/ | ||
| 39 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
| 40 | #install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
| 41 | #install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules | ||
| 42 | #install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
| 43 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | ||
| 44 | #if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
| 45 | # install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
| 46 | #fi | ||
| 47 | |||
| 48 | # Remove some default rules that don't work well on embedded devices | ||
| 49 | #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules | ||
| 50 | #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules | ||
| 51 | #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules | ||
| 52 | |||
| 53 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
| 54 | |||
| 55 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
| 56 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
| 57 | |||
| 58 | install -d ${D}${base_libdir}/udev/ | ||
| 59 | } | ||
| 60 | |||
| 61 | do_install_append_h2200() { | ||
| 62 | install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules | ||
| 63 | } | ||
| 64 | |||
| 65 | do_stage () { | ||
| 66 | autotools_stage_all | ||
| 67 | } \ No newline at end of file | ||
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/packages/util-linux/util-linux.inc index c5fbf2ec37..96c31f2ef3 100644 --- a/meta/packages/util-linux/util-linux.inc +++ b/meta/packages/util-linux/util-linux.inc | |||
| @@ -3,7 +3,7 @@ SECTION = "base" | |||
| 3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
| 4 | DEPENDS = "udev zlib ncurses virtual/libintl" | 4 | DEPENDS = "udev zlib ncurses virtual/libintl" |
| 5 | 5 | ||
| 6 | inherit autotools | 6 | inherit autotools_stage |
| 7 | 7 | ||
| 8 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \ | 8 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \ |
| 9 | file://MCONFIG \ | 9 | file://MCONFIG \ |
diff --git a/meta/packages/util-linux/util-linux_2.15.bb b/meta/packages/util-linux/util-linux_2.15.bb index 5ace54fa1e..e5bc80a236 100644 --- a/meta/packages/util-linux/util-linux_2.15.bb +++ b/meta/packages/util-linux/util-linux_2.15.bb | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | require util-linux.inc | 1 | require util-linux.inc |
| 2 | 2 | ||
| 3 | PR = "r15" | 3 | PR = "r17" |
