|
@@ -1,13 +1,13 @@
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
%define debug false
|
|
|
-%define udev_scriptdir /lib/udev
|
|
|
-%define firmwaredir /lib/firmware
|
|
|
+%define udev_scriptdir /usr/lib/udev
|
|
|
+%define firmwaredir /usr/lib/firmware
|
|
|
|
|
|
Summary: A userspace implementation of devfs
|
|
|
Summary(ja): ユーザスペース実装のデバイスファイルシステム
|
|
|
Name: eudev
|
|
|
-Version: 3.2.10
|
|
|
+Version: 3.2.14
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: system
|
|
@@ -15,8 +15,8 @@ Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: daisuke
|
|
|
|
|
|
-URL: https://github.com/gentoo/eudev
|
|
|
-Source: https://dev.gentoo.org/~blueness/%{name}/%{name}-%{version}.tar.gz
|
|
|
+URL: https://github.com/eudev-project/eudev
|
|
|
+Source: https://github.com/eudev-project/eudev/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
|
|
Source1: start_udev
|
|
|
Source3: udev-post.init
|
|
|
Source4: fw_unit_symlinks.sh
|
|
@@ -131,7 +131,7 @@ dynamic library, which provides access to udev device information.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch1002 -p1 -b .vine
|
|
|
+%patch1002 -p1 -b .blkid
|
|
|
%patch1003 -p1 -b .vine
|
|
|
|
|
|
|
|
@@ -140,14 +140,12 @@ autoreconf -if
|
|
|
%configure \
|
|
|
--disable-selinux \
|
|
|
--prefix=%{_prefix} \
|
|
|
- --with-rootprefix= \
|
|
|
--sysconfdir=%{_sysconfdir} \
|
|
|
- --exec-prefix="" \
|
|
|
- --bindir="/sbin" \
|
|
|
- --sbindir="/sbin" \
|
|
|
- --libexecdir=/lib \
|
|
|
- --with-rootlibdir=/%{_lib} \
|
|
|
- --with-rootlibexecdir=/lib/udev \
|
|
|
+ --bindir="%{_sbindir}" \
|
|
|
+ --sbindir="%{_sbindir}" \
|
|
|
+ --libexecdir=%{_libexecdir} \
|
|
|
+ --with-rootlibdir=%{_libdir} \
|
|
|
+ --with-rootlibexecdir=/usr/lib/udev \
|
|
|
--enable-introspection \
|
|
|
--enable-manpages \
|
|
|
--enable-static
|
|
@@ -156,71 +154,67 @@ make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+rm -rf %{buildroot}
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
|
|
|
+mkdir -p %{buildroot}%{_sbindir}
|
|
|
|
|
|
-make DESTDIR=$RPM_BUILD_ROOT install
|
|
|
+make DESTDIR=%{buildroot} install
|
|
|
|
|
|
-rm -fr $RPM_BUILD_ROOT%{_docdir}/udev
|
|
|
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
|
|
+rm -fr %{buildroot}%{_docdir}/udev
|
|
|
+rm -f %{buildroot}/%{_libdir}/*.la
|
|
|
|
|
|
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
|
|
|
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
|
|
|
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
|
|
|
+rm -f %{buildroot}%{_sysconfdir}/udev/udev.rules
|
|
|
+rm -f %{buildroot}%{_sysconfdir}/init.d/udev
|
|
|
+rm -f %{buildroot}%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,makedev.d,scripts,devices}
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
|
|
-touch $RPM_BUILD_ROOT%{_sysconfdir}/scsi_id.config
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/udev/{rules.d,makedev.d,scripts,devices}
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/dev.d
|
|
|
+mkdir -p %{buildroot}%{_bindir}
|
|
|
+touch %{buildroot}%{_sysconfdir}/scsi_id.config
|
|
|
|
|
|
# force relative symlinks
|
|
|
-ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id
|
|
|
+ln -sf ../lib/udev/scsi_id %{buildroot}%{_sbindir}/scsi_id
|
|
|
|
|
|
-ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevinfo
|
|
|
-ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevtest
|
|
|
-ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevmonitor
|
|
|
+ln -sf ../sbin/udevadm %{buildroot}%{_bindir}/udevinfo
|
|
|
+ln -sf ../sbin/udevadm %{buildroot}%{_bindir}/udevtest
|
|
|
+ln -sf udevadm %{buildroot}%{_sbindir}/udevmonitor
|
|
|
|
|
|
-ln -sf udevadm $RPM_BUILD_ROOT/sbin/udevtrigger
|
|
|
-ln -sf udevadm $RPM_BUILD_ROOT/sbin/udevsettle
|
|
|
-ln -sf udevadm $RPM_BUILD_ROOT/sbin/udevcontrol
|
|
|
+ln -sf udevadm %{buildroot}%{_sbindir}/udevtrigger
|
|
|
+ln -sf udevadm %{buildroot}%{_sbindir}/udevsettle
|
|
|
+ln -sf udevadm %{buildroot}%{_sbindir}/udevcontrol
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
|
|
|
+mkdir -p %{buildroot}%{udev_scriptdir}/{,devices}
|
|
|
|
|
|
for i in \
|
|
|
%ifarch ppc ppc64
|
|
|
rules/arch/40-ppc.rules \
|
|
|
%endif
|
|
|
; do
|
|
|
- install -m 0644 "$i" "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}"
|
|
|
+ install -m 0644 "$i" "%{buildroot}%{udev_scriptdir}/rules.d/${i##*/}"
|
|
|
done
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
|
|
|
+mkdir -p %{buildroot}%{udev_scriptdir}/{,devices}
|
|
|
|
|
|
-install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{udev_scriptdir}/fw_unit_symlinks.sh
|
|
|
+install -m 0755 %{SOURCE4} %{buildroot}%{udev_scriptdir}/fw_unit_symlinks.sh
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
|
|
|
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
|
|
|
+mkdir -p %{buildroot}%{_datadir}/udev
|
|
|
+install -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}/start_udev
|
|
|
|
|
|
-mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
|
|
|
+mkdir -p -m 0755 %{buildroot}%{firmwaredir}
|
|
|
|
|
|
-mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
|
|
|
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/floppy-pnp.conf <<EOF
|
|
|
+mkdir -p -m 0755 %{buildroot}%{_sysconfdir}/modprobe.d
|
|
|
+cat > %{buildroot}%{_sysconfdir}/modprobe.d/floppy-pnp.conf <<EOF
|
|
|
alias pnp:dPNP0700 floppy
|
|
|
alias acpi:PNP0700: floppy
|
|
|
EOF
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
|
|
|
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
|
|
|
+install -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/rc.d/init.d/udev-post
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
|
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/udev
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
|
|
|
+install -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/udev
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT/var/lib/udev/makedev.d
|
|
|
-
|
|
|
-
|
|
|
-%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+mkdir -p %{buildroot}/var/lib/udev/makedev.d
|
|
|
|
|
|
|
|
|
%pre
|
|
@@ -230,6 +224,25 @@ getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
|
|
|
getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
|
|
|
getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
|
|
|
|
|
|
+if [ ! -L /lib -a -d /lib/udev -a ! -d /usr/lib/udev ]; then
|
|
|
+ cp -af /lib/udev /usr/lib/udev && \
|
|
|
+ mv -f /lib/udev /lib/udev.old && \
|
|
|
+ ln -sf ../usr/lib/udev /lib/udev && \
|
|
|
+ rm -rf /lib/udev.old
|
|
|
+fi
|
|
|
+if [ ! -e /lib/udev ]; then
|
|
|
+ ln -sf ../usr/lib/udev /lib/udev
|
|
|
+fi
|
|
|
+if [ ! -L /lib -a -d /lib/firmware -a ! -d /usr/lib/firmware ]; then
|
|
|
+ cp -af /lib/firmware /usr/lib/firmware && \
|
|
|
+ mv -f /lib/firmware /lib/firmware.old && \
|
|
|
+ ln -sf ../usr/lib/firmware /lib/firmware && \
|
|
|
+ rm -rf /lib/firmware.old
|
|
|
+fi
|
|
|
+if [ ! -e /lib/firmware ]; then
|
|
|
+ ln -sf ../usr/lib/firmware /lib/firmware
|
|
|
+fi
|
|
|
+
|
|
|
%preun
|
|
|
if [ $1 = 0 -a -f %{_initrddir}/udev ]; then
|
|
|
if [ -x /sbin/pidof ]; then
|
|
@@ -245,6 +258,18 @@ if [ "$1" = 0 ]; then
|
|
|
fi
|
|
|
exit 0
|
|
|
|
|
|
+%postun
|
|
|
+if [ "$1" = 0 ]; then
|
|
|
+ rm -f /sbin/scsi_id
|
|
|
+ rm -f /sbin/start_udev
|
|
|
+ rm -f /sbin/udevd
|
|
|
+ rm -f /sbin/udevadm
|
|
|
+ rm -f /sbin/udevcontrol
|
|
|
+ rm -f /sbin/udevtrigger
|
|
|
+ rm -f /sbin/udevsettle
|
|
|
+fi
|
|
|
+exit 0
|
|
|
+
|
|
|
%post
|
|
|
if [ "$1" -ge "1" -a -x /sbin/pidof ]; then
|
|
|
pid=$(/sbin/pidof udevd)
|
|
@@ -255,48 +280,79 @@ if [ "$1" -ge "1" -a -x /sbin/pidof ]; then
|
|
|
fi
|
|
|
exit 0
|
|
|
|
|
|
+%triggerpostun -- %{name} < 3.2.14-1
|
|
|
+if [ -d /bin -a ! -L /bin ]; then
|
|
|
+ if [ ! -L /sbin/udevadm ]; then
|
|
|
+ ln -sf ../../%{udev_scriptdir}/scsi_id /sbin/scsi_id
|
|
|
+ ln -sf ../usr/sbin/start_udev /sbin/start_udev
|
|
|
+ ln -sf ../usr/sbin/udevd /sbin/udevd
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevadm
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevcontrol
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevtrigger
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevsettle
|
|
|
+ fi
|
|
|
+fi
|
|
|
+if [ ! -e /lib/udev ]; then
|
|
|
+ ln -sf ../usr/lib/udev /lib/udev
|
|
|
+fi
|
|
|
+if [ ! -e /lib/firmware ]; then
|
|
|
+ ln -sf ../usr/lib/firmware /lib/firmware
|
|
|
+fi
|
|
|
+
|
|
|
%posttrans
|
|
|
udevadm hwdb --update > /dev/null 2>&1 || :
|
|
|
/sbin/chkconfig --add udev-post
|
|
|
|
|
|
+if [ -d /bin -a ! -L /bin ]; then
|
|
|
+ if [ ! -L /sbin/udevadm ]; then
|
|
|
+ ln -sf ../../%{udev_scriptdir}/scsi_id /sbin/scsi_id
|
|
|
+ ln -sf ../usr/sbin/start_udev /sbin/start_udev
|
|
|
+ ln -sf ../usr/sbin/udevd /sbin/udevd
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevadm
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevcontrol
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevtrigger
|
|
|
+ ln -sf ../usr/sbin/udevadm /sbin/udevsettle
|
|
|
+ fi
|
|
|
+fi
|
|
|
+if [ ! -e /lib/udev ]; then
|
|
|
+ ln -sf ../usr/lib/udev /lib/udev
|
|
|
+fi
|
|
|
+if [ ! -e /lib/firmware ]; then
|
|
|
+ ln -sf ../usr/lib/firmware /lib/firmware
|
|
|
+fi
|
|
|
+
|
|
|
%triggerpostun -- dev <= 0:3.21-1vl1
|
|
|
if [ $2 = 0 ]; then
|
|
|
- if [ -x /sbin/MAKEDEV ]; then
|
|
|
- /sbin/MAKEDEV null
|
|
|
- /sbin/MAKEDEV console
|
|
|
- else
|
|
|
- /bin/mknod /dev/null c 1 3
|
|
|
- /bin/mknod /dev/console c 5 1
|
|
|
- fi
|
|
|
- if [ "$(/sbin/kernelversion)" == "2.6" ] &&
|
|
|
- [ $(($(uname -r |cut -f1 -d-|cut -f3 -d.))) -gt 15 ]
|
|
|
- then
|
|
|
- /sbin/start_udev >/dev/null 2>&1
|
|
|
- if [ -e /dev/mapper/control -a -x /sbin/lvm ]; then
|
|
|
- /sbin/lvm vgmknodes >/dev/null 2>&1
|
|
|
+ if [ -x /sbin/MAKEDEV ]; then
|
|
|
+ /sbin/MAKEDEV null
|
|
|
+ /sbin/MAKEDEV console
|
|
|
+ else
|
|
|
+ /bin/mknod /dev/null c 1 3
|
|
|
+ /bin/mknod /dev/console c 5 1
|
|
|
+ fi
|
|
|
+ if [ "$(/sbin/kernelversion)" == "2.6" ] &&
|
|
|
+ [ $(($(uname -r |cut -f1 -d-|cut -f3 -d.))) -gt 15 ]
|
|
|
+ then
|
|
|
+ /sbin/start_udev >/dev/null 2>&1
|
|
|
+ if [ -e /dev/mapper/control -a -x /sbin/lvm ]; then
|
|
|
+ /sbin/lvm vgmknodes >/dev/null 2>&1
|
|
|
+ fi
|
|
|
fi
|
|
|
- fi
|
|
|
fi
|
|
|
exit 0
|
|
|
|
|
|
-%ldconfig_scriptlets libudev
|
|
|
-
|
|
|
-%if %{build_compat32}
|
|
|
-%ldconfig_scriptlets -n compat32-%{name}-libudev
|
|
|
-%endif
|
|
|
-
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
%license COPYING
|
|
|
%doc README
|
|
|
-%attr(0755,root,root) /sbin/udevadm
|
|
|
-%attr(0755,root,root) /sbin/udevd
|
|
|
-%attr(0755,root,root) /sbin/start_udev
|
|
|
-/sbin/udevcontrol
|
|
|
-/sbin/udevtrigger
|
|
|
-/sbin/udevsettle
|
|
|
-/sbin/scsi_id
|
|
|
+%attr(0755,root,root) %{_sbindir}/udevadm
|
|
|
+%attr(0755,root,root) %{_sbindir}/udevd
|
|
|
+%attr(0755,root,root) %{_sbindir}/start_udev
|
|
|
+%{_sbindir}/udevcontrol
|
|
|
+%{_sbindir}/udevtrigger
|
|
|
+%{_sbindir}/udevsettle
|
|
|
+%{_sbindir}/scsi_id
|
|
|
%attr(0755,root,root) %{udev_scriptdir}/ata_id
|
|
|
%attr(0755,root,root) %{udev_scriptdir}/cdrom_id
|
|
|
%attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
|
|
@@ -315,23 +371,7 @@ exit 0
|
|
|
%attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
|
|
|
|
|
|
%dir %{_sysconfdir}/udev/hwdb.d
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-OUI.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-acpi-vendor.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-net-ifname.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-pci-classes.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-pci-vendor-model.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-sdio-classes.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-sdio-vendor-model.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-usb-classes.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-usb-vendor-model.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/20-vmbus-class.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/60-evdev.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/60-keyboard.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/60-sensor.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/70-mouse.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/70-pointingstick.hwdb
|
|
|
-%{_sysconfdir}/udev/hwdb.d/70-touchpad.hwdb
|
|
|
+%{_sysconfdir}/udev/hwdb.d/*.hwdb
|
|
|
|
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
|
|
|
|
|
@@ -344,6 +384,7 @@ exit 0
|
|
|
|
|
|
%dir %attr(0755,root,root) %{firmwaredir}
|
|
|
%{_mandir}/man8/udev*.8*
|
|
|
+%{_mandir}/man7/hwdb.7*
|
|
|
%{_mandir}/man7/udev*.7*
|
|
|
%{_mandir}/man5/udev*.5*
|
|
|
|
|
@@ -355,12 +396,14 @@ exit 0
|
|
|
%ghost %dir %{_sysconfdir}/udev/devices/
|
|
|
%ghost %dir %{_sysconfdir}/dev.d/
|
|
|
|
|
|
+%attr(0755,root,root) %{udev_scriptdir}/dmi_memory_id
|
|
|
+%attr(0755,root,root) %{udev_scriptdir}/fido_id
|
|
|
%attr(0755,root,root) %{udev_scriptdir}/scsi_id
|
|
|
%attr(0755,root,root) %{udev_scriptdir}/v4l_id
|
|
|
|
|
|
%files libudev
|
|
|
%defattr(-,root,root,-)
|
|
|
-/%{_lib}/libudev.so.*
|
|
|
+%{_libdir}/libudev.so.*
|
|
|
|
|
|
%files libudev-devel
|
|
|
%defattr(-,root,root,-)
|
|
@@ -378,7 +421,7 @@ exit 0
|
|
|
%if %{build_compat32}
|
|
|
%files -n compat32-%{name}-libudev
|
|
|
%defattr(-,root,root,-)
|
|
|
-/%{_lib}/libudev.so.*
|
|
|
+%{_libdir}/libudev.so.*
|
|
|
|
|
|
%files -n compat32-%{name}-libudev-devel
|
|
|
%defattr(-,root,root,-)
|
|
@@ -387,6 +430,10 @@ exit 0
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Jul 02 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.14-1
|
|
|
+- new upstream release.
|
|
|
+- prepared usrmerge.
|
|
|
+
|
|
|
* Thu Feb 25 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.10-1
|
|
|
- new upstream release.
|
|
|
|