On Thu, Sep 23, 2021 at 02:43:23PM +0000, coypu wrote:
> Might be an issue for not obsoleting directories on non-DRM archs.

So it wasn't, they are created unconditionally, so I need this
additional change:


---
Squash - directories are created unconditionally. Put back in base/mi

---
 distrib/sets/lists/base/mi  | 4 ++++
 distrib/sets/lists/gpufw/mi | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 167969606ea6..d409096cef1c 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -265,6 +265,9 @@
 ./libdata/firmware/if_wpi/README.iwlwifi-3945-ucode    base-firmware-root      
firmware
 ./libdata/firmware/if_wpi/ipw3945.ucode                base-obsolete   
obsolete,firmware
 ./libdata/firmware/if_wpi/iwlwifi-3945.ucode           base-firmware-root      
firmware
+./libdata/firmware/nouveau                     base-firmware-usr
+./libdata/firmware/nouveau/nvidia                      base-firmware-usr
+./libdata/firmware/nouveau/nvidia/gm206                        
base-firmware-usr
 ./libdata/firmware/nvidia                      base-firmware-root
 ./libdata/firmware/nvidia/tegra124             base-firmware-root
 ./libdata/firmware/nvidia/tegra124/LICENCE.nvidia      base-firmware-root      
tegrafirmware
@@ -282,6 +285,7 @@
 ./libdata/firmware/qat/qat_c62x_mmp.bin                base-firmware-root      
firmware
 ./libdata/firmware/qat/qat_d15xx.bin           base-firmware-root      firmware
 ./libdata/firmware/qat/qat_d15xx_mmp.bin       base-firmware-root      firmware
+./libdata/firmware/radeon                      base-firmware-usr
 ./libdata/firmware/ral                         base-firmware-root
 ./libdata/firmware/ral/ral-license             base-firmware-root      firmware
 ./libdata/firmware/ral/ral-rt2561              base-firmware-root      firmware
diff --git a/distrib/sets/lists/gpufw/mi b/distrib/sets/lists/gpufw/mi
index 6d14ba5dae86..856eff5b7d45 100644
--- a/distrib/sets/lists/gpufw/mi
+++ b/distrib/sets/lists/gpufw/mi
@@ -3,15 +3,12 @@
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
 ./etc/mtree/set.gpufw                          base-gpufw
-./libdata/firmware/nouveau                      base-gpufw
-./libdata/firmware/nouveau/nvidia                       base-gpufw
 ./libdata/firmware/nouveau/nvidia/LICENCE.nvidia        base-gpufw       
gpufirmware
 ./libdata/firmware/nouveau/nvidia/gm206                 base-gpufw
 ./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin   base-gpufw       
gpufirmware
 ./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin   base-gpufw       
gpufirmware
 ./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin  base-gpufw       
gpufirmware
 ./libdata/firmware/nouveau/nvidia/gm206/gpccs_inst.bin  base-gpufw       
gpufirmware
-./libdata/firmware/radeon                      base-gpufw
 ./libdata/firmware/radeon/ARUBA_me.bin         base-gpufw      gpufirmware
 ./libdata/firmware/radeon/ARUBA_pfp.bin                base-gpufw      
gpufirmware
 ./libdata/firmware/radeon/ARUBA_rlc.bin                base-gpufw      
gpufirmware
-- 
2.28.0


Reply via email to