diff options
author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/udev | |
parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/udev')
-rw-r--r-- | packages/udev/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/udev/files/.mtn2git_empty | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | packages/udev/files/init | 0 | ||||
-rw-r--r-- | packages/udev/files/noasmlinkage.patch | 27 | ||||
-rw-r--r-- | packages/udev/files/tmpfs.patch | 16 | ||||
-rw-r--r-- | packages/udev/udev-042/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/udev/udev-042/flags.patch | 67 | ||||
-rw-r--r-- | packages/udev/udev-050/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/udev/udev-050/flags.patch | 69 | ||||
-rw-r--r-- | packages/udev/udev-050/kill_logname.patch | 12 | ||||
-rw-r--r-- | packages/udev/udev-054/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/udev/udev-054/flags.patch | 75 | ||||
-rw-r--r-- | packages/udev/udev-058/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/udev/udev-058/flags.patch | 40 | ||||
-rw-r--r-- | packages/udev/udev_050.bb | 8 | ||||
-rw-r--r-- | packages/udev/udev_054.bb | 7 |
16 files changed, 321 insertions, 0 deletions
diff --git a/packages/udev/.mtn2git_empty b/packages/udev/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/.mtn2git_empty diff --git a/packages/udev/files/.mtn2git_empty b/packages/udev/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/files/.mtn2git_empty diff --git a/packages/udev/files/init b/packages/udev/files/init index 16efb31542..16efb31542 100644..100755 --- a/packages/udev/files/init +++ b/packages/udev/files/init diff --git a/packages/udev/files/noasmlinkage.patch b/packages/udev/files/noasmlinkage.patch index e69de29bb2..1694d4d661 100644 --- a/packages/udev/files/noasmlinkage.patch +++ b/packages/udev/files/noasmlinkage.patch @@ -0,0 +1,27 @@ + +# +# 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; + diff --git a/packages/udev/files/tmpfs.patch b/packages/udev/files/tmpfs.patch index e69de29bb2..9d0d8b4515 100644 --- a/packages/udev/files/tmpfs.patch +++ b/packages/udev/files/tmpfs.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- udev-031/extras/start_udev~tmpfs 2004-09-10 17:10:03.000000000 -0400 ++++ udev-031/extras/start_udev 2004-09-11 15:18:15.560789160 -0400 +@@ -85,7 +85,7 @@ + fi + + echo "mounting... ramfs at $udev_root" +-mount -n -t ramfs none $udev_root ++mount -n -t ramfs none $udev_root || mount -n -t tmpfs none $udev_root + + # propogate /udev from /sys + echo "Creating initial udev device nodes:" diff --git a/packages/udev/udev-042/.mtn2git_empty b/packages/udev/udev-042/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-042/.mtn2git_empty diff --git a/packages/udev/udev-042/flags.patch b/packages/udev/udev-042/flags.patch index e69de29bb2..a5a791df33 100644 --- a/packages/udev/udev-042/flags.patch +++ b/packages/udev/udev-042/flags.patch @@ -0,0 +1,67 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-042/Makefile~flags ++++ udev-042/Makefile +@@ -119,16 +119,18 @@ + endif + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DLOG ++ override CFLAGS += -DLOG + endif + + # if DEBUG is enabled, then we do not strip or optimize ++override CFLAGS += -D_GNU_SOURCE + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE ++ CFLAGS += -O1 -g ++ override CFLAGS += -DDEBUG + LDFLAGS += -Wl,-warn-common + STRIPCMD = /bin/true -Since_we_are_debugging + else +- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE ++ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer + LDFLAGS += -s -Wl,-warn-common + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment + endif +@@ -150,8 +152,8 @@ + + CRT0 = $(KLIBC_DIR)/crt0.o + LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) +- CFLAGS += $(WARNINGS) -nostdinc \ +- $(OPTFLAGS) \ ++ CFLAGS += $(WARNINGS) $(OPTFLAGS) ++ override CFLAGS += -nostdinc \ + -D__KLIBC__ -fno-builtin-printf \ + -I$(KLIBC_FIXUPS_DIR) \ + -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ +@@ -161,12 +163,13 @@ + -I$(GCCINCDIR) \ + -I$(LINUX_INCLUDE_DIR) + LIB_OBJS = +- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs ++ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs + else + WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + CRT0 = + LIBC = +- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) ++ CFLAGS += $(WARNINGS) ++ override CFLAGS += -I$(GCCINCDIR) + LIB_OBJS = -lc + LDFLAGS = + endif +@@ -176,8 +179,8 @@ + LIB_OBJS += -lselinux + endif + +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ +- -I$(PWD)/libsysfs ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++ -I$(PWD)/libsysfs + + # config files automatically generated + GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf diff --git a/packages/udev/udev-050/.mtn2git_empty b/packages/udev/udev-050/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-050/.mtn2git_empty diff --git a/packages/udev/udev-050/flags.patch b/packages/udev/udev-050/flags.patch index e69de29bb2..b59825f7ac 100644 --- a/packages/udev/udev-050/flags.patch +++ b/packages/udev/udev-050/flags.patch @@ -0,0 +1,69 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: udev-050/Makefile +=================================================================== +--- udev-050.orig/Makefile 2004-12-18 00:53:07.000000000 -0500 ++++ udev-050/Makefile 2005-01-21 19:23:45.699728872 -0500 +@@ -114,16 +114,18 @@ + CFLAGS := -pipe + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DLOG ++ override CFLAGS += -DLOG + endif + + # if DEBUG is enabled, then we do not strip or optimize ++override CFLAGS += -D_GNU_SOURCE + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE ++ CFLAGS += -O1 -g ++ override CFLAGS += -DDEBUG + LDFLAGS += -Wl,-warn-common + STRIPCMD = /bin/true -Since_we_are_debugging + else +- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE ++ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer + LDFLAGS += -s -Wl,-warn-common + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment + endif +@@ -144,8 +146,8 @@ + + CRT0 = $(KLIBC_DIR)/crt0.o + LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) +- CFLAGS += $(WARNINGS) -nostdinc \ +- $(OPTFLAGS) \ ++ CFLAGS += $(WARNINGS) $(OPTFLAGS) ++ override CFLAGS += -nostdinc \ + -D__KLIBC__ -fno-builtin-printf \ + -I$(KLIBC_FIXUPS_DIR) \ + -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ +@@ -155,12 +157,13 @@ + -I$(GCCINCDIR) \ + -I$(LINUX_INCLUDE_DIR) + LIB_OBJS = +- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs ++ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs + else + WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + CRT0 = + LIBC = +- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) ++ CFLAGS += $(WARNINGS) ++ override CFLAGS += -I$(GCCINCDIR) + LIB_OBJS = -lc + LDFLAGS = + endif +@@ -170,8 +173,8 @@ + LIB_OBJS += -lselinux + endif + +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ +- -I$(PWD)/libsysfs ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++ -I$(PWD)/libsysfs + + # config files automatically generated + GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf diff --git a/packages/udev/udev-050/kill_logname.patch b/packages/udev/udev-050/kill_logname.patch index e69de29bb2..4e30ab444e 100644 --- a/packages/udev/udev-050/kill_logname.patch +++ b/packages/udev/udev-050/kill_logname.patch @@ -0,0 +1,12 @@ +Index: udev-050/extras/volume_id/udev_volume_id.c +=================================================================== +--- udev-050.orig/extras/volume_id/udev_volume_id.c 2004-12-18 00:53:07.000000000 -0500 ++++ udev-050/extras/volume_id/udev_volume_id.c 2005-01-21 19:26:44.992472232 -0500 +@@ -37,7 +37,6 @@ + #define BLKGETSIZE64 _IOR(0x12,114,size_t) + + #ifdef LOG +-unsigned char logname[LOGNAME_SIZE]; + void log_message(int level, const char *format, ...) + { + va_list args; diff --git a/packages/udev/udev-054/.mtn2git_empty b/packages/udev/udev-054/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-054/.mtn2git_empty diff --git a/packages/udev/udev-054/flags.patch b/packages/udev/udev-054/flags.patch index e69de29bb2..2bd9a364da 100644 --- a/packages/udev/udev-054/flags.patch +++ b/packages/udev/udev-054/flags.patch @@ -0,0 +1,75 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: udev-054/Makefile +=================================================================== +--- udev-054.orig/Makefile 2005-02-25 21:18:21.000000000 -0600 ++++ udev-054/Makefile 2005-02-26 01:06:10.000000000 -0600 +@@ -154,20 +154,22 @@ + + SYSFS = $(PWD)/libsysfs/sysfs.a + +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DLOG ++ override CFLAGS += -DLOG + endif + + # if DEBUG is enabled, then we do not strip or optimize ++override CFLAGS += -D_GNU_SOURCE + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE ++ CFLAGS += -O1 -g ++ override CFLAGS += -DDEBUG + LDFLAGS += -Wl,-warn-common + STRIPCMD = /bin/true -Since_we_are_debugging + else +- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE ++ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer + LDFLAGS += -s -Wl,-warn-common + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment + endif +@@ -187,8 +189,8 @@ + + CRT0 = $(KLIBC_DIR)/crt0.o + LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) +- CFLAGS += $(WARNINGS) -nostdinc \ +- $(OPTFLAGS) \ ++ CFLAGS += $(WARNINGS) $(OPTFLAGS) ++ override CFLAGS += -nostdinc \ + -D__KLIBC__ -fno-builtin-printf \ + -I$(KLIBC_FIXUPS_DIR) \ + -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ +@@ -198,7 +200,7 @@ + -I$(GCCINCDIR) \ + -I$(LINUX_INCLUDE_DIR) + LIB_OBJS = +- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs ++ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs + + HEADERS += \ + klibc_fixups/klibc_fixups.h \ +@@ -213,7 +215,8 @@ + WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + CRT0 = + LIBC = +- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) ++ CFLAGS += $(WARNINGS) ++ override CFLAGS += -I$(GCCINCDIR) + LIB_OBJS = -lc + LDFLAGS = + endif +@@ -221,7 +224,7 @@ + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-058/.mtn2git_empty b/packages/udev/udev-058/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-058/.mtn2git_empty diff --git a/packages/udev/udev-058/flags.patch b/packages/udev/udev-058/flags.patch index e69de29bb2..f67024dbb8 100644 --- a/packages/udev/udev-058/flags.patch +++ b/packages/udev/udev-058/flags.patch @@ -0,0 +1,40 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-058/Makefile~flags.patch ++++ udev-058/Makefile +@@ -153,16 +153,17 @@ + + SYSFS = $(PWD)/libsysfs/sysfs.a + +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG ++ CFLAGS += -O1 -g ++ override CFLAGS += -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging + else +@@ -178,9 +179,9 @@ + KLCC = $(KLIBC_INSTALL)/bin/klcc + CC = $(KLCC) + LD = $(KLCC) +- LDFLAGS += -static ++ override LDFLAGS += -static + else +- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations ++ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + endif + + ifeq ($(strip $(USE_SELINUX)),true) diff --git a/packages/udev/udev_050.bb b/packages/udev/udev_050.bb index e69de29bb2..be616b5493 100644 --- a/packages/udev/udev_050.bb +++ b/packages/udev/udev_050.bb @@ -0,0 +1,8 @@ +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://flags.patch;patch=1 \ + file://tmpfs.patch;patch=1 \ + file://noasmlinkage.patch;patch=1 \ + file://kill_logname.patch;patch=1 \ + file://init" + +include udev.inc diff --git a/packages/udev/udev_054.bb b/packages/udev/udev_054.bb index e69de29bb2..4c54c56b57 100644 --- a/packages/udev/udev_054.bb +++ b/packages/udev/udev_054.bb @@ -0,0 +1,7 @@ +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://flags.patch;patch=1 \ + file://tmpfs.patch;patch=1 \ + file://noasmlinkage.patch;patch=1 \ + file://init" + +include udev.inc |