summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/udev/udev-042/flags.patch67
-rw-r--r--packages/udev/udev-050/.mtn2git_empty0
-rw-r--r--packages/udev/udev-050/flags.patch69
-rw-r--r--packages/udev/udev-050/kill_logname.patch12
-rw-r--r--packages/udev/udev-054/.mtn2git_empty0
-rw-r--r--packages/udev/udev-054/flags.patch75
-rw-r--r--packages/udev/udev-063/.mtn2git_empty (renamed from packages/udev/udev-042/.mtn2git_empty)0
-rw-r--r--packages/udev/udev-063/flags.patch53
-rw-r--r--packages/udev/udev-063/noasmlinkage.patch38
-rw-r--r--packages/udev/udev.inc4
-rw-r--r--packages/udev/udev_050.bb8
-rw-r--r--packages/udev/udev_054.bb7
-rw-r--r--packages/udev/udev_058.bb5
-rw-r--r--packages/udev/udev_063.bb (renamed from packages/udev/udev_042.bb)10
14 files changed, 101 insertions, 247 deletions
diff --git a/packages/udev/udev-042/flags.patch b/packages/udev/udev-042/flags.patch
deleted file mode 100644
index a5a791df33..0000000000
--- a/packages/udev/udev-042/flags.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-
-#
-# 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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/udev/udev-050/.mtn2git_empty
+++ /dev/null
diff --git a/packages/udev/udev-050/flags.patch b/packages/udev/udev-050/flags.patch
deleted file mode 100644
index b59825f7ac..0000000000
--- a/packages/udev/udev-050/flags.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-
-#
-# 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
deleted file mode 100644
index 4e30ab444e..0000000000
--- a/packages/udev/udev-050/kill_logname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/udev/udev-054/.mtn2git_empty
+++ /dev/null
diff --git a/packages/udev/udev-054/flags.patch b/packages/udev/udev-054/flags.patch
deleted file mode 100644
index 2bd9a364da..0000000000
--- a/packages/udev/udev-054/flags.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#
-# 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-042/.mtn2git_empty b/packages/udev/udev-063/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/udev/udev-042/.mtn2git_empty
+++ b/packages/udev/udev-063/.mtn2git_empty
diff --git a/packages/udev/udev-063/flags.patch b/packages/udev/udev-063/flags.patch
new file mode 100644
index 0000000000..e6969f2f63
--- /dev/null
+++ b/packages/udev/udev-063/flags.patch
@@ -0,0 +1,53 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- udev-062/Makefile~flags.patch
++++ udev-062/Makefile
+@@ -151,16 +151,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
+@@ -176,19 +177,20 @@
+ KLCC = $(KLIBC_INSTALL)/bin/$(CROSS)klcc
+ CC = $(KLCC)
+ LD = $(KLCC)
++ 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)
+ UDEV_OBJS += udev_selinux.o
+ LIB_OBJS += -lselinux
+- CFLAGS += -DUSE_SELINUX
++ override CFLAGS += -DUSE_SELINUX
+ endif
+
+ ifeq ($(strip $(USE_STATIC)),true)
+- CFLAGS += -DUSE_STATIC
+- LDFLAGS += -static
++ override CFLAGS += -DUSE_STATIC
++ override LDFLAGS += -static
+ endif
+
+ ifeq ($(strip $(V)),false)
diff --git a/packages/udev/udev-063/noasmlinkage.patch b/packages/udev/udev-063/noasmlinkage.patch
new file mode 100644
index 0000000000..0d8e854c0e
--- /dev/null
+++ b/packages/udev/udev-063/noasmlinkage.patch
@@ -0,0 +1,38 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- udev-062/udev.c~noasmlinkage.patch
++++ udev-062/udev.c
+@@ -54,7 +54,7 @@
+ }
+ #endif
+
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ switch (signum) {
+ case SIGALRM:
+--- udev-062/udevd.c~noasmlinkage.patch
++++ udev-062/udevd.c
+@@ -639,7 +639,7 @@
+ return msg;
+ }
+
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ int rc;
+
+--- udev-062/udevstart.c~noasmlinkage.patch
++++ udev-062/udevstart.c
+@@ -323,7 +323,7 @@
+ exec_list(&device_list);
+ }
+
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ switch (signum) {
+ case SIGALRM:
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 0648034276..00abd36ba2 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -1,7 +1,6 @@
DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
LICENSE = "GPL"
-PR = "r3"
UDEV_DEVFS_RULES ?= "0"
@@ -37,4 +36,7 @@ do_install () {
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/
}
+
diff --git a/packages/udev/udev_050.bb b/packages/udev/udev_050.bb
deleted file mode 100644
index be616b5493..0000000000
--- a/packages/udev/udev_050.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 4c54c56b57..0000000000
--- a/packages/udev/udev_054.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb
index 20f49ac7c5..539e7aedb8 100644
--- a/packages/udev/udev_058.bb
+++ b/packages/udev/udev_058.bb
@@ -8,8 +8,3 @@ include udev.inc
PR = "r3"
# CFLAGS += -I${STAGING_INCDIR}/sysfs
-
-do_install_append() {
- install -d ${D}${sysconfdir}/udev/rules.d/
- install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/
-}
diff --git a/packages/udev/udev_042.bb b/packages/udev/udev_063.bb
index af03818cfd..60340ca175 100644
--- a/packages/udev/udev_042.bb
+++ b/packages/udev/udev_063.bb
@@ -1,9 +1,13 @@
-PR = "r3"
-
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://flags.patch;patch=1 \
file://init"
include udev.inc
+
+PR = "r0"
+
+#FIXME a) udevd doesn't start with our init script (the init script seems to be pretty oudated)
+#FIXME b) lots of alignment errors when manually starting udevd
+DEFAULT_PREFERENCE = "-1"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 10:40:10 +0000