diff --git a/dracut.spec b/dracut.spec index 8eb63683638af2c759bbfe2bd8c4cd97e6573bf7..e7eae40e786b386067ab88def37bb0cfbe177644 100644 --- a/dracut.spec +++ b/dracut.spec @@ -7,18 +7,11 @@ # directory. %global __requires_exclude pkg-config - Name: dracut Version: 049 -Release: 6 +Release: 7 Summary: Initramfs generator using udev -%if 0%{?fedora} || 0%{?rhel} -Group: System Environment/Base -%endif -%if 0%{?suse_version} -Group: System/Base -%endif # The entire source code is GPLv2+ # except install/* which is LGPLv2+ @@ -50,7 +43,7 @@ BuildRequires: git BuildRequires: kmod-devel >= 23 BuildRequires: gcc -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} BuildRequires: pkgconfig BuildRequires: systemd %endif @@ -59,7 +52,7 @@ BuildRequires: bash-completion %endif %if %{with doc} -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} BuildRequires: docbook-style-xsl docbook-dtds libxslt %endif @@ -91,7 +84,7 @@ Requires: sed Requires: xz Requires: gzip -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} Recommends: hardlink Recommends: pigz Recommends: kpartx @@ -107,7 +100,7 @@ Requires: udev > 166 Requires: util-linux >= 2.21 %endif -%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} Requires: libkcapi-hmaccalc %endif @@ -226,7 +219,7 @@ make %{?_smp_mflags} install \ echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh -%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0 +%if 0%{?openEuler} == 0 && 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips %endif @@ -272,7 +265,7 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs install -m 0644 dracut.conf.d/openEuler.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/99-initramfs.conf -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse* %endif @@ -280,16 +273,15 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse* install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf %endif -%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999 +%if 0%{?openEuler} == 0 && 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999 rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd %endif -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf -# FIXME: remove after F30 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh %endif @@ -303,7 +295,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %{_bindir}/dracut %{_datadir}/bash-completion/completions/dracut %{_datadir}/bash-completion/completions/lsinitrd -%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 %{_bindir}/mkinitrd %{_bindir}/lsinitrd %endif @@ -318,7 +310,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %{dracutlibdir}/dracut-install %{dracutlibdir}/skipcpio %config(noreplace) %{_sysconfdir}/dracut.conf -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %{dracutlibdir}/dracut.conf.d/01-dist.conf %endif %{dracutlibdir}/dracut.conf.d/99-initramfs.conf @@ -330,7 +322,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %if %{with doc} %{_mandir}/man8/dracut.8* %{_mandir}/man8/*service.8* -%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 %{_mandir}/man8/mkinitrd.8* %{_mandir}/man1/lsinitrd.1* %endif @@ -349,7 +341,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %ifnarch s390 s390x %{dracutlibdir}/modules.d/00warpclock %endif -%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} %{dracutlibdir}/modules.d/01fips %endif %{dracutlibdir}/modules.d/01systemd-initrd @@ -432,7 +424,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %{_unitdir}/initrd.target.wants/dracut-pre-udev.service %endif -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} %{_prefix}/lib/kernel/install.d/50-dracut.install %endif @@ -483,13 +475,16 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %files config-rescue %{dracutlibdir}/dracut.conf.d/02-rescue.conf -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel} %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install -# FIXME: remove after F30 %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh %endif %changelog +* Fri Mar 20 2020 openEuler Buildteam - 049-7 +- Add judgement of openEuler + * Mon Feb 24 2020 openEuler Buildteam - 049-6 - Change requires of dracut-squash from squash-tools to squashfs-tools