================================
udev:source=070-0.2
cvc rdiff udev -1 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/070-0.2
================================
070-0.2 Gil Hamlin ([EMAIL PROTECTED]) Thu Oct 6 14:53:37 2005
fixes
udev-062-build.patch: new
--- udev-062/udevd.c.foo 2005-07-08 22:25:46.000000000 -0400
+++ udev-062/udevd.c 2005-07-08 22:26:00.000000000 -0400
@@ -38,6 +38,9 @@
#include <sys/un.h>
#include <sys/sysinfo.h>
#include <sys/stat.h>
+
+#define __u32 u_int32_t
+#define __u16 u_int16_t
#include <linux/netlink.h>
#include "list.h"
--- udev-062/Makefile.foo 2005-07-08 22:30:36.000000000 -0400
+++ udev-062/Makefile 2005-07-08 22:31:22.000000000 -0400
@@ -112,7 +112,7 @@
CFLAGS += -D_GNU_SOURCE
# use '-Os' optimization if available, else use -O2
-OPTFLAGS := $(call cc-supports, -Os, -O2)
+OPTFLAGS := %(cflags)s
HEADERS = \
udev.h \
@@ -159,15 +159,9 @@
endif
# if DEBUG is enabled, then we do not strip or optimize
-ifeq ($(strip $(DEBUG)),true)
- CFLAGS += -O1 -g -DDEBUG
- LDFLAGS += -Wl
- STRIPCMD = /bin/true -Since_we_are_debugging
-else
- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer
- LDFLAGS += -s -Wl
- STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
-endif
+CFLAGS += $(OPTFLAGS)
+LDFLAGS += -Wl
+STRIPCMD = /bin/true
# If we are using our version of klibc, then we need to build, link it, and
then
# link udev against it statically. Otherwise, use glibc and link dynamically.
--- udev-062/Makefile.ff 2005-07-08 22:32:07.000000000 -0400
+++ udev-062/Makefile 2005-07-08 22:33:28.000000000 -0400
@@ -185,13 +185,8 @@
LDFLAGS += -static
endif
-ifeq ($(strip $(V)),false)
- [EMAIL PROTECTED](PWD)/ccdv
- HOST_PROGS=ccdv
-else
- QUIET=
- HOST_PROGS=
-endif
+QUIET=
+HOST_PROGS=
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
@@ -229,10 +224,6 @@
# header files automatically generated
GEN_HEADERS = udev_version.h
-ccdv:
- @echo "Building ccdv"
- @$(HOSTCC) -O1 ccdv.c -o ccdv
-
# Rules on how to create the generated header files
udev_version.h:
@echo "Creating udev_version.h"
udev_etc.tar.gz: new
udev-070.tar.bz2: new
perms.patch: new
diff -r -U 3 udev-063/udev.nodes udev-063-patch/udev.nodes
--- udev-063/udev.nodes 2005-02-18 14:07:41.000000000 +0100
+++ udev-063-patch/udev.nodes 2005-09-04 20:13:52.000000000 +0200
@@ -26,3 +26,6 @@
console
null
zero
+ptmx
+rtc
+inotify
diff -r -U 3 udev-063/udev.rules.persistent udev-063-patch/udev.rules.persistent
--- udev-063/udev.rules.persistent 2005-05-12 12:19:24.000000000 +0200
+++ udev-063-patch/udev.rules.persistent 2005-09-04 20:12:56.000000000
+0200
@@ -1,18 +1,25 @@
-BUS=="scsi", PROGRAM="/sbin/udev.get_persistent_device_name.sh",
SYMLINK="%c{1+}"
-BUS=="usb", PROGRAM="/sbin/udev.get_persistent_device_name.sh",
SYMLINK="%c{1+}"
-BUS=="ide", PROGRAM="/sbin/udev.get_persistent_device_name.sh",
SYMLINK="%c{1+}"
+BUS="scsi", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k"
SYMLINK="%c{1+}"
+BUS="usb", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k"
SYMLINK="%c{1+}"
+BUS="ide", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k"
SYMLINK="%c{1+}"
# S/390 zfcp, full disk
-BUS=="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03"
SYSFS{devtype}="1732/03" KERNEL="sd*[!0-9]",
SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}
disk/by-serial/fcp-%c{1}%c{2}-%c{3}"
+BUS="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03"
SYSFS{devtype}="1732/03" KERNEL="sd*[!0-9]", NAME="%k"
SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}
disk/by-serial/fcp-%c{1}%c{2}-%c{3}"
# S/390 zfcp, disk partition
-BUS=="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03"
SYSFS{devtype}="1732/03" KERNEL="sd*[0-9]",
SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}-part%n
disk/by-serial/fcp-%c{1}%c{2}-%c{3}-part%n"
+BUS="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03"
SYSFS{devtype}="1732/03" KERNEL="sd*[0-9]", NAME="%k"
SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}-part%n
disk/by-serial/fcp-%c{1}%c{2}-%c{3}-part%n"
# S/390 DASD, full disk
-BUS=="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[!0-9]",
SYMLINK="disk/by-path/ccw-%b"
+BUS="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[!0-9]", NAME="%k"
SYMLINK="disk/by-path/ccw-%b"
# S/390 DASD, disk partition
-BUS=="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[0-9]",
SYMLINK="disk/by-path/ccw-%b-part%n"
+BUS="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[0-9]", NAME="%k"
SYMLINK="disk/by-path/ccw-%b-part%n"
# KERNEL="ntibm*[0-9]", SYMLINK="tape/%b/non-rewinding"
# KERNEL="rtibm*[0-9]", SYMLINK="tape/%b/rewinding"
+KERNEL="null", MODE="0666"
+KERNEL="zero", MODE="0666"
+KERNEL="urandom", MODE="0666"
+KERNEL="random", MODE="0666"
+KERNEL="ptmx", MODE="0666"
+KERNEL="tty",MODE="0666"
+KERNEL="inotify",MODE="0666"
udev.recipe: new
#
# Copyright (c) 2004-2005 rpath, Inc.
# All rights reserved
#
class Udev(PackageRecipe):
buildRequires = [ 'sysfsutils:devel', 'pkgconfig:devel', 'glib:runtime',
'bison:runtime', 'pam:devel','glibc:devel'
,'chkconfig:runtime']
name = 'udev'
version = '070'
def setup(r):
r.addArchive('ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%(name)s-%(version)s.tar.bz2')
# addons and extra features
#XXX verify
r.addSource('udev_etc.tar.gz') #rules from etc/udev
r.Run('tar -xzf udev_etc.tar.gz')
r.addSource('udev_init.sh')
r.Install('udev_init.sh','%(sysconfdir)s/init.d/udevd',mode=0755)
#r.Replace('MAKEDEV -x', 'MAKEDEV', 'start_udev')
r.Make('USE_KLIBC=false udevdir="/dev" EXTRAS="extras/scsi_id '
'extras/chassis_id extras/ata_id extras/usb_id '
'extras/run_directory extras/firmware" all')
r.MakeInstall()
# r.Make("LIBDIR=%(libdir)s", subDir='pam_console_setowner')
#r.Run('%(cc)s %(cflags)s -o firmware_helper firmware_helper.c')
r.Install('etc_bla/udev','%(sysconfdir)s')
r.Install('etc_bla/udev/scripts', '%(sysconfdir)s/udev/',mode=0755)
r.Install('extras/firmware/firmware_helper', '%(essentialsbindir)s/')
r.MakeInstall(subDir='extras/scsi_id/')
r.Install('extras/ata_id/ata_id', '%(essentialsbindir)s/')
r.Install('extras/usb_id/usb_id', '%(essentialsbindir)s/')
r.Install('extras/run_directory/udev_run_devd', '%(essentialsbindir)s/')
r.Install('extras/run_directory/udev_run_hotplugd',
'%(essentialsbindir)s/')
r.Install('extras/firmware/firmware_helper', '%(essentialsbindir)s/')
#r.Install('check-cdrom.sh',
'%(sysconfdir)s/udev/scripts/check-cdrom.sh', mode=0755)
#r.Install('ide-media.sh', '%(sysconfdir)s/udev/scripts/ide-media.sh',
mode=0755)
#r.Install('MAKEDEV.dev', '%(sysconfdir)s/udev/scripts/MAKEDEV.dev',
mode=0755)
r.MakeDirs('%(sysconfdir)s/udev/devices')
r.ExcludeDirectories(exceptions='%(sysconfdir)s/udev/devices')
#Make directories for the firmware
r.MakeDirs('%(essentiallibdir)s/firmware')
r.ExcludeDirectories(exceptions='%(essentiallibdir)s/firmware')
udev_init.sh: new
#! /bin/bash
#
# udevd: udev daemon
#
# chkconfig: 345 10 12
# description: This is a daemon for collecting and maintaing information \
# about hardware from several sources. \
# creating devices nodes and sending info to hal daemon
#
# processname: udevd
# pidfile: /var/run/udevd.pid
case "$1" in
start)
/sbin/udevd --daemon
;;
stop)
pkill udevd
;;
*)
echo $0 "start|stop"
;;
esac
Committed by: sleon
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
