sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

pcmciautils and udev updates. Slowly aiming to get rid of hotplug and pcmcia-cs 

git-svn-id: https://svn.o-hand.com/repos/poky@27 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2005-09-20 15:19:38 +00:00
parent b4a7122cac
commit 8d66edc408
15 changed files with 442 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
openembedded/packages/pcmciautils/pcmciautils_010.bb Normal file
View File

@ -0,0 +1,35 @@
DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
DEPENDS = "sysfsutils udev"
RDEPENDS = "udev"
HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
SECTION = "kernel/userland"
PRIORITY = "optional"
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
S = "${WORKDIR}/pcmciautils-${PV}"
PR = "r1"
inherit update-rc.d
INITSCRIPT_NAME = "coldplug"
INITSCRIPT_PARAMS = "defaults"
export HOSTCC = "${BUILD_CC}"
export etcdir = "${sysconfdir}"
export pcmciaconfdir = "${sysconfdir}/pcmcia"
export udevrulesdir = "${sysconfdir}/udev/rules.d"
export UDEV = 1
LD = "${CC}"
CFLAGS =+ "-I${S}/src"
CFLAGS =+ '-DPCMCIAUTILS_VERSION=010'
PARALLEL_MAKE = ""
EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'"
do_install () {
oe_runmake 'DESTDIR=${D}' install
}
CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
RCONFLICTS_${PN} += "pcmcia-cs"

234
openembedded/packages/udev/files/init
View File

