diff options
Diffstat (limited to 'recipes/udev/udev-static-124')
6 files changed, 0 insertions, 242 deletions
diff --git a/recipes/udev/udev-static-124/flags.patch b/recipes/udev/udev-static-124/flags.patch deleted file mode 100644 index 13f20eb6a8..0000000000 --- a/recipes/udev/udev-static-124/flags.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- - Makefile | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -Index: udev-115/Makefile -=================================================================== ---- udev-115.orig/Makefile 2007-08-24 01:29:54.000000000 +0200 -+++ udev-115/Makefile 2007-09-20 17:21:45.000000000 +0200 -@@ -112,39 +112,39 @@ - AR = $(CROSS_COMPILE)ar - RANLIB = $(CROSS_COMPILE)ranlib - --CFLAGS += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -+override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ - -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ - -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes --CFLAGS += $(WARNINGS) -+override CFLAGS += $(WARNINGS) - - LDFLAGS += -Wl,-warn-common,--as-needed - - OPTFLAGS = -Os --CFLAGS += $(OPTFLAGS) -+override CFLAGS += $(OPTFLAGS) - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DUSE_LOG -+ override CFLAGS += -DUSE_LOG - endif - - # if DEBUG is enabled, then we do not strip - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -DDEBUG -+ override CFLAGS += -DDEBUG - endif - - ifeq ($(strip $(USE_GCOV)),true) -- CFLAGS += -fprofile-arcs -ftest-coverage -+ override CFLAGS += -fprofile-arcs -ftest-coverage - LDFLAGS += -fprofile-arcs - endif - - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -lsepol -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(USE_STATIC)),true) -- CFLAGS += -DUSE_STATIC -+ override CFLAGS += -DUSE_STATIC - LDFLAGS += -static - endif - diff --git a/recipes/udev/udev-static-124/libvolume-id-soname.patch b/recipes/udev/udev-static-124/libvolume-id-soname.patch deleted file mode 100644 index 56365a4351..0000000000 --- a/recipes/udev/udev-static-124/libvolume-id-soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr udev-124-orig/extras/volume_id/lib/Makefile udev-124/extras/volume_id/lib/Makefile ---- udev-124-orig/extras/volume_id/lib/Makefile 2008-06-12 01:24:30.000000000 -0400 -+++ udev-124/extras/volume_id/lib/Makefile 2009-01-14 23:32:42.000000000 -0500 -@@ -113,7 +113,7 @@ - ifeq ($(libdir),$(usrlibdir)) - ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so - else -- ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so -+ ln -sf ../..$(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so - endif - $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig - $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc diff --git a/recipes/udev/udev-static-124/mtd-exclude-persistent.patch b/recipes/udev/udev-static-124/mtd-exclude-persistent.patch deleted file mode 100644 index 204b7b487d..0000000000 --- a/recipes/udev/udev-static-124/mtd-exclude-persistent.patch +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. - ---- a/etc/udev/rules.d/60-persistent-storage.rules 2008-06-12 07:24:30.000000000 +0200 -+++ b/etc/udev/rules.d/60-persistent-storage.rules 2009-08-18 11:39:23.595063264 +0200 -@@ -10,7 +10,7 @@ - SUBSYSTEM!="block", GOTO="persistent_storage_end" - - # skip rules for inappropriate block devices --KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end" -+KERNEL=="ram*|loop*|fd*|mtd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end" - - # never access non-cdrom removable ide devices, the drivers are causing event loops on open() - KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-static-124/noasmlinkage.patch b/recipes/udev/udev-static-124/noasmlinkage.patch deleted file mode 100644 index d58a7ea4de..0000000000 --- a/recipes/udev/udev-static-124/noasmlinkage.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -pru udev-124.orig/test-udev.c udev-124/test-udev.c ---- udev-124.orig/test-udev.c 2008-06-12 06:24:30.000000000 +0100 -+++ udev-124/test-udev.c 2008-07-07 14:43:37.000000000 +0100 -@@ -46,7 +46,7 @@ void log_message(int priority, const cha - } - #endif - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: -diff -pru udev-124.orig/udevd.c udev-124/udevd.c ---- udev-124.orig/udevd.c 2008-06-12 06:24:30.000000000 +0100 -+++ udev-124/udevd.c 2008-07-07 14:43:58.000000000 +0100 -@@ -87,7 +87,7 @@ void log_message(int priority, const cha - - #endif - --static void asmlinkage udev_event_sig_handler(int signum) -+static void udev_event_sig_handler(int signum) - { - if (signum == SIGALRM) - exit(1); -@@ -798,7 +798,7 @@ static struct udevd_uevent_msg *get_netl - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGINT: -diff -pru udev-124.orig/udevmonitor.c udev-124/udevmonitor.c ---- udev-124.orig/udevmonitor.c 2008-06-12 06:24:30.000000000 +0100 -+++ udev-124/udevmonitor.c 2008-07-07 14:44:24.000000000 +0100 -@@ -97,7 +97,7 @@ static int init_uevent_netlink_sock(void - return 0; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - if (signum == SIGINT || signum == SIGTERM) - udev_exit = 1; diff --git a/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch b/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch deleted file mode 100644 index 5182542461..0000000000 --- a/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -pru udev-124.orig/udevtrigger.c udev-124/udevtrigger.c ---- udev-124.orig/udevtrigger.c 2008-06-12 06:24:30.000000000 +0100 -+++ udev-124/udevtrigger.c 2008-07-07 15:10:09.000000000 +0100 -@@ -42,6 +42,8 @@ static int dry_run; - LIST_HEAD(device_list); - LIST_HEAD(filter_subsystem_match_list); - LIST_HEAD(filter_subsystem_nomatch_list); -+LIST_HEAD(filter_kernel_match_list); -+LIST_HEAD(filter_kernel_nomatch_list); - LIST_HEAD(filter_attr_match_list); - LIST_HEAD(filter_attr_nomatch_list); - static int sock = -1; -@@ -331,6 +333,26 @@ static int attr_match(const char *path, - return 0; - } - -+static int kernel_filtered(const char *kernel) -+{ -+ struct name_entry *loop_name; -+ -+ /* skip devices matching the prohibited kernel device names */ -+ list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node) -+ if (fnmatch(loop_name->name, kernel, 0) == 0) -+ return 1; -+ -+ /* skip devices not matching the listed kernel device names */ -+ if (!list_empty(&filter_kernel_match_list)) { -+ list_for_each_entry(loop_name, &filter_kernel_match_list, node) -+ if (fnmatch(loop_name->name, kernel, 0) == 0) -+ return 0; -+ return 1; -+ } -+ -+ return 0; -+} -+ - static int attr_filtered(const char *path) - { - struct name_entry *loop_name; -@@ -409,6 +431,9 @@ static void scan_subsystem(const char *s - if (dent2->d_name[0] == '.') - continue; - -+ if (kernel_filtered(dent2->d_name)) -+ continue; -+ - strlcpy(dirname2, dirname, sizeof(dirname2)); - strlcat(dirname2, "/", sizeof(dirname2)); - strlcat(dirname2, dent2->d_name, sizeof(dirname2)); -@@ -465,6 +490,9 @@ static void scan_block(void) - if (!strcmp(dent2->d_name,"device")) - continue; - -+ if (kernel_filtered(dent2->d_name)) -+ continue; -+ - strlcpy(dirname2, dirname, sizeof(dirname2)); - strlcat(dirname2, "/", sizeof(dirname2)); - strlcat(dirname2, dent2->d_name, sizeof(dirname2)); -@@ -576,6 +604,8 @@ int udevtrigger(int argc, char *argv[], - { "subsystem-nomatch", 1, NULL, 'S' }, - { "attr-match", 1, NULL, 'a' }, - { "attr-nomatch", 1, NULL, 'A' }, -+ { "kernel-match", 1, NULL, 'k' }, -+ { "kernel-nomatch", 1, NULL, 'K' }, - { "env", 1, NULL, 'e' }, - {} - }; -@@ -622,6 +652,12 @@ int udevtrigger(int argc, char *argv[], - case 'A': - name_list_add(&filter_attr_nomatch_list, optarg, 0); - break; -+ case 'k': -+ name_list_add(&filter_kernel_match_list, optarg, 0); -+ break; -+ case 'K': -+ name_list_add(&filter_kernel_nomatch_list, optarg, 0); -+ break; - case 'h': - printf("Usage: udevadm trigger OPTIONS\n" - " --verbose print the list of devices while running\n" -@@ -632,6 +668,8 @@ int udevtrigger(int argc, char *argv[], - " --env=<KEY>=<value> pass an additional key (works only with --socket=)\n" - " --subsystem-match=<subsystem> trigger devices from a matching subystem\n" - " --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n" -+ " --kernel-match=<subsystem> trigger devices from a matching kernel device name\n" -+ " --kernel-nomatch=<subsystem> exclude devices from a matching kernel device name\n" - " --attr-match=<file[=<value>]> trigger devices with a matching sysfs\n" - " attribute\n" - " --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n" -@@ -701,6 +739,8 @@ int udevtrigger(int argc, char *argv[], - exit: - name_list_cleanup(&filter_subsystem_match_list); - name_list_cleanup(&filter_subsystem_nomatch_list); -+ name_list_cleanup(&filter_kernel_match_list); -+ name_list_cleanup(&filter_kernel_nomatch_list); - name_list_cleanup(&filter_attr_match_list); - name_list_cleanup(&filter_attr_nomatch_list); - diff --git a/recipes/udev/udev-static-124/vol_id_ld.patch b/recipes/udev/udev-static-124/vol_id_ld.patch deleted file mode 100644 index 11126eef8d..0000000000 --- a/recipes/udev/udev-static-124/vol_id_ld.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - extras/volume_id/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: udev-115/extras/volume_id/Makefile -=================================================================== ---- udev-115.orig/extras/volume_id/Makefile 2007-09-20 18:17:59.000000000 +0200 -+++ udev-115/extras/volume_id/Makefile 2007-09-20 18:18:08.000000000 +0200 -@@ -44,7 +44,7 @@ - ifeq ($(strip $(VOLUME_ID_STATIC)),true) - $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS) - else -- $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS) -+ $(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS) - endif - - # man pages |