diff --git a/SPECS/base.spec b/SPECS/base.spec index c29d406..eefd295 100644 --- a/SPECS/base.spec +++ b/SPECS/base.spec @@ -3,11 +3,11 @@ Summary: Meta package for LFS Base installation Name: base Version: 8.4 -Release: 1 +Release: 2 License: None URL: None Group: LFS/Base -Vendor: Elizabeth +Vendor: Elizabeth # # LFS Chapter 6 # @@ -92,9 +92,7 @@ Requires: popt Requires: python2 Requires: rpm Requires: wget -Requires: firmware-radeon -Requires: firmware-realtek -Requires: firmware-amd-ucode +Requires: linux-firmware %description Summary: Meta package for LFS Base installation #----------------------------------------------------------------------------- @@ -105,6 +103,8 @@ Summary: Meta package for LFS Base installation %defattr(-,lfs,lfs) #----------------------------------------------------------------------------- %changelog +* Sat May 30 2020 Chris Cromer 8.4-2 +- Add linux-firmware and remove other firmwares * Mon Apr 29 2019 baho-utot 8.4-1 - LFS-8.4 * Mon Oct 01 2018 baho-utot 8.2-1 diff --git a/SPECS/firmware-amd-ucode.spec b/SPECS/firmware-amd-ucode.spec deleted file mode 100644 index 446600f..0000000 --- a/SPECS/firmware-amd-ucode.spec +++ /dev/null @@ -1,60 +0,0 @@ -#MD5SUM: dd92e77d72097f89a7c28eeb121cd62e;SOURCES/firmware-amd-ucode-1.00.tar.gz -#----------------------------------------------------------------------------- -Summary: Firmware for amd processors -Name: firmware-amd-ucode -Version: 2019.05.22 -Release: 1 -License: Any -URL: Any -Group: LFS/Base -Vendor: Elizabeth -Source: %{name}-%{version}.tar.gz -Requires: filesystem -%description -Firmware for amd processors -#----------------------------------------------------------------------------- -%prep -%build - cd %{_builddir} - tar xf %{_sourcedir}/%{name}-%{version}.tar.gz - install -vdm 755 %{buildroot}/boot -# AMD family 21 - 15h - install -vdm 755 fam15h/kernel/x86/microcode - cp -var amd-ucode/microcode_amd_fam15h.bin fam15h/kernel/x86/microcode/AuthenticAMD.bin - pushd fam15h - find . | cpio -o -H newc > %{buildroot}/boot/microcode_amd_fam15h.img - popd -# AMD family 22 - 16h - install -vdm 755 fam16h/kernel/x86/microcode - cp -var amd-ucode/microcode_amd_fam16h.bin fam16h/kernel/x86/microcode/AuthenticAMD.bin - pushd fam16h - find . | cpio -o -H newc > %{buildroot}/boot/microcode_amd_fam16h.img - popd -# AMD family 23 - 17h - install -vdm 755 fam17h/kernel/x86/microcode - cp -var amd-ucode/microcode_amd_fam17h.bin fam17h/kernel/x86/microcode/AuthenticAMD.bin - pushd fam17h - find . | cpio -o -H newc > %{buildroot}/boot/microcode_amd_fam17h.img - popd -%install - ls %{buildroot}/boot -#----------------------------------------------------------------------------- -# Copy license/copying file -# install -D -m644 %{_builddir}/LICENSE.radeon %{buildroot}/usr/share/licenses/%{name}/LICENSE -#----------------------------------------------------------------------------- -# Create file list -# rm %{buildroot}%{_infodir}/dir -# find %{buildroot} -name '*.la' -delete - find "${RPM_BUILD_ROOT}" -not -type d -print > filelist.rpm - sed -i "s|^${RPM_BUILD_ROOT}||" filelist.rpm -# sed -i '/man\/man/d' filelist.rpm -# sed -i '/\/usr\/share\/info/d' filelist.rpm -#----------------------------------------------------------------------------- -%files -f filelist.rpm - %defattr(-,root,root) -# %%{_infodir}/* -# %%{_mandir}/man1/* -#----------------------------------------------------------------------------- -%changelog -* Sun Jul 29 2018 baho-utot 1.00-1 -- Initial build. First version diff --git a/SPECS/firmware-radeon.spec b/SPECS/firmware-radeon.spec deleted file mode 100644 index f320311..0000000 --- a/SPECS/firmware-radeon.spec +++ /dev/null @@ -1,42 +0,0 @@ -#MD5SUM: 55e7c8cf8bca4fbb738be885266a2dc4;SOURCES/firmware-radeon-1.00.tar.gz -#----------------------------------------------------------------------------- -Summary: Firmware for radeon graphics cards -Name: firmware-radeon -Version: 1.00 -Release: 1 -License: Any -URL: Any -Group: LFS/Base -Vendor: Elizabeth -Source: %{name}-%{version}.tar.gz -Requires: filesystem -%description -Firmware for radeon graphics cards -#----------------------------------------------------------------------------- -%prep -%build - cd %{_builddir} - tar xzf %{_sourcedir}/%{name}-%{version}.tar.gz -%install - install -vdm 755 %{buildroot}/lib/firmware/radeon - cp -var %{_builddir}/radeon/* %{buildroot}/lib/firmware/radeon -#----------------------------------------------------------------------------- -# Copy license/copying file - install -D -m644 %{_builddir}/LICENSE.radeon %{buildroot}/usr/share/licenses/%{name}/LICENSE -#----------------------------------------------------------------------------- -# Create file list -# rm %{buildroot}%{_infodir}/dir -# find %{buildroot} -name '*.la' -delete - find "${RPM_BUILD_ROOT}" -not -type d -print > filelist.rpm - sed -i "s|^${RPM_BUILD_ROOT}||" filelist.rpm -# sed -i '/man\/man/d' filelist.rpm -# sed -i '/\/usr\/share\/info/d' filelist.rpm -#----------------------------------------------------------------------------- -%files -f filelist.rpm - %defattr(-,root,root) -# %%{_infodir}/* -# %%{_mandir}/man1/* -#----------------------------------------------------------------------------- -%changelog -* Sun Jul 29 2018 baho-utot 1.00-1 -- Initial build. First version diff --git a/SPECS/firmware-realtek.spec b/SPECS/firmware-realtek.spec deleted file mode 100644 index 27c7639..0000000 --- a/SPECS/firmware-realtek.spec +++ /dev/null @@ -1,42 +0,0 @@ -#MD5SUM: ca0739ca20bd48a6bbfb31c1778e2469;SOURCES/firmware-realtek-1.00.tar.gz -#----------------------------------------------------------------------------- -Summary: Firmware for realtek network cards -Name: firmware-realtek -Version: 1.00 -Release: 1 -License: Any -URL: Any -Group: LFS/Base -Vendor: Elizabeth -Source: %{name}-%{version}.tar.gz -Requires: filesystem -%description -Firmware for realtek network cards -#----------------------------------------------------------------------------- -%prep -%build - cd %{_builddir} - tar xzf %{_sourcedir}/%{name}-%{version}.tar.gz -%install - install -vdm 755 %{buildroot}/lib/firmware/rtl_nic - cp -var %{_builddir}/rtl_nic/* %{buildroot}/lib/firmware/rtl_nic -#----------------------------------------------------------------------------- -# Copy license/copying file -# install -D -m644 %{_builddir}/LICENSE.realtek %{buildroot}/usr/share/licenses/%{name}/LICENSE -#----------------------------------------------------------------------------- -# Create file list -# rm %{buildroot}%{_infodir}/dir -# find %{buildroot} -name '*.la' -delete - find "${RPM_BUILD_ROOT}" -not -type d -print > filelist.rpm - sed -i "s|^${RPM_BUILD_ROOT}||" filelist.rpm -# sed -i '/man\/man/d' filelist.rpm -# sed -i '/\/usr\/share\/info/d' filelist.rpm -#----------------------------------------------------------------------------- -%files -f filelist.rpm - %defattr(-,root,root) -# %%{_infodir}/* -# %%{_mandir}/man1/* -#----------------------------------------------------------------------------- -%changelog -* Sun Jul 29 2018 baho-utot 1.00-1 -- Initial build. First version diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec new file mode 100644 index 0000000..7830d40 --- /dev/null +++ b/SPECS/linux-firmware.spec @@ -0,0 +1,28 @@ +#MD5SUM: 74127d907539428043addc03b7cb5730;SOURCES/linux-firmware.tar.gz +#----------------------------------------------------------------------------- +Summary: Firmware for various hardware for linux +Name: linux-firmware +Version: 1.0 +Release: 1 +License: Any +URL: Any +Group: LFS/Base +Vendor: Elizabeth +Source0: %{name}.tar.gz +Requires: filesystem +%description +Firmware for various hardware for linux +#----------------------------------------------------------------------------- +%prep +%setup -q -n %{name} +%build + +%install + make %{?_smp_mflags} DESTDIR="%{buildroot}" FIRMWAREDIR=/lib/firmware install +%files + %defattr(-,root,root) + /lib/* +#----------------------------------------------------------------------------- +%changelog +* Sat May 30 2020 Chris Cromer 1.0-1 +- Initial build diff --git a/base.sh b/base.sh index caa671a..e45d4fb 100755 --- a/base.sh +++ b/base.sh @@ -1,11 +1,12 @@ #!/bin/bash #----------------------------------------------------------------------------- # Title: ch6.sh -# Date: 2019-03-14 +# Date: 2020-05-30 # Version: 1.0 -# Author: baho-utot@columbus.rr.com +# Author: chris@cromer.cl # Options: #----------------------------------------------------------------------------- +# Copyright 2020 Chris Cromer # Copyright 2019 Baho Utot #----------------------------------------------------------------------------- # This program is free software: you can redistribute it and/or modify @@ -324,9 +325,9 @@ LIST+="filesystem " # 6.5. Creating Directories LIST+="symlinks " # 6.6. Creating Essential Files and Symlinks LIST+="linux-api-headers " # 6.7. Linux-4.20.12 API Headers LIST+="man-pages " # 6.8. Man-pages-4.16 -LIST+="glibc " # 6.9. Glibc-2.29 -LIST+="tzdata " # 6.9.2.2. Adding time zone data -LIST+="adjust " # 6.10. Adjusting the Toolchain +LIST+="glibc " # 6.9. Glibc-2.29 +LIST+="tzdata " # 6.9.2.2. Adding time zone data +LIST+="adjust " # 6.10. Adjusting the Toolchain LIST+="zlib " # 6.11. Zlib-1.2.11 LIST+="file " # 6.12. File-5.36 LIST+="readline " # 6.13. Readline-8.0 @@ -336,25 +337,25 @@ LIST+="binutils " # 6.16. Binutils-2.32 LIST+="gmp " # 6.17. GMP-6.1.2 LIST+="mpfr " # 6.18. MPFR-4.0.2 LIST+="mpc " # 6.19. MPC-1.1.0 -LIST+="shadow " # 6.20. Shadow-4.6 +LIST+="shadow " # 6.20. Shadow-4.6 LIST+="gcc " # 6.21. GCC-8.2.0 -LIST+="bzip2 " # 6.22. Bzip2-1.0.6 +LIST+="bzip2 " # 6.22. Bzip2-1.0.6 LIST+="pkg-config " # 6.23. Pkg-config-0.29.2 LIST+="ncurses " # 6.24. Ncurses-6.1 LIST+="attr " # 6.25. Attr-2.4.48 LIST+="acl " # 6.26. Acl-2.2.53 -LIST+="libcap " # 6.27. Libcap-2.26 +LIST+="libcap " # 6.27. Libcap-2.26 LIST+="sed " # 6.28. Sed-4.7 -LIST+="psmisc " # 6.29. Psmisc-23.2 +LIST+="psmisc " # 6.29. Psmisc-23.2 LIST+="iana-etc " # 6.30. Iana-Etc-2.30 -LIST+="bison " # 6.31. Bison-3.3.2 +LIST+="bison " # 6.31. Bison-3.3.2 LIST+="flex " # 6.32. Flex-2.6.4 LIST+="grep " # 6.33. Grep-3.3 LIST+="bash " # 6.34. Bash-5.0 LIST+="libtool " # 6.35. Libtool-2.4.6 LIST+="gdbm " # 6.36. GDBM-1.18.1 -LIST+="gperf " # 6.37. Gperf-3.1 -LIST+="expat " # 6.38. Expat-2.2.6 +LIST+="gperf " # 6.37. Gperf-3.1 +LIST+="expat " # 6.38. Expat-2.2.6 LIST+="inetutils " # 6.39. Inetutils-1.9.4 LIST+="perl " # 6.40. Perl-5.28.1 LIST+="XML-Parser " # 6.41. XML::Parser-2.44 @@ -364,18 +365,18 @@ LIST+="automake " # 6.44. Automake-1.16.1 LIST+="xz " # 6.45. Xz-5.2.4 LIST+="kmod " # 6.46. Kmod-26 LIST+="gettext " # 6.47. Gettext-0.19.8.1 -LIST+="libelf " # 6.48. Libelf from Elfutils-0.176 -LIST+="libffi " # 6.49. Libffi-3.2.1 +LIST+="libelf " # 6.48. Libelf from Elfutils-0.176 +LIST+="libffi " # 6.49. Libffi-3.2.1 LIST+="openssl " # 6.50. OpenSSL-1.1.1a LIST+="python3 " # 6.51. Python-3.7.2 -LIST+="ninja " # 6.52. Ninja-1.9.0 -LIST+="meson " # 6.53. Meson-0.49.2 +LIST+="ninja " # 6.52. Ninja-1.9.0 +LIST+="meson " # 6.53. Meson-0.49.2 LIST+="coreutils " # 6.54. Coreutils-8.30 -LIST+="check " # 6.55. Check-0.12.0 +LIST+="check " # 6.55. Check-0.12.0 LIST+="diffutils " # 6.56. Diffutils-3.7 LIST+="gawk " # 6.57. Gawk-4.2.1 LIST+="findutils " # 6.58. Findutils-4.6.0 -LIST+="groff " # 6.59. Groff-1.22.4 +LIST+="groff " # 6.59. Groff-1.22.4 LIST+="grub " # 6.60. GRUB-2.02 LIST+="less " # 6.61. Less-530 LIST+="gzip " # 6.62. Gzip-1.10 @@ -383,8 +384,8 @@ LIST+="iproute2 " # 6.63. IPRoute2-4.20.0 LIST+="kbd " # 6.64. Kbd-2.0.4 LIST+="libpipeline " # 6.65. Libpipeline-1.5.1 LIST+="make " # 6.66. Make-4.2.1 -LIST+="patch " # 6.67. Patch-2.7.6 -LIST+="man-db " # 6.68. Man-DB-2.8.5 +LIST+="patch " # 6.67. Patch-2.7.6 +LIST+="man-db " # 6.68. Man-DB-2.8.5 LIST+="tar " # 6.69. Tar-1.31 LIST+="texinfo " # 6.70. Texinfo-6.5 LIST+="vim " # 6.71. Vim-8.1 @@ -393,19 +394,17 @@ LIST+="util-linux " # 6.73. Util-linux-2.33.1 LIST+="e2fsprogs " # 6.74. E2fsprogs-1.44.5 LIST+="sysklogd " # 6.75. Sysklogd-1.5.1 LIST+="sysvinit " # 6.76. Sysvinit-2.93 -LIST+="eudev " # 6.77. Eudev-3.2.7 +LIST+="eudev " # 6.77. Eudev-3.2.7 # Chapter 7 LIST+="lfs-bootscripts " # lfs-bootscripts LIST+="cpio " # cpio LIST+="mkinitramfs " # mkinitramfs -LIST+="linux " # 8.3. Linux-4.20.12 +LIST+="linux " # 8.3. Linux-4.20.12 # ADDONS LIST+="popt " # popt LIST+="rpm " # rpm LIST+="wget " # wget -LIST+="firmware-radeon " # firmware-radeon -LIST+="firmware-realtek " # firmware-realtek -LIST+="firmware-amd-ucode " # firmware-amd-ucode +LIST+="linux-firmware " # linux-firmware LIST+="python2 " # python2 LIST+="base " # lfs base packages meta package for i in ${LIST};do