X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=66a0335e1a3173e8b1833579292d6efc69eb2f28;hb=5dbbb84edc018b8d4324fa7345a9948dc9f05733;hp=ee7de22af8f1221a5b8df314a860083ce0601693;hpb=d9591b1394c4ccf883ee8fea3cfc28f562c419a0;p=packages%2Fgeninitrd.git diff --git a/geninitrd.spec b/geninitrd.spec index ee7de22..66a0335 100644 --- a/geninitrd.spec +++ b/geninitrd.spec @@ -1,56 +1,50 @@ -### TODO: -# - BUG: you can't set in /etc/mdadm.conf: -# DEVICE partitions containers -# (which is default BTW if none set). Generation of initrd will fail -# Summary: Creates an initial ramdisk image for preloading modules Summary(pl.UTF-8): Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu Name: geninitrd -Version: 10000.30 -# leave rel 1 for ac -Release: 2 +Version: 12787 +Release: 9 License: GPL Group: Applications/System Source0: %{name}-%{version}.tar.gz -# Source0-md5: 793cd8d78c5e148a9dd8fe9d0cf4ad5a -Patch0: %{name}-romfs.patch -Patch1: %{name}-gzip-compressor.patch -Patch2: %{name}-tuxonice_on_dm.patch +# Source0-md5: 35b12ef61ee1e29692d67afd94731697 +Patch0: %{name}-git.patch +Patch1: %{name}-static-dev.patch +Patch2: %{name}-posix-sh.patch +URL: http://git.pld-linux.org/?p=projects/geninitrd.git BuildRequires: xmlto >= 0:0.0.18-1 Requires: /usr/bin/ldd Requires: awk -Requires: busybox-initrd > 1.00-4 +Requires: busybox-implementation >= 1.30.0-1 Requires: coreutils Requires: cpio Requires: fileutils -Requires: genromfs +Requires: glibc-misc Requires: gzip +Requires: libgcc Requires: mktemp >= 1.5-8 -Requires: module-init-tools >= 3.2.2-6 Requires: mount Requires: pci-database >= 0.4 Requires: rc-scripts >= 0.2.7 Requires: tar -%if "%{pld_release}" == "ti" -Requires: lvm2-initrd -Requires: mdadm-initrd >= 1.12.0-1 -%else +Requires: virtual(module-tools) +Requires: xz +Suggests: genromfs +Suggests: pciutils +Obsoletes: mkinitrd +# suggest for blkid +%if "%{pld_release}" == "ac" # otherwise LVM subsystem is not enabled in geninitrd Suggests: lvm2-initrd # without this softraid installations of PLD fail Suggests: mdadm-initrd >= 1.12.0-1 -%endif -# suggest for blkid -%if "%{pld_release}" != "ac" -Suggests: util-linux-ng-initrd -%endif -Obsoletes: mkinitrd -%if "%{pld_release}" == "ac" Conflicts: grubby < 5.0.4-3.1 %else Conflicts: grubby < 6.0.24-3 %endif -Conflicts: udev-initrd < 1:104 +Conflicts: kmod < 7-2 +Conflicts: module-init-tools < 3.2.2-6 +Conflicts: pciutils < 2.2.9 +Conflicts: udev-initrd < 1:168 Conflicts: xz < 4.999.9 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -88,10 +82,8 @@ bieżących informacji zawartych w /etc/modules.conf. %prep %setup -q -%if "%{pld_release}" == "ti" %patch0 -p1 %patch1 -p1 -%endif %patch2 -p1 %build @@ -99,7 +91,6 @@ bieżących informacji zawartych w /etc/modules.conf. %install rm -rf $RPM_BUILD_ROOT - %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -115,4 +106,9 @@ rm -rf $RPM_BUILD_ROOT %dir /lib/geninitrd /lib/geninitrd/functions +/lib/geninitrd/functions.initrd /lib/geninitrd/mod-*.sh +%attr(755,root,root) /lib/geninitrd/extract-ikconfig + +%dir /lib/geninitrd/udev-rules +/lib/geninitrd/udev-rules/*.rules