@ -1,36 +1,18 @@
#!/bin/sh -e
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
UDEVSTART=/sbin/udevstart
# default maximum size of the /dev ramfs
ramfs_size="1M"
# defaults
tmpfs_size="10M"
udev_root="/dev"
[ -x $UDEVSTART ] || exit 0
. /etc/udev/udev.conf
case "$(uname -r)" in
2.[012345].*)
echo "udev requires a kernel >= 2.6, not started."
exit 0
;;
esac
if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then
echo "udev requires ramfs support, not started."
exit 0
fi
if [ ! -e /proc/sys/kernel/hotplug ]; then
echo "udev requires hotplug support, not started."
exit 0
fi
##############################################################################
# we need to unmount /dev/pts/ and remount it later over the ramfs
# we need to unmount /dev/pts/ and remount it later over the tmpfs
unmount_devpts() {
if mountpoint -q /dev/pts/; then
umount -l /dev/pts/
@ -41,132 +23,169 @@ unmount_devpts() {
fi
}
# mount a ramfs over /dev, if somebody did not already do it
mount_ramfs() {
if grep -E -q "^[^[:space:]]+ /dev ramfs" /proc/mounts; then
# mount a tmpfs over /dev, if somebody did not already do it
mount_tmpfs() {
if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
return 0
fi
# /.dev is used by /sbin/MAKEDEV to access the real /dev directory.
# if you don't like this, remove /.dev/.
[ -d /.dev ] && mount --bind /dev /.dev
# /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
# /etc/udev/ is recycled as a temporary mount point because it's the only
# directory which is guaranteed to be available.
mount -n -o bind /dev /etc/udev
echo -n "Mounting a ramfs over /dev..."
mount -n -o size=$ramfs_size,mode=0755 -t ramfs none /dev
echo "done."
if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
umount /etc/udev
echo "udev requires tmpfs support, not started."
exit 1
fi
# using ln to test if /dev works, because touch is in /usr/bin/
if ln -s test /dev/test-file; then
rm /dev/test-file
else
echo "udev requires tmpfs support, not started."
umount /etc/udev
umount /dev
exit 1
fi
mkdir -p /dev/.static/dev
chmod 700 /dev/.static/
mount -n -o move /etc/udev /dev/.static/dev
}
# I hate this hack. -- Md
make_extra_nodes() {
if [ -f /etc/udev/links.conf ]; then
[ -e /etc/udev/links.conf ] || return 0
grep '^[^#]' /etc/udev/links.conf | \
while read type name arg1; do
[ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
case "$type" in
L)
ln -s $arg1 /dev/$name
;;
D)
mkdir -p /dev/$name
;;
M)
mknod -m 600 /dev/$name $arg1
;;
*)
echo "unparseable line ($type $name $arg1)"
;;
L) ln -s $arg1 /dev/$name ;;
D) mkdir -p /dev/$name ;;
M) mknod -m 600 /dev/$name $arg1 ;;
*) echo "links.conf: unparseable line ($type $name $arg1)" ;;
esac
done
fi
}
# this function is duplicated in preinst, postinst and d-i
supported_kernel() {
case "$(uname -r)" in
2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
esac
return 0
}
# shell version of /usr/bin/tty
my_tty() {
[ -x /bin/readlink ] || return 0
[ -e /proc/self/fd/0 ] || return 0
readlink --silent /proc/self/fd/0 || true
}
warn_if_interactive() {
if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
return 0
fi
TTY=$(my_tty)
if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
return 0
fi
printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
printf "has been run from an interactive shell.\n"
printf "It will probably not do what you expect, so this script will wait\n"
printf "60 seconds before continuing. Press ^C to stop it.\n"
printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
sleep 60
}
##############################################################################
if [ "$udev_root" != "/dev" ]; then
echo "WARNING: udev_root != /dev"
if ! supported_kernel; then
echo "udev requires a kernel >= 2.6.12, not started."
exit 1
fi
case "$1" in
start)
if [ -e "$udev_root/.udev.tdb" ]; then
if mountpoint -q /dev/; then
echo "FATAL: udev is already active on $udev_root."
exit 1
else
echo "WARNING: .udev.tdb already exists on the old $udev_root!"
fi
fi
mount -n -o size=$ramfs_size,mode=0755 -t ramfs none $udev_root
echo -n "Creating initial device nodes..."
$UDEVSTART
echo "done."
;;
stop)
start-stop-daemon -K -x /sbin/udevd
echo -n "Unmounting $udev_root..."
# unmounting with -l should never fail
if umount -l $udev_root; then
echo "done."
else
echo "failed."
fi
;;
restart|force-reload)
$0 stop
$0 start
;;
*)
echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
exit 1
;;
esac
if [ ! -e /proc/filesystems ]; then
echo "udev requires a mounted procfs, not started."
exit 1
fi
exit 0
fi # udev_root != /dev/
if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
echo "udev requires tmpfs support, not started."
exit 1
fi
if [ ! -d /sys/class/ ]; then
echo "udev requires a mounted sysfs, not started."
exit 1
fi
if [ ! -e /proc/sys/kernel/hotplug ]; then
echo "udev requires hotplug support, not started."
exit 1
fi
##############################################################################
# When modifying this script, do not forget that between the time that
# the new /dev has been mounted and udevstart has been run there will be
# no /dev/null. This also means that you cannot use the "&" shell command.
case "$1" in
start)
if [ -e "$udev_root/.udev.tdb" ]; then
if [ -e "$udev_root/.udevdb" ]; then
if mountpoint -q /dev/; then
echo "FATAL: udev is already active on $udev_root."
exit 1
TMPFS_MOUNTED=1
else
echo "WARNING: .udev.tdb already exists on the old $udev_root!"
echo ".udevdb already exists on the old $udev_root!"
fi
fi
unmount_devpts
mount_ramfs
ACTION=add
echo -n "Creating initial device nodes..."
$UDEVSTART
warn_if_interactive
#echo /sbin/udevsend > /proc/sys/kernel/hotplug
echo "" > /proc/sys/kernel/hotplug
udevsend
if [ "$UDEV_DISABLED" = "yes" ]; then
echo "udev disabled on the kernel command line, not started."
exit 0
fi
if [ ! "$TMPFS_MOUNTED" ]; then
unmount_devpts
mount_tmpfs
[ -d /proc/1 ] || mount -n /proc
# if this directory is not present /dev will not be updated by udev
mkdir /dev/.udevdb/
echo "Creating initial device nodes..."
udevstart
fi
make_extra_nodes
echo "done."
# /etc/init.d/mountvirtfs start
;;
stop)
start-stop-daemon -K -x /sbin/udevd
warn_if_interactive
start-stop-daemon --stop --exec /sbin/udevd --quiet
unmount_devpts
echo -n "Unmounting /dev..."
if [ -d /dev/.static/dev/ ]; then
umount -l /dev/.static/dev/ || true
fi
echo "Unmounting /dev..."
# unmounting with -l should never fail
if umount -l /dev; then
echo "done."
umount -l /.dev || true
# /etc/init.d/mountvirtfs start
else
echo "failed."
if ! umount -l /dev; then
exit 1
fi
;;
restart|force-reload)
start-stop-daemon -K -x /sbin/udevd
echo -n "Recreating device nodes..."
ACTION=add
$UDEVSTART
start-stop-daemon --stop --exec /sbin/udevd --quiet
log_begin_msg "Recreating device nodes..."
udevstart
make_extra_nodes
echo "done."
log_end_msg 0
;;
*)
echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
@ -175,4 +194,3 @@ case "$1" in
esac
exit 0

21
openembedded/packages/udev/files/links.conf Normal file
View File

