From 4778ab182999fb07a545616f3b369f52d1c40196 Mon Sep 17 00:00:00 2001 From: Dima Krasner Date: Tue, 3 Oct 2023 10:42:55 +0300 Subject: [PATCH] switch to Ubuntu firmware in jammy64 --- .github/workflows/upup-kernel.yml | 1 + .../x86_64/ubuntu/jammy64/DISTRO_PKGS_SPECS-ubuntu-jammy | 4 ++++ woof-distro/x86_64/ubuntu/jammy64/_00build.conf | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upup-kernel.yml b/.github/workflows/upup-kernel.yml index 0cf0d72024d..960383c1cb9 100644 --- a/.github/workflows/upup-kernel.yml +++ b/.github/workflows/upup-kernel.yml @@ -44,6 +44,7 @@ jobs: echo "kernel_ver=$ver" >> build.conf echo "package_name_suffix=kernel-kit" >> build.conf echo "COMP=\"-comp zstd -Xcompression-level 19 -b 256K -no-exports -no-xattrs\"" >> build.conf + echo "fware=n" >> build.conf echo "AUTO=yes" >> build.conf echo "AUFS=no" >> build.conf CREATE_KBUILD_SFS=yes ./build.sh diff --git a/woof-distro/x86_64/ubuntu/jammy64/DISTRO_PKGS_SPECS-ubuntu-jammy b/woof-distro/x86_64/ubuntu/jammy64/DISTRO_PKGS_SPECS-ubuntu-jammy index 6679dd0522b..7c0134c7e93 100644 --- a/woof-distro/x86_64/ubuntu/jammy64/DISTRO_PKGS_SPECS-ubuntu-jammy +++ b/woof-distro/x86_64/ubuntu/jammy64/DISTRO_PKGS_SPECS-ubuntu-jammy @@ -40,6 +40,7 @@ no|alsaequal|libasound2-plugin-equal,caps|exe,dev,doc,nls| #needed by pequalizer yes|alsa-lib|libasound2,libasound2-data,libasound2-dev,alsa-topology-conf,alsa-ucm-conf|exe,dev,doc,nls||deps:yes yes|libasound2-plugins-pulseonly|libasound2-plugins|exe,dev,doc,nls yes|alsa-utils|alsa-utils|exe,dev,doc,nls||deps:yes +yes|amd64-microcode|amd64-microcode|exe,dev,doc,nls||deps:yes no|apulse||exe,dev,doc no|aspell|libaspell15,libaspell-dev|exe,dev,doc,nls #needed by abiword. yes|atk|libatk1.0-0,libatk1.0-dev|exe,dev,doc,nls||deps:yes @@ -140,6 +141,7 @@ no|file_sharing-curlftpfs-mpscan||exe yes|findutils|findutils|exe,dev>null,doc,nls||deps:yes no|firmware_linux_module_b43||exe| #120919 have taken these out of woof, now pets. no|firmware_linux_module_b43legacy||exe +yes|firmware-sof-signed|firmware-sof-signed|exe,dev,doc,nls||deps:yes yes|flac|libflac8|exe,dev,doc,nls||deps:yes yes|flex|flex|exe>dev,dev,doc,nls||deps:yes yes|fonts-liberation2|fonts-liberation2|exe,dev,doc,nls||deps:yes @@ -250,6 +252,7 @@ yes|imake|xutils-dev|exe>dev,dev,doc,nls||deps:yes yes|init-system-helpers|init-system-helpers|exe>null,dev>null,doc,nls||deps:yes #to prevent it from being installed as dependency.. no|inkscapelite||exe,dev,doc,nls no|inotify-tools|inotify-tools,libinotifytools0|exe,dev,doc,nls +yes|intel-microcode|intel-microcode|exe,dev,doc,nls||deps:yes yes|installwatch|checkinstall|exe>dev,dev,doc,nls||deps:yes yes|intltool|intltool|exe>dev,dev,doc,nls||deps:yes #previously only in devx, but need in main f.s. to run momanager without devx. yes|iptables|iptables,libip4tc2,libip6tc2,libxtables12,libnftnl11|exe,dev>exe,doc,nls||deps:yes @@ -439,6 +442,7 @@ yes|libzstd|libzstd1,libzstd-dev|exe,dev,doc,nls||deps:yes no|linux_firmware_dvb||exe yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls||deps:yes no|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls +yes|linux-firmware|linux-firmware|exe,dev,doc,nls||deps:yes no|llvm|libllvm12|exe,dev||deps:yes #needed by libgl1-mesa-dri, but huge 7MB deb. i left out dev components. 120605 removed. 120902 back. yes|login|login|exe>null,dev>null,doc>null,nls>null yes|lsb-base|lsb-base|exe,dev,doc,nls||deps:yes diff --git a/woof-distro/x86_64/ubuntu/jammy64/_00build.conf b/woof-distro/x86_64/ubuntu/jammy64/_00build.conf index 6940c279bab..a03d6f248cb 100644 --- a/woof-distro/x86_64/ubuntu/jammy64/_00build.conf +++ b/woof-distro/x86_64/ubuntu/jammy64/_00build.conf @@ -22,7 +22,7 @@ ADRV_INC="" ## YDRV_INC="" YDRV_INC="" ## FDRV_INC="" #this one is very experimental and it's recommended to be left unset -FDRV_INC="" +FDRV_INC="linux-firmware firmware-sof-signed intel-microcode amd64-microcode" ## Include kernel-kit generated FDRIVE ## set to yes or no or leave commented to be asked the question at build time