diff options
34 files changed, 632 insertions, 171 deletions
diff --git a/meta-moblin/classes/moblin-image.bbclass b/meta-moblin/classes/moblin-image.bbclass index f742777ac..f9bab011b 100644 --- a/meta-moblin/classes/moblin-image.bbclass +++ b/meta-moblin/classes/moblin-image.bbclass @@ -95,3 +95,5 @@ inherit image # Create /etc/timestamp during image construction to give a reasonably sane default time setting ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " + +ROOTFS_POSTINSTALL_COMMAND += "rootfs_trim_schemas ; " diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc index 4dd04958f..2fbbea503 100644 --- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc @@ -1,4 +1,5 @@ SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" +SRCREV_pn-clutter-gtk ?= "afa3e7381d9776500a99f1045f31a3a268a6d243" SRCREV_pn-ashford ?= "${AUTOREV}" SRCREV_pn-anerley ?= "${AUTOREV}" diff --git a/meta-moblin/packages/anerley/anerley_git.bb b/meta-moblin/packages/anerley/anerley_git.bb index 96eaebd0e..bd9b04327 100644 --- a/meta-moblin/packages/anerley/anerley_git.bb +++ b/meta-moblin/packages/anerley/anerley_git.bb @@ -6,6 +6,6 @@ PR = "r2" S = "${WORKDIR}/git" -DEPENDS = "telepathy-glib glib-2.0 telepathy-mission-control nbtk" +DEPENDS = "telepathy-glib glib-2.0 telepathy-mission-control nbtk eds-dbus" inherit autotools_stage diff --git a/meta-moblin/packages/hornsey/hornsey_git.bb b/meta-moblin/packages/hornsey/hornsey_git.bb index 5c607ceea..403563f7f 100644 --- a/meta-moblin/packages/hornsey/hornsey_git.bb +++ b/meta-moblin/packages/hornsey/hornsey_git.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" PV = "0.0+git${SRCPV}" PR = "r2" -DEPENDS = "clutter-1.0 clutter-gst bickley bognor-regis nbtk startup-notification libunique" +DEPENDS = "clutter-1.0 clutter-gtk clutter-gst bickley bognor-regis nbtk startup-notification libunique" EXTRA_OECONF = "--disable-shave" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 8225980f7..6b0a14d9a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -225,6 +225,18 @@ rootfs_no_x_startup () { fi } +rootfs_trim_schemas () { + for schema in ${IMAGE_ROOTFS}/etc/gconf/schemas/*.schemas + do + # Need this in case no files exist + if [ -e $schema ]; then + poky-trim-schemas $schema > $schema.new + mv $schema.new $schema + fi + done +} + + # export the zap_root_password, create_etc_timestamp and remote_init_link EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp rootfs_no_x_startup diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 130272722..8842181cd 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -274,6 +274,6 @@ PREFERRED_VERSION_evince ?= "2.20.0" PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" PREFERRED_VERSION_oprofile ?= "0.9.4" PREFERRED_VERSION_elfutils ?= "0.89" -PREFERRED_VERSION_hal ?= "0.5.11+0.5.12rc1" +PREFERRED_VERSION_hal ?= "0.5.13" PREFERRED_VERSION_hal-info ?= "20090414" diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc index 612bc9922..5e9809be2 100644 --- a/meta/conf/distro/include/poky-moblin.inc +++ b/meta/conf/distro/include/poky-moblin.inc @@ -17,9 +17,9 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-sdk ?= "4.3.1" PREFERRED_VERSION_binutils ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.29" -PREFERRED_VERSION_glibc ?= "2.6.1" -PREFERRED_VERSION_glibc-initial ?= "2.6.1" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.30" +PREFERRED_VERSION_glibc ?= "2.9" +PREFERRED_VERSION_glibc-initial ?= "2.9" PREFERRED_VERSION_elfutils ?= "0.131" require conf/distro/include/as-needed.inc diff --git a/meta/packages/acpid/acpid.inc b/meta/packages/acpid/acpid.inc index 6e7991552..8ac523d19 100644 --- a/meta/packages/acpid/acpid.inc +++ b/meta/packages/acpid/acpid.inc @@ -11,8 +11,9 @@ INITSCRIPT_NAME = "acpid" INITSCRIPT_PARAMS = "defaults" EXTRA_OEMAKE = "" + do_compile () { - oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' + oe_runmake 'CC=${CC} -D_GNU_SOURCE' 'CROSS=${HOST_PREFIX}' } do_install () { diff --git a/meta/packages/acpid/acpid/gcc40.patch b/meta/packages/acpid/acpid/gcc40.patch deleted file mode 100644 index 8e3b31da6..000000000 --- a/meta/packages/acpid/acpid/gcc40.patch +++ /dev/null @@ -1,16 +0,0 @@ -upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341 -status: not necessary anymore at least from version 1.0.6 onwards where this patch reverse-applies cleanly - -Index: acpid-1.0.3/ud_socket.c -=================================================================== ---- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 -+++ acpid-1.0.3/ud_socket.c 2005-06-27 14:44:17.785576106 -0700 -@@ -58,7 +58,7 @@ - while (1) { - int newsock = 0; - struct sockaddr_un cliaddr; -- int len = sizeof(struct sockaddr_un); -+ socklen_t len = sizeof(struct sockaddr_un); - - newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len); - if (newsock < 0) { diff --git a/meta/packages/acpid/files/init b/meta/packages/acpid/acpid/init index ef08b5959..ef08b5959 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 2a305eeac..000000000 --- a/meta/packages/acpid/acpid_1.0.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require acpid.inc -PR = "r2" - 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 640acd520..000000000 --- a/meta/packages/acpid/acpid_1.0.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require acpid.inc -SRC_URI += "file://gcc40.patch;patch=1" -PR = "r2" - 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 f48c26225..000000000 --- a/meta/packages/acpid/acpid_1.0.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require acpid.inc -SRC_URI += "file://gcc40.patch;patch=1" -PR = "r3" - diff --git a/meta/packages/acpid/acpid_1.0.6.bb b/meta/packages/acpid/acpid_1.0.6.bb index e096796fb..364aa8200 100644 --- a/meta/packages/acpid/acpid_1.0.6.bb +++ b/meta/packages/acpid/acpid_1.0.6.bb @@ -1,3 +1,3 @@ require acpid.inc -PR = "r4" +PR = "r5" diff --git a/meta/packages/dhcp/dhcp_4.1.0.bb b/meta/packages/dhcp/dhcp_4.1.0.bb index 4d6838923..cb6b267f3 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" DESCRIPTION = "Internet Software Consortium DHCP package" HOMEPAGE = "http://www.isc.org/" LICENSE = "BSD" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ file://fixincludes.patch;patch=1 \ 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 \ inherit autotools +TARGET_CFLAGS += "-D_GNU_SOURCE" + do_compile() { make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ -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 95ecbf274..f20924081 100644 --- a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb +++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb @@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r12" +PR = "r14" SRC_URI += "file://no-hardlinks.patch;patch=1" @@ -41,6 +41,7 @@ do_stage () { install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h" install -d ${STAGING_LIBDIR}/pkgconfig + rm lib/*/blkid.pc for pc in lib/*/*.pc; do install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h" 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 000000000..dde33fabb --- /dev/null +++ b/meta/packages/hal/hal_0.5.13.bb @@ -0,0 +1,21 @@ +require hal.inc + +PR = "r3" + +SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.13.tar.gz \ + file://99_hal \ + file://20hal" + +S = "${WORKDIR}/hal-0.5.13" + +EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" + +PACKAGES =+ "libhal libhal-storage" + +DEPENDS += "util-linux" + +FILES_libhal = "${libdir}/libhal.so.*" +FILES_libhal-storage = "${libdir}/libhal-storage.so.*" + +FILES_${PN} =+ "${bindir}/hal-disable-polling \ + ${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 000000000..b2ebf4063 --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch @@ -0,0 +1,12 @@ +Index: linux-2.6.30/include/linux/if_tunnel.h +=================================================================== +--- linux-2.6.30.orig/include/linux/if_tunnel.h 2009-08-27 14:34:49.000000000 +0100 ++++ linux-2.6.30/include/linux/if_tunnel.h 2009-08-27 14:35:04.000000000 +0100 +@@ -2,6 +2,7 @@ + #define _IF_TUNNEL_H_ + + #include <linux/types.h> ++#include <asm/byteorder.h> + + #ifdef __KERNEL__ + #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 d9f3fab80..9d1412d61 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 INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r3" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://headerfix.patch;patch=1" S = "${WORKDIR}/linux-${PV}" diff --git a/meta/packages/mesa/mesa-dri/cross2.patch b/meta/packages/mesa/mesa-dri/cross2.patch index 3c62a469e..d2147910a 100644 --- a/meta/packages/mesa/mesa-dri/cross2.patch +++ b/meta/packages/mesa/mesa-dri/cross2.patch @@ -1,8 +1,8 @@ Index: git/configure.ac =================================================================== ---- git.orig/configure.ac 2009-08-14 16:16:23.000000000 +0100 -+++ git/configure.ac 2009-08-14 16:17:27.000000000 +0100 -@@ -268,15 +268,6 @@ +--- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100 ++++ git/configure.ac 2009-09-01 16:38:47.000000000 +0100 +@@ -269,15 +269,6 @@ GLAPI_ASM_SOURCES="" AC_MSG_CHECKING([whether to enable assembly]) test "x$enable_asm" = xno && AC_MSG_RESULT([no]) @@ -20,8 +20,8 @@ Index: git/configure.ac case "$host_cpu" in Index: git/src/mesa/x86/Makefile =================================================================== ---- git.orig/src/mesa/x86/Makefile 2009-08-14 16:18:23.000000000 +0100 -+++ git/src/mesa/x86/Makefile 2009-08-14 16:19:10.000000000 +0100 +--- git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.000000000 +0100 ++++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.000000000 +0100 @@ -14,19 +14,6 @@ -I../tnl @@ -33,7 +33,7 @@ Index: git/src/mesa/x86/Makefile - - -gen_matypes: gen_matypes.c -- $(HOST_CC) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes +- $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes - -# need some special rules here, unfortunately -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 bafc2f6a1..e4a548156 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 @@ +If we're building an image and some package rebuilds while this is happening +some package can be removed/added to the ipk deploy directory. The image will +not depend on this package so we can safely ignore these cases rather than +error out. + +RP - 26/8/09 + Index: opkg-utils/opkg-make-index =================================================================== --- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 -+++ opkg-utils/opkg-make-index 2009-08-26 20:49:52.000000000 +0100 ++++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100 @@ -96,6 +96,7 @@ files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') files.sort() @@ -10,17 +17,20 @@ Index: opkg-utils/opkg-make-index basename = os.path.basename(filename) pkg = None fnameStat = os.stat(filename) -@@ -130,6 +131,9 @@ +@@ -130,6 +131,12 @@ to_morgue(basename) if opt_s: print filename + except OSError: + sys.stderr.write("Package %s disappeared on us!\n" % (filename)) + continue ++ except IOError: ++ sys.stderr.write("Package %s disappeared on us!\n" % (filename)) ++ continue pkgsStampsFile = open(stamplist_filename, "w") for f in pkgsStamps.keys(): -@@ -148,6 +152,7 @@ +@@ -148,6 +155,7 @@ names = packages.packages.keys() names.sort() for name in names: @@ -28,13 +38,17 @@ Index: opkg-utils/opkg-make-index pkg = packages.packages[name] if locales_dir and pkg.depends: depends = string.split(pkg.depends, ',') -@@ -165,6 +170,9 @@ +@@ -165,6 +173,13 @@ if (verbose): sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) print pkg + except OSError: + sys.stderr.write("Package %s disappeared on us!\n" % (name)) + continue ++ except IOError: ++ sys.stderr.write("Package %s disappeared on us!\n" % (name)) ++ continue ++ if packages_filename: sys.stdout.close() 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 a14150571..b06ea6a68 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" LICENSE = "GPL" RDEPENDS = "python" RDEPENDS_virtclass-native = "" -PR = "r5" +PR = "r6" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ 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 87c897734..000000000 --- a/meta/packages/udev/udev-141/1 +++ /dev/null @@ -1,119 +0,0 @@ -# do not edit this file, it will be overwritten on update - -SUBSYSTEM=="block", SYMLINK+="block/%M:%m" -SUBSYSTEM!="block", SYMLINK+="char/%M:%m" - -KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660" -KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660" -KERNEL=="ptmx", GROUP="tty", MODE="0666" -KERNEL=="tty", GROUP="tty", MODE="0666" -KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" -KERNEL=="console", MODE="0600" -KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty" - -# serial -KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" -KERNEL=="ppp", MODE="0600" -KERNEL=="mwave", NAME="modems/mwave", GROUP="dialout" -KERNEL=="hvc*|hvsi*", GROUP="dialout" - -# mem -KERNEL=="null|zero|full|random|urandom", MODE="0666" -KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640" - -# input -KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0640" -KERNEL=="ts[0-9]*|uinput", NAME="input/%k", MODE="0640" -KERNEL=="js[0-9]*", NAME="input/%k", MODE="0644" - -# video4linux -SUBSYSTEM=="video4linux", GROUP="video" -KERNEL=="vttuner*", GROUP="video" -KERNEL=="vtx*|vbi*", GROUP="video" -KERNEL=="winradio*", GROUP="video" - -# graphics -KERNEL=="agpgart", MODE="0600", GROUP="video" -KERNEL=="card[0-9]*", NAME="dri/%k" -KERNEL=="pmu", GROUP="video" -KERNEL=="nvidia*|nvidiactl*", GROUP="video" -SUBSYSTEM=="graphics", GROUP="video" -SUBSYSTEM=="drm", GROUP="video" - -# DVB (video) -SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video" - -# Firewire -KERNEL=="dv1394-[0-9]*", NAME="dv1394/%n", GROUP="video" -KERNEL=="video1394-[0-9]*", NAME="video1394/%n", GROUP="video" - -# libusb device nodes -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664" - -# printer -KERNEL=="parport[0-9]*", GROUP="lp" -SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp" -SUBSYSTEM=="ppdev", GROUP="lp" -SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp" -KERNEL=="lp[0-9]*", GROUP="lp" -KERNEL=="irlpt[0-9]*", GROUP="lp" - -# block -SUBSYSTEM=="block", GROUP="disk" - -# floppy -KERNEL=="fd[0-9]", GROUP="floppy" -KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k" -KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions" - -# cdrom -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" -SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" -SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" -KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom" -KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom" - -# tape -KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape" -KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape" -SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" - -# block-releated -KERNEL=="sch[0-9]*", GROUP="disk" -SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" -KERNEL=="pg[0-9]*", GROUP="disk" -KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" -KERNEL=="rawctl", NAME="raw/rawctl", GROUP="disk" -SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk" -SUBSYSTEM=="bsg", NAME="bsg/%k" -SUBSYSTEM=="aoe", NAME="etherd/%k", GROUP="disk", MODE="0220" -SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" - -# network -KERNEL=="tun", NAME="net/%k", MODE="0666" - -# CPU -KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid", MODE="0444" -KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" -KERNEL=="microcode", NAME="cpu/microcode", MODE="0600" - -# miscellaneous -KERNEL=="fuse", MODE="0666" -SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc" -KERNEL=="auer[0-9]*", NAME="usb/%k" -KERNEL=="hw_random", NAME="hwrng" -KERNEL=="mmtimer", MODE="0644" -KERNEL=="rflash[0-9]*", MODE="0400" -KERNEL=="rrom[0-9]*", MODE="0400" -KERNEL=="sxctl", NAME="specialix_sxctl" -KERNEL=="rioctl", NAME="specialix_rioctl" -KERNEL=="iowarrior[0-9]*", NAME="usb/%k" -KERNEL=="hiddev[0-9]*", NAME="usb/%k" -KERNEL=="legousbtower[0-9]*", NAME="usb/%k" -KERNEL=="dabusb[0-9]*", NAME="usb/%k" -KERNEL=="usbdpfp[0-9]*", NAME="usb/%k" -KERNEL=="cpad[0-9]*", NAME="usb/%k" - -# do not delete static device nodes -ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove" -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 000000000..f38a0aa36 --- /dev/null +++ b/meta/packages/udev/udev-145/init @@ -0,0 +1,60 @@ +#!/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) + 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 + (cd /; tar cf /etc/dev.tar /dev) + fi + +echo +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 000000000..5b926018f --- /dev/null +++ b/meta/packages/udev/udev-145/local.rules @@ -0,0 +1,31 @@ +# 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 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]*", 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 000000000..6f9fe948f --- /dev/null +++ b/meta/packages/udev/udev-145/noasmlinkage.patch @@ -0,0 +1,48 @@ +Index: udev-141/udev/test-udev.c +=================================================================== +--- udev-141.orig/udev/test-udev.c 2008-10-24 09:07:24.000000000 +0100 ++++ udev-141/udev/test-udev.c 2009-04-14 15:34:01.000000000 +0100 +@@ -30,7 +30,7 @@ + + #include "udev.h" + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: +Index: udev-141/udev/udevadm-monitor.c +=================================================================== +--- udev-141.orig/udev/udevadm-monitor.c 2009-03-29 19:07:01.000000000 +0100 ++++ udev-141/udev/udevadm-monitor.c 2009-04-14 15:34:01.000000000 +0100 +@@ -35,7 +35,7 @@ + + static int udev_exit; + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + if (signum == SIGINT || signum == SIGTERM) + udev_exit = 1; +Index: udev-141/udev/udevd.c +=================================================================== +--- udev-141.orig/udev/udevd.c 2009-03-29 19:07:01.000000000 +0100 ++++ udev-141/udev/udevd.c 2009-04-14 15:34:56.000000000 +0100 +@@ -172,7 +172,7 @@ + udev_event_unref(event); + } + +-static void asmlinkage event_sig_handler(int signum) ++static void event_sig_handler(int signum) + { + if (signum == SIGALRM) + exit(1); +@@ -583,7 +583,7 @@ + return 0; + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + 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 000000000..205b73329 --- /dev/null +++ b/meta/packages/udev/udev-145/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/packages/udev/udev-145/run.rules b/meta/packages/udev/udev-145/run.rules new file mode 100644 index 000000000..75d71375b --- /dev/null +++ b/meta/packages/udev/udev-145/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/packages/udev/udev-145/udev.rules b/meta/packages/udev/udev-145/udev.rules new file mode 100644 index 000000000..a19d4a0bf --- /dev/null +++ b/meta/packages/udev/udev-145/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/packages/udev/udev-145/unbreak.patch b/meta/packages/udev/udev-145/unbreak.patch new file mode 100644 index 000000000..bb5988dca --- /dev/null +++ b/meta/packages/udev/udev-145/unbreak.patch @@ -0,0 +1,24 @@ +Index: udev-141/extras/volume_id/lib/Makefile.am +=================================================================== +--- udev-141.orig/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:16.000000000 +0100 ++++ udev-141/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:26.000000000 +0100 +@@ -54,19 +54,6 @@ + -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \ + -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols + +-# move devel files to $(prefix)$(libdir_name) if needed +-install-data-hook: +- rm $(DESTDIR)$(rootlibdir)/libvolume_id.la +- if test "$(prefix)" != "$(exec_prefix)"; then \ +- mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \ +- mv $(DESTDIR)$(rootlibdir)/libvolume_id.a $(DESTDIR)$(prefix)/$(libdir_name)/; \ +- so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libvolume_id.so); \ +- rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \ +- so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +- ln -sf $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \ +- $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \ +- fi +- + EXTRA_DIST = \ + exported_symbols + diff --git a/meta/packages/udev/udev_145.bb b/meta/packages/udev/udev_145.bb new file mode 100644 index 000000000..8db92b820 --- /dev/null +++ b/meta/packages/udev/udev_145.bb @@ -0,0 +1,67 @@ +DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ +/dev/, handles hotplug events and loads drivers at boot time. It replaces \ +the hotplug package and requires a kernel not older than 2.6.12." +RPROVIDES_${PN} = "hotplug" + +PR = "r4" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://run.rules \ + " + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" + +require udev.inc + +INITSCRIPT_PARAMS = "start 03 S ." + +FILES_${PN} += "${base_libdir}/udev/*" +FILES_${PN}-dbg += "${base_libdir}/udev/.debug" +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" +#EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" + +exec_prefix = "" + +EXTRA_OECONF = "--with-udev-prefix= --disable-extras" + +do_install () { + install -d ${D}${usrsbindir} \ + ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + + install -d ${D}${sysconfdir}/udev/rules.d/ + + cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ + cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + #install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules + #install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules + #install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf + #if [ "${UDEV_DEVFS_RULES}" = "1" ]; then + # install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules + #fi + + # Remove some default rules that don't work well on embedded devices + #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules + #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules + #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules + + install -d ${D}${sysconfdir}/udev/scripts/ + + install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + install -d ${D}${base_libdir}/udev/ +} + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} + +do_stage () { + autotools_stage_all +}
\ 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 c5fbf2ec3..96c31f2ef 100644 --- a/meta/packages/util-linux/util-linux.inc +++ b/meta/packages/util-linux/util-linux.inc @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "udev zlib ncurses virtual/libintl" -inherit autotools +inherit autotools_stage SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \ 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 5ace54fa1..e5bc80a23 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 @@ require util-linux.inc -PR = "r15" +PR = "r17" diff --git a/scripts/poky-trim-schemas b/scripts/poky-trim-schemas new file mode 100755 index 000000000..29fb3a1b6 --- /dev/null +++ b/scripts/poky-trim-schemas @@ -0,0 +1,49 @@ +#! /usr/bin/env python + +import sys +try: + import xml.etree.cElementTree as etree +except: + import xml.etree.ElementTree as etree + +def child (elem, name): + for e in elem.getchildren(): + if e.tag == name: + return e + return None + +def children (elem, name=None): + l = elem.getchildren() + if name: + l = [e for e in l if e.tag == name] + return l + +xml = etree.parse(sys.argv[1]) + +for schema in child(xml.getroot(), "schemalist").getchildren(): + e = child(schema, "short") + if e is not None: + schema.remove(e) + + e = child(schema, "long") + if e is not None: + schema.remove(e) + + for locale in children(schema, "locale"): + # One locale must exist so leave C locale... + a = locale.attrib.get("name") + if a == 'C': + continue + e = child(locale, "default") + if e is None: + schema.remove(locale) + else: + e = child(locale, "short") + if e is not None: + locale.remove(e) + e = child(locale, "long") + if e is not None: + locale.remove(e) + +xml.write(sys.stdout, "UTF-8") + |