Compare commits

...

2 Commits

Author SHA1 Message Date
David Abdurachmanov b09cdf1fae
Revert all previous riscv64 hacks
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-10-17 16:41:08 +03:00
David Abdurachmanov a5f1ebf897
Rever all previous changes
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-10-17 16:39:37 +03:00
1 changed files with 20 additions and 12 deletions

View File

@ -2,7 +2,7 @@
Summary: Collection of basic system utilities Summary: Collection of basic system utilities
Name: util-linux Name: util-linux
Version: 2.38.1 Version: 2.38.1
Release: 1.0.riscv64%{?dist}.rvre1 Release: 1.1.riscv64%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
URL: https://en.wikipedia.org/wiki/Util-linux URL: https://en.wikipedia.org/wiki/Util-linux
@ -22,7 +22,7 @@ BuildRequires: gettext-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: readline-devel BuildRequires: readline-devel
#BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: popt-devel BuildRequires: popt-devel
BuildRequires: libutempter-devel BuildRequires: libutempter-devel
@ -77,7 +77,7 @@ Provides: /sbin/nologin
Provides: /sbin/findfs Provides: /sbin/findfs
Requires(post): coreutils Requires(post): coreutils
#Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth
Requires: audit-libs >= 1.0.6 Requires: audit-libs >= 1.0.6
Requires: libuuid = %{version}-%{release} Requires: libuuid = %{version}-%{release}
Requires: libblkid = %{version}-%{release} Requires: libblkid = %{version}-%{release}
@ -301,7 +301,7 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
--disable-silent-rules \ --disable-silent-rules \
--disable-bfs \ --disable-bfs \
--disable-pg \ --disable-pg \
--disable-chfn-chsh \ --enable-chfn-chsh \
--enable-usrdir-path \ --enable-usrdir-path \
--enable-write \ --enable-write \
--disable-raw \ --disable-raw \
@ -474,6 +474,8 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
%attr(4755,root,root) %{_bindir}/su
%attr(755,root,root) %{_bindir}/login
%attr(2755,root,tty) %{_bindir}/write %attr(2755,root,tty) %{_bindir}/write
%{_unitdir}/fstrim.* %{_unitdir}/fstrim.*
@ -538,6 +540,7 @@ fi
%{_mandir}/man1/irqtop.1* %{_mandir}/man1/irqtop.1*
%{_mandir}/man1/last.1* %{_mandir}/man1/last.1*
%{_mandir}/man1/lastb.1* %{_mandir}/man1/lastb.1*
%{_mandir}/man1/login.1*
%{_mandir}/man1/look.1* %{_mandir}/man1/look.1*
%{_mandir}/man1/lscpu.1* %{_mandir}/man1/lscpu.1*
%{_mandir}/man1/lsfd.1* %{_mandir}/man1/lsfd.1*
@ -551,11 +554,13 @@ fi
%{_mandir}/man1/prlimit.1* %{_mandir}/man1/prlimit.1*
%{_mandir}/man1/rename.1* %{_mandir}/man1/rename.1*
%{_mandir}/man1/rev.1* %{_mandir}/man1/rev.1*
%{_mandir}/man1/runuser.1*
%{_mandir}/man1/script.1* %{_mandir}/man1/script.1*
%{_mandir}/man1/scriptlive.1* %{_mandir}/man1/scriptlive.1*
%{_mandir}/man1/scriptreplay.1* %{_mandir}/man1/scriptreplay.1*
%{_mandir}/man1/setpriv.1* %{_mandir}/man1/setpriv.1*
%{_mandir}/man1/setterm.1* %{_mandir}/man1/setterm.1*
%{_mandir}/man1/su.1*
%{_mandir}/man1/uclampset.1.* %{_mandir}/man1/uclampset.1.*
%{_mandir}/man1/ul.1* %{_mandir}/man1/ul.1*
%{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/utmpdump.1.gz
@ -621,6 +626,7 @@ fi
%{_sbindir}/resizepart %{_sbindir}/resizepart
%{_sbindir}/rfkill %{_sbindir}/rfkill
%{_sbindir}/rtcwake %{_sbindir}/rtcwake
%{_sbindir}/runuser
%{_sbindir}/sulogin %{_sbindir}/sulogin
%{_sbindir}/swaplabel %{_sbindir}/swaplabel
%{_sbindir}/wipefs %{_sbindir}/wipefs
@ -677,12 +683,14 @@ fi
%{compldir}/rev %{compldir}/rev
%{compldir}/rfkill %{compldir}/rfkill
%{compldir}/rtcwake %{compldir}/rtcwake
%{compldir}/runuser
%{compldir}/script %{compldir}/script
%{compldir}/scriptlive %{compldir}/scriptlive
%{compldir}/scriptreplay %{compldir}/scriptreplay
%{compldir}/setarch %{compldir}/setarch
%{compldir}/setpriv %{compldir}/setpriv
%{compldir}/setterm %{compldir}/setterm
%{compldir}/su
%{compldir}/swaplabel %{compldir}/swaplabel
%{compldir}/uclampset %{compldir}/uclampset
%{compldir}/ul %{compldir}/ul
@ -814,6 +822,12 @@ fi
%files -n util-linux-user %files -n util-linux-user
%config(noreplace) %{_sysconfdir}/pam.d/chfn %config(noreplace) %{_sysconfdir}/pam.d/chfn
%config(noreplace) %{_sysconfdir}/pam.d/chsh %config(noreplace) %{_sysconfdir}/pam.d/chsh
%attr(4711,root,root) %{_bindir}/chfn
%attr(4711,root,root) %{_bindir}/chsh
%{_mandir}/man1/chfn.1*
%{_mandir}/man1/chsh.1*
%{compldir}/chfn
%{compldir}/chsh
%files -n uuidd %files -n uuidd
@ -895,14 +909,8 @@ fi
%{_libdir}/python*/site-packages/libmount/ %{_libdir}/python*/site-packages/libmount/
%changelog %changelog
* Mon Sep 26 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2.38.1-1.0.riscv64.rvre1 * Mon Oct 17 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2.38.1-1.0.riscv64
- Remove pam (bootstrap) - Revert all previous custom riscv64 changes
* Mon Sep 26 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2.38.1-1.rvre1
- Rebuilt for Fedora/RISCV (riscv64)
* Thu Sep 22 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2.38.1-1.rvre0
- Rebuilt for Fedora/RISCV (riscv64)
* Thu Aug 4 2022 Karel Zak <kzak@redhat.com> - 2.38.1-1 * Thu Aug 4 2022 Karel Zak <kzak@redhat.com> - 2.38.1-1
- upgrade to v2.38.1 - upgrade to v2.38.1