|
@@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules.
|
|
|
Summary(ja): モジュールをプリロードするための初期RAMディスク(initramfs)作成ユーティリティ
|
|
|
Name: mkinitrd
|
|
|
Version: 6.0.93
|
|
|
-Release: 24%{?_dist_release}
|
|
|
+Release: 25%{?_dist_release}
|
|
|
License: GPLv2+
|
|
|
Group: System Environment/Base
|
|
|
|
|
@@ -30,6 +30,9 @@ Patch32: mkinitrd-6.0.93-no_scsi_wait_scan.patch
|
|
|
Patch33: mkinitrd-6.0.93-resolve-device-name.patch
|
|
|
Patch34: mkinitrd-6.0.93-firmware_copy_fix.patch
|
|
|
|
|
|
+Patch100: mkinitrd-modern-toolchain.patch
|
|
|
+Patch101: mkinitrd-function-adhoc.patch
|
|
|
+
|
|
|
ExclusiveOs: Linux
|
|
|
URL: git://git.fedoraproject.org/git/hosted/mkinitrd
|
|
|
Requires: /bin/sh, /sbin/modprobe, /sbin/losetup
|
|
@@ -117,10 +120,10 @@ nash
|
|
|
%patch31 -p1
|
|
|
%patch32 -p1
|
|
|
%patch33 -p0
|
|
|
+%patch100 -p1
|
|
|
+%patch101 -p1
|
|
|
%endif
|
|
|
|
|
|
-find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
|
|
|
-
|
|
|
%build
|
|
|
make LIB=%{_lib}
|
|
|
make LIB=%{_lib} test
|
|
@@ -130,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
|
|
|
rm -f $RPM_BUILD_ROOT/sbin/bdevid $RPM_BUILD_ROOT/%{_includedir}/blkent.h
|
|
|
|
|
|
+# conflicts with dracut
|
|
|
+rm -f %{buildroot}/sbin/lsinitrd
|
|
|
+
|
|
|
+
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
@@ -161,7 +168,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%defattr(-,root,root)
|
|
|
%attr(644,root,root) %{_mandir}/man8/nash.8*
|
|
|
%attr(755,root,root) /sbin/nash
|
|
|
-%attr(755,root,root) /sbin/lsinitrd
|
|
|
/%{_lib}/bdevid
|
|
|
%{_libdir}/libnash.so.*
|
|
|
%{_libdir}/libbdevid.so.*
|
|
@@ -170,6 +176,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%dir %{_sysconfdir}/kernel/prerm.d
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Sep 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.93-25
|
|
|
+- dropped /usr/sbin/lsinitrd: conflicts with dracut.
|
|
|
+- added Patch100 to build with current toolchain.
|
|
|
+- added Patch101.
|
|
|
+
|
|
|
* Sat Jul 22 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 6.0.93-24
|
|
|
- add patch34 for fix firmware copy error
|
|
|
- remove ppc if-endif
|