Package: udev
Version: 151-2
Severity: wishlist
Tags: patch d-i
Hi Marco,
please consider adding an udeb containing the few additional components
needed by X11 for the graphical installer. Frans said he preferred not
touching the existing udeb at all, rather adding an extra one only
xserver-xorg-core-udeb would depend upon. The attached patch adds one
named udev-gtk-udeb, the gtk bit being only for consistency with the
existing {rootskel,cdebconf,…}-gtk ones; feel free to call it *x11* or
whatever instead.
Comments about this udev udeb can be found in the following mails:
http://lists.debian.org/debian-boot/2010/02/msg00481.html
http://lists.debian.org/debian-boot/2010/02/msg00487.html
http://lists.debian.org/debian-boot/2010/02/msg00775.html
I got a green light for adding/submitting patches for the new udebs:
http://lists.debian.org/debian-boot/2010/03/msg00029.html
The udeb dependencies in the resulting image:
http://people.debian.org/~kibi/di-x11/2010-02-27/intra-deps.png
http://people.debian.org/~kibi/di-x11/2010-02-27/intra-deps.svg
Thanks for considering.
Mraw,
KiBi.
diff -u udev-151/debian/changelog udev-151/debian/changelog
--- udev-151/debian/changelog
+++ udev-151/debian/changelog
@@ -1,3 +1,12 @@
+udev (151-3) unstable; urgency=low
+
+ * Add udeb needed for the graphical installer: udev-gtk-udeb.
+ - Basically the same as a possible libudev0-udeb.
+ - Additionally ship input_id and 60-persistent-input.rules
+ since they are needed by the X server.
+
+ -- Cyril Brulebois <[email protected]> Wed, 24 Feb 2010 23:38:41 +0000
+
udev (151-2) unstable; urgency=high
* Build-depend on libc6.1 on alpha and ia64. (Closes: #569956)
diff -u udev-151/debian/control udev-151/debian/control
--- udev-151/debian/control
+++ udev-151/debian/control
@@ -45,6 +45,20 @@
.
This is a minimal version, only for use in the installation system.
+Package: udev-gtk-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev-udeb
+Description: libudev shared library
+ This library provides access to udev device information.
+ .
+ This is a minimal version, only for use in the installation system.
+ .
+ It additionally contains input_id and an extra rule for use by the X
+ server.
+
Package: libgudev-1.0-0
Section: libs
Priority: optional
diff -u udev-151/debian/rules udev-151/debian/rules
--- udev-151/debian/rules
+++ udev-151/debian/rules
@@ -11,6 +11,7 @@
D := $(CURDIR)/debian/udev
DU := $(CURDIR)/debian/udev-udeb
+DGU:= $(CURDIR)/debian/udev-gtk-udeb
CONFFLAGS := --prefix=/usr --sysconfdir=/etc --sbindir=/sbin \
--with-rootlibdir=/lib --libexecdir=/lib/udev \
@@ -92,6 +93,7 @@
$(MAKE) install DESTDIR=$D
dh_movefiles --sourcedir=debian/udev
+ cp -r debian/libudev0/lib $(DGU)
cd $D && rm -r usr/lib/pkgconfig/ usr/include/ usr/share/gtk-doc/ \
usr/lib/*.la
@@ -127,6 +129,9 @@
cp rules/debian/*.rules $(DU)/lib/udev/rules.d/
cd $(DU)/lib/udev/rules.d/ && rm 60-persistent-storage-tape.rules
echo 'MODE="0666"' > $(DU)/lib/udev/rules.d/91-permissions.rules
+ # Needed for X:
+ mkdir -p $(DGU)/lib/udev/rules.d
+ cp $(D)/lib/udev/rules.d/60-persistent-input.rules $(DGU)/lib/udev/rules.d
install --mode=755 $(addprefix build-udeb/udev/, udevd udevadm) \
$(DU)/sbin/
@@ -135,6 +140,9 @@
path_id/path_id scsi_id/scsi_id usb_id/usb_id ) \
extras/rule_generator/write_*_rules extra/firmware.agent \
$(DU)/lib/udev/
+ # Extra, need to be taken from a make install, would be a shell
+ # wrapper otherwise (since it uses libudev):
+ cp $(D)/lib/udev/input_id $(DGU)/lib/udev
install --mode=644 extras/rule_generator/rule_generator.functions \
extra/hotplug.functions \
$(DU)/lib/udev/
@@ -172,7 +180,7 @@
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -- -c4
+ dh_makeshlibs --add-udeb=udev-gtk-udeb -- -c4
dh_shlibdeps --exclude=/lib/udev/udev-acl -- --warnings=7
dh_girepository
dh_installdeb
