Accepting request 923450 from home:afeijoo:branches:openSUSE:Factory

- Update to version 055+suse.129.g7d8c3ce3:
  * fix(kernel-modules): add blk_mq_alloc_disk and blk_cleanup_disk to blockfuncs (bsc#1190326)
  * docs: update SUSE maintainers doc
  * fix(suse): add 60-io-scheduler.rules (bsc#1188713)
  * revert: remove /sbin/installkernel script from dracut package
  * spec: modernize specfile constructs

OBS-URL: https://build.opensuse.org/request/show/923450
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=447
This commit is contained in:
Thomas Blume 2021-10-12 11:47:42 +00:00 committed by Git OBS Bridge
parent 168a0516d6
commit a06615d7fb
7 changed files with 22 additions and 25 deletions

View File

@ -19,7 +19,7 @@ name in the first line. Also add bugzilla and fate references in their own line:
rm dracut*.xz
rm dracut*.obscpio
osc service localrun
osc service manualrun
osc ar
osc commit
osc sr

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/opensuse/dracut.git</param>
<param name="changesrevision">145ca72ef8c12b3b43e7075ede7b7f5999e11b51</param></service></servicedata>
<param name="changesrevision">6397abc2685f1b609c5227b6075fd76275836d99</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b1d9945b47d9ba36ebe768ba9a9649db1fec84a17eb84683bf12401bf1143e0
size 1920524

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35e73b52407d284c330935ab568aa01f1b5871c1ca9832a2287f7b0b974c0da5
size 1916428

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Oct 06 08:28:14 UTC 2021 - antonio.feijoo@suse.com
- Update to version 055+suse.129.g7d8c3ce3:
* fix(kernel-modules): add blk_mq_alloc_disk and blk_cleanup_disk to blockfuncs (bsc#1190326)
* docs: update SUSE maintainers doc
* fix(suse): add 60-io-scheduler.rules (bsc#1188713)
* revert: remove /sbin/installkernel script from dracut package
* spec: modernize specfile constructs
-------------------------------------------------------------------
Thu Sep 30 12:15:25 UTC 2021 - antonio.feijoo@suse.com

View File

@ -1,5 +1,5 @@
name: dracut
version: 055+suse.119.g6c4187af
mtime: 1632230935
commit: 6c4187af03e841a8212f975d21ae688ce2292190
version: 055+suse.129.g7d8c3ce3
mtime: 1633002866
commit: 763a70093015ac85cd84eb7203b57d14c78475b1

View File

@ -19,7 +19,7 @@
%define dracutlibdir %{_prefix}/lib/dracut
Name: dracut
Version: 055+suse.119.g6c4187af
Version: 055+suse.129.g7d8c3ce3
Release: 0
Summary: Initramfs generator using udev
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -59,7 +59,6 @@ Requires: xz
Conflicts: btrfsprogs < 3.18
# suse-module-tools >= 16.0.3 is prepared for the removal of mkinitrd-suse.sh
Conflicts: suse-module-tools < 16.0.3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%description
@ -127,17 +126,17 @@ This package contains the legacy initrd script for dracut.
Call dracut directly instead.
%prep
%setup -q
%autosetup
%build
%configure\
--systemdsystemunitdir=%{_unitdir}\
--bashcompletiondir=%{_datarootdir}/bash-completion/completions \
--libdir=%{_prefix}/lib
make all CFLAGS="%{optflags}" %{?_smp_mflags}
%make_build all CFLAGS="%{optflags}" %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh
@ -156,7 +155,6 @@ install -m 0644 suse/s390x_persistent_device.conf %{buildroot}%{_sysconfdir}/dra
%endif
install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/%{_sbindir}/mkinitrd
install -D -m 0755 suse/dracut-installkernel %{buildroot}/%{_sbindir}/installkernel
mv %{buildroot}%{_mandir}/man8/mkinitrd-suse.8 %{buildroot}%{_mandir}/man8/mkinitrd.8
@ -168,8 +166,6 @@ mv %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh %{buildroot}/%{
ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh
%endif
%pre
%post
# check whether /var/run has been converted to a symlink
if [ ! -L /var/run ]; then
@ -197,8 +193,6 @@ fi
%post ima
%{?regenerate_initrd_post}
%preun
%postun
%{?regenerate_initrd_post}
@ -218,13 +212,11 @@ fi
%{?regenerate_initrd_posttrans}
%files fips
%defattr(-,root,root,0755)
%license COPYING
%config %{_sysconfdir}/dracut.conf.d/40-fips.conf
%{dracutlibdir}/modules.d/01fips
%files ima
%defattr(-,root,root,0755)
%license COPYING
%config %{_sysconfdir}/dracut.conf.d/40-ima.conf
%{dracutlibdir}/modules.d/96securityfs
@ -232,7 +224,6 @@ fi
%{dracutlibdir}/modules.d/98integrity
%files tools
%defattr(-,root,root,0755)
%{_bindir}/dracut-catimages
%{_mandir}/man8/dracut-catimages.8*
%dir /boot/dracut
@ -240,7 +231,6 @@ fi
%dir %{_localstatedir}/lib/dracut/overlay
%files extra
%defattr(-,root,root,0755)
%license COPYING
%{dracutlibdir}/modules.d/00mksh
@ -256,19 +246,16 @@ fi
%{dracutlibdir}/modules.d/95znet
%files mkinitrd-deprecated
%defattr(-,root,root,0755)
%{_sbindir}/mkinitrd
%{_mandir}/man8/mkinitrd.8*
%files
%defattr(-,root,root,0755)
%license COPYING
%doc README.md NEWS.md AUTHORS dracut.html
%doc docs/README.cross docs/README.generic docs/README.kernel
%doc docs/HACKING.md docs/dracut.png docs/dracut.svg
%{_bindir}/dracut
%{_bindir}/lsinitrd
%{_sbindir}/installkernel
%{_datarootdir}/bash-completion/completions/lsinitrd
%{_datadir}/pkgconfig/dracut.pc