@ -0,0 +1,21 @@
# This file does not exist. Please do not ask the debian maintainer about it.
# You may use it to do strange and wonderful things, at your risk.
L fd /proc/self/fd
L stdin /proc/self/fd/0
L stdout /proc/self/fd/1
L stderr /proc/self/fd/2
L core /proc/kcore
L sndstat /proc/asound/oss/sndstat
L MAKEDEV /sbin/MAKEDEV
D pts
D shm
# Hic sunt leones.
M ppp c 108 0
D loop
M loop/0 b 7 0
D net
M net/tun c 10 200

3
openembedded/packages/udev/files/local.rules Normal file
View File

@ -0,0 +1,3 @@
SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh"
SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"

25
openembedded/packages/udev/files/mount.sh Normal file
View File

@ -0,0 +1,25 @@
#!/bin/sh
#
# Called from udev
# Attemp to mount any added block devices
# and remove any removed devices
#
MOUNT="/bin/mount"
PMOUNT="/usr/bin/pmount"
UMOUNT="/bin/umount"
if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
if [ -x "$PMOUNT" ]; then
$PMOUNT $DEVNAME 2> /dev/null
elif [ -x $MOUNT ]; then
$MOUNT $DEVNAME 2> /dev/null
fi
fi
if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
do
$UMOUNT $mnt
done
fi

27
openembedded/packages/udev/files/noasmlinkage.patch
View File

@ -1,27 +0,0 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- udev-042/udev.c~noasmlinkage
+++ udev-042/udev.c
@@ -60,7 +60,7 @@
}
#endif
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
{
switch (signum) {
case SIGALRM:
--- udev-042/udevd.c~noasmlinkage
+++ udev-042/udevd.c
@@ -308,7 +308,7 @@
return;
}
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
{
int rc;

81
openembedded/packages/udev/files/permissions.rules Normal file
View File

@ -0,0 +1,81 @@
# default permissions for block devices
SUBSYSTEM=="block", GROUP="disk"
SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy"
# IDE devices
BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}="1", \
PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom*", GROUP="cdrom"
BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape"
BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape"
# SCSI devices
BUS=="scsi", SYSFS{type}=="1", GROUP="tape"
BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom"
BUS=="scsi", SYSFS{type}=="6", GROUP="scanner"
# USB devices
BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp"
# serial devices
SUBSYSTEM=="tty", GROUP="dialout"
SUBSYSTEM=="capi", GROUP="dialout"
SUBSYSTEM=="slamr", 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="0444"
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", MODE="0660", GROUP="audio"
KERNEL=="cdemu[0-9]*", GROUP="cdrom"
KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
KERNEL=="pktcdvd", MODE="0644"
# printers and parallel devices
SUBSYSTEM=="printer", GROUP="lp"
SUBSYSTEM=="ppdev", 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]*", MODE="0664"
KERNEL=="js[0-9]*", MODE="0664"
# AOE character devices
SUBSYSTEM=="aoe", MODE="0220", GROUP="disk"
SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"

96
openembedded/packages/udev/files/udev.rules Normal file
View File

@ -0,0 +1,96 @@
# 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
#
# SCSI devices
BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n"
# USB devices
BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k"
BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k"
BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k"
BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k"
BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k"
BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k"
BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
SYMLINK+="pilot"
# usbfs-like devices
SUBSYSTEM=="usb_device", \
PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
# serial devices
KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
KERNEL=="capi[0-9]*", NAME="capi/%n"
# video devices
KERNEL=="card[0-9]*", NAME="dri/%k"
# misc devices
KERNEL=="hw_random", NAME="hwrng"
KERNEL=="tun", NAME="net/%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"
# 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"
# 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+="/sbin/firmware_helper"

24
openembedded/packages/udev/udev-065/fix-alignment.patch
View File

