summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-11-29 13:23:40 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-16 21:11:42 +0100
commitf95109e3e04ee167fd0ceb80e62f7cfec81802de (patch)
tree31609bacbafd899d66e434c9ef9e7a5253104a2f
parent57001b5b5224e0f0413a5a2271676f80095f47c4 (diff)
downloadmeta-openembedded-f95109e3e04ee167fd0ceb80e62f7cfec81802de.tar.gz
udev: remove from meta-oe
* udev-182 is now also in oe-core, there is quite big diff between meta-oe version and oe-core version but I guess that most of meta-oe users are now also using meta-systemd layer and udev provided by systemd recipe * sending as RFC because I'm using udev provided by systemd recipe and cannot test this properly on my targets, please test and report Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch45
-rw-r--r--meta-oe/recipes-core/udev/udev/cache24
-rw-r--r--meta-oe/recipes-core/udev/udev/default4
-rw-r--r--meta-oe/recipes-core/udev/udev/gtk-doc.make230
-rw-r--r--meta-oe/recipes-core/udev/udev/init73
-rw-r--r--meta-oe/recipes-core/udev/udev/modprobe.rules17
-rw-r--r--meta-oe/recipes-core/udev/udev/touchscreen.rules18
-rw-r--r--meta-oe/recipes-core/udev/udev_173.bb116
-rw-r--r--meta-oe/recipes-core/udev/udev_175.bb91
-rw-r--r--meta-oe/recipes-core/udev/udev_182.bb86
10 files changed, 0 insertions, 704 deletions
diff --git a/meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch b/meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch
deleted file mode 100644
index baf5acdee1..0000000000
--- a/meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 85dcc3a22951d3586b05e3305d735f33b84ee3e5 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 16 May 2011 14:11:01 +0200
4Subject: [PATCH] rip put doc generation, it depends on a working doctools setup
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 Makefile.am | 21 +--------------------
9 1 files changed, 1 insertions(+), 20 deletions(-)
10
11diff --git a/Makefile.am b/Makefile.am
12index 651a154..69eb9d9 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -174,26 +174,7 @@ udev_udevadm_LDADD = libudev/libudev-private.la
16 # ------------------------------------------------------------------------------
17 # udev man pages
18 # ------------------------------------------------------------------------------
19-dist_man_MANS = \
20- udev/udev.7 \
21- udev/udevadm.8 \
22- udev/udevd.8
23-
24-dist_noinst_DATA = \
25- udev/udev.html \
26- udev/udevadm.html \
27- udev/udevd.html
28-
29-EXTRA_DIST += \
30- udev/udev.xml \
31- udev/udevadm.xml \
32- udev/udevd.xml
33-
34-udev/%.7 udev/%.8 : udev/%.xml
35- $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
36-
37-udev/%.html : udev/%.xml
38- $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
39+dist_man_MANS =
40
41 # ------------------------------------------------------------------------------
42 # udev tests
43--
441.6.6.1
45
diff --git a/meta-oe/recipes-core/udev/udev/cache b/meta-oe/recipes-core/udev/udev/cache
deleted file mode 100644
index 6936170b85..0000000000
--- a/meta-oe/recipes-core/udev/udev/cache
+++ /dev/null
@@ -1,24 +0,0 @@
1#!/bin/sh -e
2
3export TZ=/etc/localtime
4
5[ -f /etc/default/udev ] && . /etc/default/udev
6
7echo "Caching udev devnodes"
8
9if [ "$DEVCACHE" != "" ]; then
10 echo -n "Populating dev cache"
11 (cd /; tar cf $DEVCACHE dev)
12 mv /tmp/uname /etc/udev/saved.uname
13 mv /tmp/cmdline /etc/udev/saved.cmdline
14 mv /tmp/devices /etc/udev/saved.devices
15 mv /tmp/atags /etc/udev/saved.atags
16 echo
17else
18 rm -f /tmp/uname
19 rm -f /tmp/cmdline
20 rm -f /tmp/devices
21 rm -f /tmp/atags
22fi
23
24exit 0
diff --git a/meta-oe/recipes-core/udev/udev/default b/meta-oe/recipes-core/udev/udev/default
deleted file mode 100644
index 5c4937a9a0..0000000000
--- a/meta-oe/recipes-core/udev/udev/default
+++ /dev/null
@@ -1,4 +0,0 @@
1# Default for /etc/init.d/udev
2
3# Comment this out to disable device cache
4DEVCACHE="/etc/dev.tar"
diff --git a/meta-oe/recipes-core/udev/udev/gtk-doc.make b/meta-oe/recipes-core/udev/udev/gtk-doc.make
deleted file mode 100644
index 57fab98686..0000000000
--- a/meta-oe/recipes-core/udev/udev/gtk-doc.make
+++ /dev/null
@@ -1,230 +0,0 @@
1# -*- mode: makefile -*-
2
3####################################
4# Everything below here is generic #
5####################################
6
7if GTK_DOC_USE_LIBTOOL
8GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
10GTKDOC_RUN = $(LIBTOOL) --mode=execute
11else
12GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
13GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
14GTKDOC_RUN =
15endif
16
17# We set GPATH here; this gives us semantics for GNU make
18# which are more like other make's VPATH, when it comes to
19# whether a source that is a target of one rule is then
20# searched for in VPATH/GPATH.
21#
22GPATH = $(srcdir)
23
24TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
25
26EXTRA_DIST = \
27 $(content_files) \
28 $(HTML_IMAGES) \
29 $(DOC_MAIN_SGML_FILE) \
30 $(DOC_MODULE)-sections.txt \
31 $(DOC_MODULE)-overrides.txt
32
33DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
34 pdf-build.stamp \
35 $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
36 $(srcdir)/pdf.stamp
37
38SCANOBJ_FILES = \
39 $(DOC_MODULE).args \
40 $(DOC_MODULE).hierarchy \
41 $(DOC_MODULE).interfaces \
42 $(DOC_MODULE).prerequisites \
43 $(DOC_MODULE).signals
44
45REPORT_FILES = \
46 $(DOC_MODULE)-undocumented.txt \
47 $(DOC_MODULE)-undeclared.txt \
48 $(DOC_MODULE)-unused.txt
49
50CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
51
52if ENABLE_GTK_DOC
53if GTK_DOC_BUILD_HTML
54HTML_BUILD_STAMP=html-build.stamp
55else
56HTML_BUILD_STAMP=
57endif
58if GTK_DOC_BUILD_PDF
59PDF_BUILD_STAMP=pdf-build.stamp
60else
61PDF_BUILD_STAMP=
62endif
63
64all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
65else
66all-local:
67endif
68
69docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
70
71$(REPORT_FILES): sgml-build.stamp
72
73#### scan ####
74
75scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
76 @echo 'gtk-doc: Scanning header files'
77 @-chmod -R u+w $(srcdir)
78 @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
79 _source_dir="$${_source_dir} --source-dir=$$i" ; \
80 done ; \
81 cd $(srcdir) && \
82 gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
83 @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
84 CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
85 else \
86 cd $(srcdir) ; \
87 for i in $(SCANOBJ_FILES) ; do \
88 test -f $$i || touch $$i ; \
89 done \
90 fi
91 @touch scan-build.stamp
92
93$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
94 @true
95
96#### templates ####
97
98tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
99 @echo 'gtk-doc: Rebuilding template files'
100 @-chmod -R u+w $(srcdir)
101 @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
102 @touch tmpl-build.stamp
103
104tmpl.stamp: tmpl-build.stamp
105 @true
106
107$(srcdir)/tmpl/*.sgml:
108 @true
109
110#### xml ####
111
112sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
113 @echo 'gtk-doc: Building XML'
114 @-chmod -R u+w $(srcdir)
115 @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
116 _source_dir="$${_source_dir} --source-dir=$$i" ; \
117 done ; \
118 cd $(srcdir) && \
119 gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
120 @touch sgml-build.stamp
121
122sgml.stamp: sgml-build.stamp
123 @true
124
125#### html ####
126
127html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
128 @echo 'gtk-doc: Building HTML'
129 @-chmod -R u+w $(srcdir)
130 @rm -rf $(srcdir)/html
131 @mkdir $(srcdir)/html
132 @mkhtml_options=""; \
133 gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
134 if test "$(?)" = "0"; then \
135 mkhtml_options=--path="$(srcdir)"; \
136 fi; \
137 cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
138 @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
139 @echo 'gtk-doc: Fixing cross-references'
140 @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
141 @touch html-build.stamp
142
143#### pdf ####
144
145pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
146 @echo 'gtk-doc: Building PDF'
147 @-chmod -R u+w $(srcdir)
148 @rm -rf $(srcdir)/$(DOC_MODULE).pdf
149 @mkpdf_imgdirs=""; \
150 if test "x$(HTML_IMAGES)" != "x"; then \
151 for img in $(HTML_IMAGES); do \
152 part=`dirname $$img`; \
153 echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
154 if test $$? != 0; then \
155 mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
156 fi; \
157 done; \
158 fi; \
159 cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
160 @touch pdf-build.stamp
161
162##############
163
164clean-local:
165 rm -f *~ *.bak
166 rm -rf .libs
167
168distclean-local:
169 cd $(srcdir) && \
170 rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
171 $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
172
173maintainer-clean-local: clean
174 cd $(srcdir) && rm -rf xml html
175
176install-data-local:
177 @installfiles=`echo $(srcdir)/html/*`; \
178 if test "$$installfiles" = '$(srcdir)/html/*'; \
179 then echo '-- Nothing to install' ; \
180 else \
181 if test -n "$(DOC_MODULE_VERSION)"; then \
182 installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
183 else \
184 installdir="$(DESTDIR)$(TARGET_DIR)"; \
185 fi; \
186 $(mkinstalldirs) $${installdir} ; \
187 for i in $$installfiles; do \
188 echo '-- Installing '$$i ; \
189 $(INSTALL_DATA) $$i $${installdir}; \
190 done; \
191 if test -n "$(DOC_MODULE_VERSION)"; then \
192 mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
193 $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
194 mv -f $${installdir}/$(DOC_MODULE).devhelp \
195 $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
196 fi; \
197 $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
198 fi
199
200uninstall-local:
201 @if test -n "$(DOC_MODULE_VERSION)"; then \
202 installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
203 else \
204 installdir="$(DESTDIR)$(TARGET_DIR)"; \
205 fi; \
206 rm -rf $${installdir}
207
208#
209# Require gtk-doc when making dist
210#
211if ENABLE_GTK_DOC
212dist-check-gtkdoc:
213else
214dist-check-gtkdoc:
215 @echo "*** gtk-doc must be installed and enabled in order to make dist"
216 @false
217endif
218
219dist-hook: dist-check-gtkdoc dist-hook-local
220 mkdir $(distdir)/tmpl
221 mkdir $(distdir)/html
222 -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
223 cp $(srcdir)/html/* $(distdir)/html
224 -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
225 -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
226 -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
227 cd $(distdir) && rm -f $(DISTCLEANFILES)
228 $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
229
230.PHONY : dist-hook-local docs
diff --git a/meta-oe/recipes-core/udev/udev/init b/meta-oe/recipes-core/udev/udev/init
deleted file mode 100644
index d160300abd..0000000000
--- a/meta-oe/recipes-core/udev/udev/init
+++ /dev/null
@@ -1,73 +0,0 @@
1#!/bin/sh
2
3### BEGIN INIT INFO
4# Provides: udev
5# Required-Start: mountvirtfs
6# Required-Stop:
7# Default-Start: S
8# Default-Stop:
9# Short-Description: Start udevd, populate /dev and load drivers.
10### END INIT INFO
11
12export TZ=/etc/localtime
13
14[ -d /sys/class ] || exit 1
15[ -r /proc/mounts ] || exit 1
16[ -x /sbin/udevd ] || exit 1
17[ -f /etc/default/udev ] && . /etc/default/udev
18[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
19
20kill_udevd() {
21 pid=`pidof -x udevd`
22 [ -n "$pid" ] && kill $pid
23}
24
25export ACTION=add
26# propagate /dev from /sys
27echo "Starting udev"
28
29# mount the tmpfs on /dev, if not already done
30LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
31 mount -n -o mode=0755 -t tmpfs none "/dev"
32 mkdir -m 0755 /dev/pts
33 mkdir -m 1777 /dev/shm
34}
35
36if [ "$DEVCACHE" != "" ]; then
37 # Invalidate udev cache if the kernel or its bootargs/cmdline have changed
38 [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname
39 [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline
40 [ -r /proc/devices ] && cat /proc/devices > /tmp/devices || touch /tmp/devices
41 [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags
42 if [ -e $DEVCACHE ] && \
43 cmp -s /tmp/uname /etc/udev/saved.uname && \
44 cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \
45 cmp -s /tmp/devices /etc/udev/saved.devices && \
46 cmp -s /tmp/atags /etc/udev/saved.atags; then
47 (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
48 not_first_boot=1
49 fi
50fi
51
52if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then
53 mkdir -p /lib/modules/$(uname -r)
54 depmod -ae
55fi
56
57# make_extra_nodes
58kill_udevd > "/dev/null" 2>&1
59
60# trigger the sorted events
61echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
62/sbin/udevd -d
63
64/sbin/udevadm control --env STARTUP=1
65if [ "$not_first_boot" != "" ];then
66 /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform --action=add
67 (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
68else
69 /sbin/udevadm trigger --action=add
70 /sbin/udevadm settle
71fi
72
73exit 0
diff --git a/meta-oe/recipes-core/udev/udev/modprobe.rules b/meta-oe/recipes-core/udev/udev/modprobe.rules
deleted file mode 100644
index d4a096b82b..0000000000
--- a/meta-oe/recipes-core/udev/udev/modprobe.rules
+++ /dev/null
@@ -1,17 +0,0 @@
1# There are a number of modifiers that are allowed to be used in some
2# of the different fields. They provide the following subsitutions:
3#
4# %n the "kernel number" of the device.
5# For example, 'sda3' has a "kernel number" of '3'
6# %e the smallest number for that name which does not matches an existing node
7# %k the kernel name for the device
8# %M the kernel major number for the device
9# %m the kernel minor number for the device
10# %b the bus id for the device
11# %c the string returned by the PROGRAM
12# %s{filename} the content of a sysfs attribute
13# %% the '%' char itself
14#
15
16# Try and modprobe for drivers for new hardware
17ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
diff --git a/meta-oe/recipes-core/udev/udev/touchscreen.rules b/meta-oe/recipes-core/udev/udev/touchscreen.rules
deleted file mode 100644
index d83fd1673d..0000000000
--- a/meta-oe/recipes-core/udev/udev/touchscreen.rules
+++ /dev/null
@@ -1,18 +0,0 @@
1# There are a number of modifiers that are allowed to be used in some
2# of the different fields. They provide the following subsitutions:
3#
4# %n the "kernel number" of the device.
5# For example, 'sda3' has a "kernel number" of '3'
6# %e the smallest number for that name which does not matches an existing node
7# %k the kernel name for the device
8# %M the kernel major number for the device
9# %m the kernel minor number for the device
10# %b the bus id for the device
11# %c the string returned by the PROGRAM
12# %s{filename} the content of a sysfs attribute
13# %% the '%' char itself
14#
15
16# Create a symlink to any touchscreen input device
17SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
18SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
diff --git a/meta-oe/recipes-core/udev/udev_173.bb b/meta-oe/recipes-core/udev/udev_173.bb
deleted file mode 100644
index 576302c761..0000000000
--- a/meta-oe/recipes-core/udev/udev_173.bb
+++ /dev/null
@@ -1,116 +0,0 @@
1DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
2/dev/, handles hotplug events and loads drivers at boot time. It replaces \
3the hotplug package and requires a kernel not older than 2.6.27."
4
5# udev 169 and up require kernel 2.6.36 for ARM:
6# http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f
7
8LICENSE = "GPLv2+ & LGPLv2.1+"
9LICENSE_${PN} = "GPLv2+"
10LICENSE_libudev = "LGPLv2.1+"
11LICENSE_libgudev = "LGPLv2.1+"
12LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
13 file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
14 file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
15
16# Needed for udev-extras
17DEPENDS = "gperf-native usbutils acl glib-2.0"
18
19PR = "r4"
20
21# version specific SRC_URI
22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.bz2 \
23 file://0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch \
24 file://gtk-doc.make"
25
26# generic SRC_URI
27SRC_URI += " \
28 file://touchscreen.rules \
29 file://modprobe.rules \
30 file://default \
31 file://init \
32 file://cache \
33"
34
35SRC_URI[md5sum] = "2afd20ee1c790eac6d7abe0498ebb414"
36SRC_URI[sha256sum] = "0f753ad9c3022a074d1c052bcee9139581db825283771ac78c0be0d1de109d0c"
37
38# Machine specific udev rules should be in their own recipe that ${PN} can add to RRECOMMENDS
39
40inherit update-rc.d autotools
41
42EXTRA_OECONF += " \
43 --disable-introspection \
44 --with-pci-ids-path=/usr/share/misc \
45 ac_cv_file__usr_share_pci_ids=no \
46 ac_cv_file__usr_share_hwdata_pci_ids=no \
47 ac_cv_file__usr_share_misc_pci_ids=yes \
48 --sbindir=${base_sbindir} \
49 --libexecdir=${base_libdir}/udev \
50 --with-rootlibdir=${base_libdir} \
51 --disable-gtk-doc-html \
52 --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
53"
54
55do_configure_prepend() {
56 cp ${WORKDIR}/gtk-doc.make ${S}
57}
58
59INITSCRIPT_NAME = "udev"
60INITSCRIPT_PARAMS = "start 04 S ."
61
62PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils udev-consolekit"
63
64FILES_${PN}-systemd = "${base_libdir}/systemd"
65RDEPENDS_${PN}-systemd += "udev"
66
67FILES_libudev = "${base_libdir}/libudev.so.*"
68FILES_libgudev = "${base_libdir}/libgudev*.so.*"
69
70FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
71
72RPROVIDES_${PN} = "hotplug"
73FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
74FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
75RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
76RRECOMMENDS_${PN} += "util-linux-blkid"
77
78# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
79# is ${prefix}/lib64
80FILES_${PN} += "/lib/udev*"
81FILES_${PN}-dbg += "/lib/udev/.debug"
82
83FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
84RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
85
86do_install () {
87 install -d ${D}${usrsbindir} \
88 ${D}${sbindir}
89 oe_runmake 'DESTDIR=${D}' INSTALL=install install
90 install -d ${D}${sysconfdir}/init.d
91 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
92 install -m 0755 ${WORKDIR}/cache ${D}${sysconfdir}/init.d/udev-cache
93
94 install -d ${D}${sysconfdir}/default
95 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
96
97 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
98
99 touch ${D}${sysconfdir}/udev/saved.uname
100 touch ${D}${sysconfdir}/udev/saved.cmdline
101 touch ${D}${sysconfdir}/udev/saved.devices
102 touch ${D}${sysconfdir}/udev/saved.atags
103
104 # disable udev-cache sysv script on systemd installs
105 ln -sf /dev/null ${D}/${base_libdir}/systemd/system/udev-cache.service
106}
107
108# Create the cache after checkroot has run
109pkg_postinst_udev_append() {
110 if test "x$D" != "x"; then
111 OPT="-r $D"
112 else
113 OPT="-s"
114 fi
115 update-rc.d $OPT udev-cache start 36 S .
116}
diff --git a/meta-oe/recipes-core/udev/udev_175.bb b/meta-oe/recipes-core/udev/udev_175.bb
deleted file mode 100644
index 2550db291a..0000000000
--- a/meta-oe/recipes-core/udev/udev_175.bb
+++ /dev/null
@@ -1,91 +0,0 @@
1DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
2/dev/, handles hotplug events and loads drivers at boot time. It replaces \
3the hotplug package and requires a kernel not older than 2.6.27."
4
5DEFAULT_PREFERENCE = "-1"
6
7# udev 169 and up require kernel 2.6.36 for ARM:
8# http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f
9
10LICENSE = "GPLv2+ & LGPLv2.1+"
11LICENSE_${PN} = "GPLv2+"
12LICENSE_libudev = "LGPLv2.1+"
13LICENSE_libgudev = "LGPLv2.1+"
14LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
15 file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
16 file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
17
18# Needed for udev-extras
19DEPENDS = "gperf-native usbutils acl glib-2.0"
20
21PR = "r1"
22
23# 6f410b81aa6d588b03ae795c9b76468591ef7efa -> 175 tag
24SRCREV = "6f410b81aa6d588b03ae795c9b76468591ef7efa"
25
26# version specific SRC_URI
27SRC_URI = "git://git.kernel.org/pub/scm/linux/hotplug/udev.git;protocol=git \
28 file://0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch \
29 file://gtk-doc.make"
30
31# generic SRC_URI
32SRC_URI += " \
33 file://touchscreen.rules \
34 file://modprobe.rules \
35"
36
37S = "${WORKDIR}/git"
38
39# Machine specific udev rules should be in their own recipe that ${PN} can add to RRECOMMENDS
40
41inherit autotools
42
43EXTRA_OECONF += " \
44 --disable-introspection \
45 --with-pci-ids-path=/usr/share/misc \
46 ac_cv_file__usr_share_pci_ids=no \
47 ac_cv_file__usr_share_hwdata_pci_ids=no \
48 ac_cv_file__usr_share_misc_pci_ids=yes \
49 --sbindir=${base_sbindir} \
50 --libexecdir=${base_libdir}/udev \
51 --with-rootlibdir=${base_libdir} \
52 --disable-gtk-doc-html \
53 --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
54"
55
56do_configure_prepend() {
57 cp ${WORKDIR}/gtk-doc.make ${S}
58}
59
60PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils udev-consolekit"
61
62FILES_${PN}-systemd = "${systemd_unitdir}"
63RDEPENDS_${PN}-systemd += "udev"
64
65FILES_libudev = "${base_libdir}/libudev.so.*"
66FILES_libgudev = "${base_libdir}/libgudev*.so.*"
67
68FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
69
70RPROVIDES_${PN} = "hotplug"
71FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
72FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
73RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
74RRECOMMENDS_${PN} += "util-linux-blkid"
75
76# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
77# is ${prefix}/lib64
78FILES_${PN} += "/lib/udev*"
79FILES_${PN}-dbg += "/lib/udev/.debug"
80
81FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
82RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
83
84do_install () {
85 install -d ${D}${usrsbindir} \
86 ${D}${sbindir}
87 oe_runmake 'DESTDIR=${D}' INSTALL=install install
88
89 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
90}
91
diff --git a/meta-oe/recipes-core/udev/udev_182.bb b/meta-oe/recipes-core/udev/udev_182.bb
deleted file mode 100644
index 7d88aed926..0000000000
--- a/meta-oe/recipes-core/udev/udev_182.bb
+++ /dev/null
@@ -1,86 +0,0 @@
1DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
2/dev/, handles hotplug events and loads drivers at boot time."
3
4# udev 169 and up require kernel 2.6.36 for ARM:
5# http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f
6
7LICENSE = "GPLv2+ & LGPLv2.1+"
8LICENSE_${PN} = "GPLv2+"
9LICENSE_libudev = "LGPLv2.1+"
10LICENSE_libgudev = "LGPLv2.1+"
11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://src/COPYING;md5=17c4e5fb495e6707ac92a3864926f979 \
13 file://src/gudev/COPYING;md5=fb494485a7d0505308cb68e4997cc266"
14
15PR = "r1"
16# glib-2.0: Needed for udev-extras
17# util-linux: Needed for libblkid
18# kmod: needed for libkmod
19DEPENDS = "gperf-native usbutils acl glib-2.0 util-linux kmod"
20
21# version specific SRC_URI
22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/${P}.tar.gz \
23 file://gtk-doc.make"
24SRC_URI[md5sum] = "1b964456177fbf48023dfee7db3a708d"
25SRC_URI[sha256sum] = "7857ed19fafd8f3ca8de410194e8c7336e9eb8a20626ea8a4ba6449b017faba4"
26
27# generic SRC_URI
28SRC_URI += " \
29 file://touchscreen.rules \
30 file://modprobe.rules \
31"
32
33# Machine specific udev rules should be in their own recipe that ${PN} can add to RRECOMMENDS
34
35inherit autotools
36
37EXTRA_OECONF += " \
38 --disable-introspection \
39 --with-pci-ids-path=/usr/share/misc \
40 ac_cv_file__usr_share_pci_ids=no \
41 ac_cv_file__usr_share_hwdata_pci_ids=no \
42 ac_cv_file__usr_share_misc_pci_ids=yes \
43 --sbindir=${base_sbindir} \
44 --libexecdir=${base_libdir} \
45 --with-rootlibdir=${base_libdir} \
46 --with-rootprefix= \
47 --disable-gtk-doc-html \
48 --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
49"
50
51do_configure_prepend() {
52 cp ${WORKDIR}/gtk-doc.make ${S}
53}
54
55LDFLAGS_prepend-libc-uclibc = " -lrt "
56PACKAGES =+ "${PN}-systemd libudev libgudev udev-consolekit udev-utils"
57
58FILES_${PN}-systemd = "${systemd_unitdir}"
59RDEPENDS_${PN}-systemd += "udev"
60
61FILES_libudev = "${base_libdir}/libudev.so.*"
62FILES_libgudev = "${base_libdir}/libgudev*.so.*"
63
64RDEPENDS_${PN} += "udev-utils"
65RPROVIDES_${PN} = "hotplug"
66FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
67FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
68
69# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
70# is ${prefix}/lib64
71FILES_${PN} += "/lib/udev*"
72FILES_${PN}-dbg += "/lib/udev/.debug"
73
74FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
75RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
76
77FILES_udev-utils = "${bindir}/udevadm"
78
79do_install () {
80 install -d ${D}${usrsbindir} \
81 ${D}${sbindir}
82 oe_runmake 'DESTDIR=${D}' INSTALL=install install
83
84 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
85}
86