@ -1,24 +0,0 @@
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule
int valid;
char *linepos;
char *attr;
+ size_t padding;
int retval;
/* get all the keys */
@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule
/* grow buffer and add rule */
rule_size = sizeof(struct udev_rule) + rule->bufsize;
+ padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
+ dbg("add %zi padding bytes", padding);
+ rule_size += padding;
+ rule->bufsize += padding;
+
rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
if (!rules->buf) {
err("realloc failed");

11
openembedded/packages/udev/udev-065/tty-symlinks.patch
View File

@ -1,11 +0,0 @@
--- udev-063/etc/udev/udev.rules.devfs.orig 2005-07-27 19:55:51 +0200
+++ udev-063/etc/udev/udev.rules.devfs 2005-07-27 19:56:49 +0200
@@ -103,3 +103,8 @@
# raw devices
KERNEL="raw[0-9]*", NAME="raw/%k"
+
+# tty devices
+KERNEL=="tty[0-9]*", SYMLINK="%k"
+KERNEL=="ttyS[0-9]*", SYMLINK="%k"
+

36
openembedded/packages/udev/udev-065/flags.patch → openembedded/packages/udev/udev-070/flags.patch
View File

@ -1,11 +1,6 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- udev-065/Makefile~flags
+++ udev-065/Makefile
@@ -106,11 +106,11 @@
--- udev-070/Makefile~flags 2005-09-15 01:19:07 +0200
+++ udev-070/Makefile 2005-09-16 11:44:37 +0200
@@ -160,36 +160,36 @@
# check if compiler option is supported
cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;}
@ -21,10 +16,8 @@
# use '-Os' optimization if available, else use -O2
OPTFLAGS := $(call cc-supports, -Os, -O2)
@@ -154,16 +154,16 @@
SYSFS = $(PWD)/libsysfs/sysfs.a
# include our local copy of libsysfs
-CFLAGS += -I$(PWD)/libsysfs/sysfs \
+override CFLAGS += -I$(PWD)/libsysfs/sysfs \
-I$(PWD)/libsysfs
@ -37,16 +30,29 @@
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
- CFLAGS += -O1 -g -DDEBUG
+ override CFLAGS += -DDEBUG
+ override CFLAGS += -O1 -g -DDEBUG
LDFLAGS += -Wl
STRIPCMD = /bin/true -Since_we_are_debugging
else
@@ -180,18 +180,18 @@
- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer
+ override CFLAGS += $(OPTFLAGS) -fomit-frame-pointer
LDFLAGS += -s -Wl
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
ifeq ($(strip $(USE_GCOV)),true)
- CFLAGS += -fprofile-arcs -ftest-coverage
+ override CFLAGS += -fprofile-arcs -ftest-coverage
LDFLAGS = -fprofile-arcs
endif
@@ -200,18 +200,18 @@
CC = $(KLCC)
LD = $(KLCC)
else
- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
+ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
LDFLAGS += -Wl,-warn-common
endif
ifeq ($(strip $(USE_SELINUX)),true)
@ -58,9 +64,7 @@
ifeq ($(strip $(USE_STATIC)),true)
- CFLAGS += -DUSE_STATIC
- LDFLAGS += -static
+ override CFLAGS += -DUSE_STATIC
+ override LDFLAGS += -static
LDFLAGS += -static
endif
ifeq ($(strip $(V)),false)

0
openembedded/packages/udev/udev-065/noasmlinkage.patch → openembedded/packages/udev/udev-070/noasmlinkage.patch
View File

13
openembedded/packages/udev/udev-070/tty-symlinks.patch Normal file
View File

@ -0,0 +1,13 @@
--- udev-068/etc/udev/udev-devfs.rules.orig 2005-08-22 20:22:18.000000000 +0200
+++ udev-068/etc/udev/udev-devfs.rules 2005-08-22 20:22:44.000000000 +0200
@@ -14,8 +14,8 @@
KERNEL="fd[0-9]*", NAME="floppy/%n"
# tty devices
-KERNEL="tty[0-9]*", NAME="vc/%n"
-KERNEL="ttyS[0-9]*", NAME="tts/%n"
+KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
+KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
# vc devices

20
openembedded/packages/udev/udev.inc
View File

@ -2,6 +2,14 @@ DESCRIPTION = "udev is a program which dynamically creates and removes device no
/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
LICENSE = "GPL"
SRC_URI += " \
file://udev.rules \
file://links.conf \
file://permissions.rules \
file://mount.sh \
file://local.rules \
file://init"
UDEV_DEVFS_RULES ?= "0"
PACKAGES =+ "udev-utils"
@ -34,9 +42,17 @@ do_install () {
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/
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}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
install -m 0644 ${S}/etc/udev/udev.rules.devfs ${D}${sysconfdir}/udev/rules.d/50-udev.rules
fi
install -d ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/
install -d ${D}${sysconfdir}/udev/scripts/
install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
}

13
openembedded/packages/udev/udev_065.bb → openembedded/packages/udev/udev_070.bb
View File

@ -2,21 +2,16 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://tmpfs.patch;patch=1 \
file://noasmlinkage.patch;patch=1 \
file://flags.patch;patch=1 \
file://tty-symlinks.patch;patch=1 \
file://init"
file://tty-symlinks.patch;patch=1"
include udev.inc
PR = "r0"
UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/"
PR = "r2"
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
#FIXME UDEV MIGRATION PLAN:
#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old)
#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug
#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append()
#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules
do_install_append() {
install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/
echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules
}