diff --git a/helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch
index 20fddec8..3f44f063 100644
--- a/helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch
+++ b/helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch
@@ -4,10 +4,10 @@ Based on https://git.parabola.nu/abslibre.git/diff/libre/iceweasel/9004-FSDG-mis
- Remove promos of Firefox Focus and Klar from Private Browsing
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index cc42846d..52d35d49 100644
+index c5f7cf3a..f0124235 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -1388,11 +1388,11 @@ pref("accessibility.typeaheadfind.linksonly", false);
+@@ -1368,9 +1368,9 @@ pref("accessibility.typeaheadfind.linksonly", false);
pref("accessibility.typeaheadfind.flashBar", 1);
// Whether we had to hide the "Firefox Labs" section because it would be empty.
@@ -16,12 +16,9 @@ index cc42846d..52d35d49 100644
// Whether we show the "More from Mozilla" section.
-pref("browser.preferences.moreFromMozilla", true);
+pref("browser.preferences.moreFromMozilla", false);
- // Whether we show the "AI Controls" pane.
--pref("browser.preferences.aiControls", true);
-+pref("browser.preferences.aiControls", false);
- // Whether to show unavailable AI controls regardless of region/locale
- // restrictions. This is intended for localizers to be able to see the strings.
- pref("browser.preferences.aiControls.showUnavailable", false);
+
+ // Used by settings to track whether the user customized advanced
+ // performance settings. Not used directly elsewhere.
@@ -2281,7 +2281,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u
pref("browser.promo.focus.disallowed_regions", "cn");
@@ -459,19 +456,17 @@ index b5ff592..22cdf39 100644
{
id: "PB_NEWTAB_VPN_PROMO",
template: "pb_newtab",
-diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index b2d65603..b44a1525 100644
---- a/browser/components/preferences/jar.mn
-+++ b/browser/components/preferences/jar.mn
-@@ -19,8 +19,6 @@ browser.jar:
+diff -Nru a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
+--- a/browser/components/preferences/jar.mn 2022-05-22 09:35:55.400673986 +0000
++++ b/browser/components/preferences/jar.mn 2022-05-22 21:45:51.512354083 +0000
+@@ -18,7 +18,5 @@
content/browser/preferences/fxaPairDevice.xhtml
content/browser/preferences/fxaPairDevice.js
content/browser/preferences/findInPage.js
- content/browser/preferences/more-from-mozilla-qr-code-simple.svg
- content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg
- content/browser/preferences/browser-layout-horizontal.svg
- content/browser/preferences/browser-layout-vertical.svg
content/browser/preferences/web-appearance-dark.svg
+ content/browser/preferences/web-appearance-light.svg
diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg
index edcad0f3..e69de29b 100644
--- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg
@@ -741,10 +736,10 @@ index 3888af10..1d6c606f 100644
"chrome://browser/content/asrouter/assets/fox-with-devices.svg",
"chrome://browser/content/asrouter/assets/fox-with-locked-box.svg",
diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js
-index 109d334e..ee49d63f 100644
+index 8807b5d3..82367922 100644
--- a/browser/components/preferences/moreFromMozilla.js
+++ b/browser/components/preferences/moreFromMozilla.js
-@@ -81,50 +81,7 @@ var gMoreFromMozillaPane = {
+@@ -81,51 +81,7 @@ var gMoreFromMozillaPane = {
renderProducts() {
const isRegionUS = Region.home.toLowerCase() === "us";
@@ -782,8 +777,9 @@ index 109d334e..ee49d63f 100644
- {
- id: "mozilla-monitor",
- title_string_id: "more-from-moz-mozilla-monitor-title",
-- description_string_id:
-- "more-from-moz-mozilla-monitor-global-description",
+- description_string_id: isRegionUS
+- ? "more-from-moz-mozilla-monitor-us-description"
+- : "more-from-moz-mozilla-monitor-global-description",
- region: isRegionUS ? "us" : "global",
- button: {
- id: "mozillaMonitor",
diff --git a/helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch b/helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch
index d015201f..ffa7ea94 100644
--- a/helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch
+++ b/helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch
@@ -24,8 +24,8 @@ index 217ed280..d91cde94 100644
// Do not enable the preonboarding experience on Linux
#ifdef XP_LINUX
-@@ -1886,24 +1886,24 @@ pref("browser.newtabpage.activity-stream.mobileDownloadModal.variant-b", false);
- pref("browser.newtabpage.activity-stream.mobileDownloadModal.variant-c", false);
+@@ -1856,24 +1856,24 @@ pref("browser.newtabpage.activity-stream.mobileDownloadModal.variant-c", false);
+ pref("browser.newtabpage.activity-stream.discoverystream.refinedCardsLayout.enabled", true);
// Mozilla Ad Routing Service (MARS) unified ads service
-pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", true);
@@ -35,14 +35,13 @@ index 217ed280..d91cde94 100644
+pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false);
+pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "");
pref("browser.newtabpage.activity-stream.unifiedAds.adsFeed.enabled", false);
--pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.enabled", true);
-+pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.enabled", false);
+ pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.enabled", false);
// Weather widget for newtab
-pref("browser.newtabpage.activity-stream.showWeather", true);
+pref("browser.newtabpage.activity-stream.showWeather", false);
pref("browser.newtabpage.activity-stream.weather.query", "");
- pref("browser.newtabpage.activity-stream.weather.display", "detailed");
+ pref("browser.newtabpage.activity-stream.weather.display", "simple");
pref("browser.newtabpage.activity-stream.images.smart", true);
diff --git a/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch b/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch
index 0bc8d3ca..c00136f7 100644
--- a/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch
+++ b/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch
@@ -11,53 +11,53 @@ index ba47adb6..c4b29ec4 100644
where: "tabshifted",
},
navigate: true,
-@@ -865,6 +865,49 @@ const MR_ABOUT_WELCOME_DEFAULT = {
+@@ -750,49 +750,6 @@ const MR_ABOUT_WELCOME_DEFAULT = {
},
targeting: "isFxASignedIn",
},
-+ {
-+ id: "AW_ACCOUNT_LOGIN",
-+ content: {
-+ fullscreen: true,
-+ position: "split",
-+ split_narrow_bkg_position: "-228px",
-+ image_alt_text: {
-+ string_id: "mr2022-onboarding-gratitude-image-alt",
-+ },
-+ background:
-+ "url('chrome://activity-stream/content/data/content/assets/br-fxa-fox-mirror.svg') var(--mr-secondary-position) no-repeat light-dark(rgba(252, 245, 240, 1), rgba(33, 3, 64, 1))",
-+ progress_bar: true,
-+ logo: {},
-+ title: {
-+ string_id: "onboarding-sign-up-title",
-+ },
-+ subtitle: {
-+ string_id: "onboarding-sign-up-description",
-+ },
-+ secondary_button: {
-+ label: {
-+ string_id: "mr2-onboarding-start-browsing-button-label",
-+ },
-+ style: "secondary",
-+ action: {
-+ navigate: true,
-+ },
-+ },
-+ primary_button: {
-+ label: {
-+ string_id: "onboarding-sign-up-button",
-+ },
-+ action: {
-+ data: {
-+ entrypoint: "newuser-onboarding-desktop",
-+ },
-+ type: "FXA_SIGNIN_FLOW",
-+ navigate: true,
-+ },
-+ },
-+ },
-+ targeting: "!isFxASignedIn",
-+ },
+- {
+- id: "AW_ACCOUNT_LOGIN",
+- content: {
+- fullscreen: true,
+- position: "split",
+- split_narrow_bkg_position: "-228px",
+- image_alt_text: {
+- string_id: "mr2022-onboarding-gratitude-image-alt",
+- },
+- background:
+- "url('chrome://activity-stream/content/data/content/assets/fox-doodle-waving-laptop.svg') center center / 80% no-repeat var(--mr-screen-background-color)",
+- progress_bar: true,
+- logo: {},
+- title: {
+- string_id: "onboarding-sign-up-title",
+- },
+- subtitle: {
+- string_id: "onboarding-sign-up-description",
+- },
+- secondary_button: {
+- label: {
+- string_id: "mr2-onboarding-start-browsing-button-label",
+- },
+- style: "secondary",
+- action: {
+- navigate: true,
+- },
+- },
+- primary_button: {
+- label: {
+- string_id: "onboarding-sign-up-button",
+- },
+- action: {
+- data: {
+- entrypoint: "newuser-onboarding-desktop",
+- },
+- type: "FXA_SIGNIN_FLOW",
+- navigate: true,
+- },
+- },
+- },
+- targeting: "!isFxASignedIn",
+- },
],
};
diff --git a/helpers/DATA/firefox/patch_changes/016-set_custom_cargo_1.91.patch b/helpers/DATA/firefox/patch_changes/016-set_custom_cargo_1.91.patch
deleted file mode 100644
index 5be58ff7..00000000
--- a/helpers/DATA/firefox/patch_changes/016-set_custom_cargo_1.91.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/debian/control.in b/debian/control.in
-index 758352f8..26383a38 100644
---- a/debian/control.in
-+++ b/debian/control.in
-@@ -43,8 +43,8 @@ Build-Depends: cdbs,
- libclang-22-dev | libclang-21-dev | libclang-20-dev | libclang-19-dev | libclang-18-dev,
- llvm-22-dev | llvm-21-dev | llvm-20-dev | llvm-19-dev | llvm-18-dev,
- lld-22 | lld-21 | lld-20 | lld-19 | lld-18,
-- cargo-1.90,
-- rustc-1.90,
-+ cargo-1.91 | cargo-1.90,
-+ rustc-1.91 | rustc-1.90,
- nodejs (>= 12.22.12)
- Standards-Version: 3.9.1
-
-diff --git a/debian/build/rules.mk b/debian/build/rules.mk
-index 896150e7..413e34fc 100644
---- a/debian/build/rules.mk
-+++ b/debian/build/rules.mk
-@@ -109,7 +109,7 @@ LLVM_VERSIONS = 22 21 20 19 18
- DEB_LLVM_VERSION = $(firstword $(foreach llvm_version, $(LLVM_VERSIONS), \
- $(if $(shell which clang-$(llvm_version)), $(llvm_version))))
-
--RUSTC_VERSIONS = 1.90
-+RUSTC_VERSIONS = 1.91 1.90
- DEB_RUSTC_VERSION = $(firstword $(foreach rustc_version, $(RUSTC_VERSIONS), \
- $(if $(shell which rustc-$(rustc_version)), $(rustc_version))))
-
diff --git a/helpers/DATA/firefox/patch_changes/017-modify_sidebar_pins_promo_icons.patch b/helpers/DATA/firefox/patch_changes/017-modify_sidebar_pins_promo_icons.patch
deleted file mode 100644
index 8dfee481..00000000
--- a/helpers/DATA/firefox/patch_changes/017-modify_sidebar_pins_promo_icons.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index 3a12a7a3..ac1245a9 100644
---- a/browser/themes/shared/jar.inc.mn
-+++ b/browser/themes/shared/jar.inc.mn
-@@ -266,10 +266,10 @@
- skin/classic/browser/search-indicator-badge-add.svg (../shared/search/search-indicator-badge-add.svg)
- skin/classic/browser/searchbar.css (../shared/search/searchbar.css)
-
-- skin/classic/browser/sidebar/firefox.svg (../shared/sidebar/firefox.svg)
-- skin/classic/browser/sidebar/foxy.svg (../shared/sidebar/foxy.svg)
-- skin/classic/browser/sidebar/gmail.svg (../shared/sidebar/gmail.svg)
-- skin/classic/browser/sidebar/slack.svg (../shared/sidebar/slack.svg)
-+ skin/classic/browser/sidebar/trisquel.svg (../shared/sidebar/trisquel.svg)
-+ skin/classic/browser/sidebar/fsf.svg (../shared/sidebar/fsf.svg)
-+ skin/classic/browser/sidebar/wikipedia.svg (../shared/sidebar/wikipedia.svg)
-+ skin/classic/browser/sidebar/liberachat.svg (../shared/sidebar/liberachat.svg)
-
- skin/classic/browser/tabbrowser/content-area.css (../shared/tabbrowser/content-area.css)
- skin/classic/browser/tabbrowser/crashed.svg (../shared/tabbrowser/crashed.svg)
-diff --git a/browser/components/sidebar/sidebar-pins-promo.mjs b/browser/components/sidebar/sidebar-pins-promo.mjs
-index beac7ea4..538ae9aa 100644
---- a/browser/components/sidebar/sidebar-pins-promo.mjs
-+++ b/browser/components/sidebar/sidebar-pins-promo.mjs
-@@ -56,10 +56,10 @@ export default class SidebarPinsPromo extends MozLitElement {
- this.launcherObserver = new MutationObserver(() => this.requestUpdate());
- }
- #icons = [
-- { name: "firefox", src: "chrome://browser/skin/sidebar/firefox.svg" },
-- { name: "slack", src: "chrome://browser/skin/sidebar/slack.svg" },
-- { name: "foxy", src: "chrome://browser/skin/sidebar/foxy.svg" },
-- { name: "gmail", src: "chrome://browser/skin/sidebar/gmail.svg" },
-+ { name: "trisquel", src: "chrome://browser/skin/sidebar/trisquel.svg" },
-+ { name: "liberachat", src: "chrome://browser/skin/sidebar/liberachat.svg" },
-+ { name: "fsf", src: "chrome://browser/skin/sidebar/fsf.svg" },
-+ { name: "wikipedia", src: "chrome://browser/skin/sidebar/wikipedia.svg" },
- ];
-
- connectedCallback() {
diff --git a/helpers/DATA/firefox/patch_changes/018-adjust_wallpapers_abrowser.patch b/helpers/DATA/firefox/patch_changes/018-adjust_wallpapers_abrowser.patch
deleted file mode 100644
index d582d489..00000000
--- a/helpers/DATA/firefox/patch_changes/018-adjust_wallpapers_abrowser.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs b/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs
-index 72df22b3..24f2f807 100644
---- a/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs
-+++ b/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs
-@@ -156,7 +156,9 @@ export class WallpaperFeed {
- ...record,
- ...(record.attachment
- ? {
-- wallpaperUrl: `${baseAttachmentURL}${record.attachment.location}`,
-+ wallpaperUrl: record.attachment.location.includes("trisquel")
-+ ? `https://trisquel.cmxsl.org/newtab/${record.attachment.filename.replace(".avif", ".webp")}`
-+ : `${baseAttachmentURL}${record.attachment.location}`,
- }
- : {}),
- background_position: record.background_position || "center",
-diff --git a/services/settings/remote-settings.sys.mjs b/services/settings/remote-settings.sys.mjs
-index 2330fb01..2c4062d1 100644
---- a/services/settings/remote-settings.sys.mjs
-+++ b/services/settings/remote-settings.sys.mjs
-@@ -301,7 +301,7 @@ function remoteSettingsFunction() {
- bucketName: bucket,
- signerName,
- });
-- if (client.verifySignature) {
-+ if (client.verifySignature && collection!== "newtab-wallpapers-v2") {
- lazy.console.debug(
- `${identifier}: Verify signature of bundled changeset`
- );
diff --git a/helpers/DATA/firefox/ui_branding/build.json b/helpers/DATA/firefox/ui_branding/build.json
deleted file mode 100644
index d51c79df..00000000
--- a/helpers/DATA/firefox/ui_branding/build.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "1d43f5a1-64bd-4ad4-b825-88a89878662f": {
- "title": "trisquel-abe-01",
- "theme": "dark",
- "attachment": {
- "hash": "962073af456fd63c6fc9b11dadbef724a56b223e04a7136f87e9b670f2b9283d",
- "size": 62524,
- "filename": "trisquel-abe-01.avif",
- "location": "main-workspace/newtab-wallpapers-v2/trisquel-abe-01.avif",
- "mimetype": "image/avif"
- },
- "background_position": "bottom right"
- },
- "2bf99683-cde8-438b-9f8e-a1222dc7f59c": {
- "title": "trisquel-abe-02",
- "theme": "light",
- "attachment": {
- "hash": "e3363cf5554c98e1243434ee047de9c31ddc3060355a55ce7b3cecd977f379ab",
- "size": 72574,
- "filename": "trisquel-abe-02.avif",
- "location": "main-workspace/newtab-wallpapers-v2/trisquel-abe-02.avif",
- "mimetype": "image/avif"
- },
- "background_position": "bottom right"
- },
- "2e468f89-ac6a-474f-a789-5de0be601887": {
- "title": "trisquel-abe-03",
- "theme": "dark",
- "attachment": {
- "hash": "3d6687928a6eeee6bd9f52ef2fae115ddfdcf974a832cce2286b37c642c0ede7",
- "size": 48020,
- "filename": "trisquel-abe-03.avif",
- "location": "main-workspace/newtab-wallpapers-v2/trisquel-abe-03.avif",
- "mimetype": "image/avif"
- },
- "background_position": "bottom right"
- },
- "429c288c-8d92-4baa-aefb-a04719882454": {
- "title": "trisquel-abe-04",
- "theme": "light",
- "attachment": {
- "hash": "f6b225b3f091dd556040028e758d143cbcb4d52d4e43ede3a2a367f44505993f",
- "size": 25226,
- "filename": "trisquel-abe-04.avif",
- "location": "main-workspace/newtab-wallpapers-v2/trisquel-abe-04.avif",
- "mimetype": "image/avif"
- },
- "background_position": "bottom right"
- },
- "451090be-cdf1-49fc-b1f3-bd2f3b4ac34d": {
- "title": "trisquel-aramo",
- "theme": "dark",
- "attachment": {
- "hash": "8c9ae9eb2063b763c737cd795af0f7b8883b43b2519d455b4097462ba6f4ad70",
- "size": 196288,
- "filename": "trisquel-aramo.avif",
- "location": "main-workspace/newtab-wallpapers-v2/trisquel-aramo.avif",
- "mimetype": "image/avif"
- }
- },
- "62aa72d9-b9f3-4f29-88f5-5120ee004e7c": {
- "title": "trisquel-ecne",
- "theme": "dark",
- "attachment": {
- "hash": "6a233237277c7cdc3a1078f250f1ae21576ceedec9d0abbe33be9f93add25355",
- "size": 110186,
- "filename": "trisquel-ecne.avif",
- "location": "main-workspace/newtab-wallpapers-v2/trisquel-ecne.avif",
- "mimetype": "image/avif"
- }
- }
-}
\ No newline at end of file
diff --git a/helpers/DATA/firefox/ui_branding/debranding/assets/puzzle-fox.svg b/helpers/DATA/firefox/ui_branding/debranding/assets/puzzle-fox.svg
deleted file mode 100644
index b4ba9bcf..00000000
--- a/helpers/DATA/firefox/ui_branding/debranding/assets/puzzle-fox.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
diff --git a/helpers/DATA/firefox/ui_branding/debranding/assets/trisquel_qr.png b/helpers/DATA/firefox/ui_branding/debranding/assets/trisquel_qr.png
deleted file mode 100644
index d6e08c71..00000000
Binary files a/helpers/DATA/firefox/ui_branding/debranding/assets/trisquel_qr.png and /dev/null differ
diff --git a/helpers/DATA/firefox/ui_branding/debranding/content/history-empty.svg b/helpers/DATA/firefox/ui_branding/debranding/content/history-empty.svg
deleted file mode 100644
index 1c18635f..00000000
--- a/helpers/DATA/firefox/ui_branding/debranding/content/history-empty.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
diff --git a/helpers/DATA/firefox/ui_branding/debranding/content/synced-tabs-empty.svg b/helpers/DATA/firefox/ui_branding/debranding/content/synced-tabs-empty.svg
deleted file mode 100644
index 9ba72654..00000000
--- a/helpers/DATA/firefox/ui_branding/debranding/content/synced-tabs-empty.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
diff --git a/helpers/DATA/firefox/ui_branding/debranding/content/synced-tabs-error.svg b/helpers/DATA/firefox/ui_branding/debranding/content/synced-tabs-error.svg
deleted file mode 100644
index 501befcf..00000000
--- a/helpers/DATA/firefox/ui_branding/debranding/content/synced-tabs-error.svg
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
diff --git a/helpers/DATA/firefox/ui_branding/sidebar/fsf.svg b/helpers/DATA/firefox/ui_branding/sidebar/fsf.svg
deleted file mode 100644
index 3f3bc136..00000000
--- a/helpers/DATA/firefox/ui_branding/sidebar/fsf.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/helpers/DATA/firefox/ui_branding/sidebar/liberachat.svg b/helpers/DATA/firefox/ui_branding/sidebar/liberachat.svg
deleted file mode 100644
index c76567fd..00000000
--- a/helpers/DATA/firefox/ui_branding/sidebar/liberachat.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/helpers/DATA/firefox/ui_branding/sidebar/trisquel.svg b/helpers/DATA/firefox/ui_branding/sidebar/trisquel.svg
deleted file mode 100644
index 43b8b1cc..00000000
--- a/helpers/DATA/firefox/ui_branding/sidebar/trisquel.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/helpers/DATA/firefox/ui_branding/sidebar/wikipedia.svg b/helpers/DATA/firefox/ui_branding/sidebar/wikipedia.svg
deleted file mode 100644
index cdfca18f..00000000
--- a/helpers/DATA/firefox/ui_branding/sidebar/wikipedia.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/helpers/DATA/firefox/ui_branding/wallpaper-replace.py b/helpers/DATA/firefox/ui_branding/wallpaper-replace.py
deleted file mode 100644
index 95942438..00000000
--- a/helpers/DATA/firefox/ui_branding/wallpaper-replace.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright (C) 2026 Luis Guzman
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-import json
-import hashlib
-import os
-import time
-import argparse
-import sys
-
-def calculate_sha256_hash(file_path):
- """
- Calculates the SHA-256 hash of a physical file.
- """
- sha256_hash = hashlib.sha256()
- with open(file_path, "rb") as f:
- for byte_block in iter(lambda: f.read(4096), b""):
- sha256_hash.update(byte_block)
- return sha256_hash.hexdigest()
-
-def build_step(config_path, output_path):
- """
- Step 1: Reads config.json, processes the data, and creates build.json.
- """
- print(f"--- Step 1: Building standalone artifact ---")
-
- if not os.path.exists(config_path):
- print(f"ERROR: Configuration file '{config_path}' not found.")
- sys.exit(1)
-
- with open(config_path, 'r', encoding='utf-8') as f:
- config = json.load(f)
-
- build_data = {}
-
- for item in config.get('replacements',):
- item_id = item.get('id_to_replace')
- image_path = item.get('local_image_path')
- theme = item.get('theme', '').strip()
-
- if not image_path or not os.path.exists(image_path):
- print(f"WARNING: Local image not found at '{image_path}' for ID {item_id}. Skipping.")
- continue
-
- file_size_bytes = os.path.getsize(image_path)
- sha256_hash = calculate_sha256_hash(image_path)
-
- # Get the real file name (e.g., 'trisquel-aramo.webp')
- real_file_name = os.path.basename(image_path)
-
- # Create the "disguised" file name to bypass Mozilla's strict schema validation
- disguised_file_name = real_file_name.replace('.webp', '.avif')
-
- # Create a 100% schema-compliant entry masking the webp as an avif
- build_data[item_id] = {
- "title": real_file_name.replace('.webp', ''),
- "theme": theme,
- "attachment": {
- "hash": sha256_hash,
- "size": file_size_bytes,
- "filename": disguised_file_name,
- "location": f"main-workspace/newtab-wallpapers-v2/{disguised_file_name}",
- "mimetype": "image/avif" # Masking the mime type for the validator
- }
- }
-
- # Check if the wallpaper is an "abe" one, to position logo accordingly
- if "abe" in real_file_name.lower():
- build_data[item_id]["background_position"] = "bottom right"
-
- # Make sure dark theme is used on trisquel-ecne & trisquel-aramo images
- if "trisquel-ecne" in real_file_name.lower() or "trisquel-aramo" in real_file_name.lower():
- build_data[item_id]["theme"] = "dark"
-
- print(f"Processed: {real_file_name} -> Masked as: {disguised_file_name} -> ID: {item_id}")
-
- with open(output_path, 'w', encoding='utf-8') as f:
- json.dump(build_data, f, indent=2, ensure_ascii=False)
-
- print(f"\nSUCCESS: Generated standalone artifact at '{output_path}'.")
-
-def replace_step(source_path, target_path):
- """
- Step 2: Injects the build.json data into the target Firefox JSON database.
- """
- print(f"\n--- Step 2: Injecting into target JSON ---")
-
- if not os.path.exists(source_path):
- print(f"ERROR: Build source file '{source_path}' not found.")
- sys.exit(1)
-
- if not os.path.exists(target_path):
- print(f"ERROR: Target JSON file '{target_path}' not found.")
- sys.exit(1)
-
- with open(source_path, 'r', encoding='utf-8') as f:
- build_data = json.load(f)
-
- with open(target_path, 'r', encoding='utf-8') as f:
- target_db = json.load(f)
-
- current_timestamp = int(time.time() * 1000)
- modified_count = 0
-
- for item in target_db.get('data',):
- item_id = item.get('id')
-
- if item_id in build_data:
- new_data = build_data[item_id]
-
- # Wipe old custom keys if they exist from previous tests
- item.pop('wallpaperUrl', None)
-
- # Apply schema-compliant data
- item['attachment'] = new_data['attachment']
- item['title'] = new_data['title']
- item['schema'] = current_timestamp
- item['last_modified'] = current_timestamp
-
- if new_data.get('theme'):
- item['theme'] = new_data['theme']
-
- # Apply background_position if it exists in build_data
- if new_data.get('background_position'):
- item['background_position'] = new_data['background_position']
-
- print(f"Updated ID: {item_id} with file '{new_data['attachment']['filename']}'")
- modified_count += 1
-
- if modified_count > 0:
- target_db['timestamp'] = current_timestamp
- with open(target_path, 'w', encoding='utf-8') as f:
- json.dump(target_db, f, indent=2, ensure_ascii=False)
- print(f"\nSUCCESS: Modified {modified_count} entries in '{target_path}'.")
- else:
- print("\nWARNING: No matching IDs found in the target JSON to replace.")
-
-def main():
- parser = argparse.ArgumentParser(description="Firefox Newtab Wallpaper Injection Tool")
- parser.add_argument('--config', type=str, nargs='?', const='./config.json', help="Step 1: Path to config.json.")
- parser.add_argument('--replace', type=str, help="Step 2: Path to target Firefox JSON file to be modified.")
- parser.add_argument('--source', type=str, default='./build.json', help="Step 2: Path to the standalone build.json.")
-
- args = parser.parse_args()
-
- if not args.config and not args.replace:
- parser.print_help()
- sys.exit(1)
-
- if args.config: build_step(args.config, './build.json')
- if args.replace: replace_step(args.source, args.replace)
-
-if __name__ == "__main__":
- main()
diff --git a/helpers/DATA/guix/apparmor/0001-etc-Add-AppArmor-profile-for-the-daemon.patch b/helpers/DATA/guix/apparmor/0001-etc-Add-AppArmor-profile-for-the-daemon.patch
deleted file mode 100644
index f726d383..00000000
--- a/helpers/DATA/guix/apparmor/0001-etc-Add-AppArmor-profile-for-the-daemon.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From bfa24370939620efd8b3220bd1206f92fc235107 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?No=C3=A9=20Lopez?=
-Date: Mon, 8 Dec 2025 16:39:11 +0100
-Subject: [PATCH 1/2] etc: Add AppArmor profile for the daemon.
-
-* .gitignore: Add etc/apparmor.d/tunables/guix.
-* Makefile.am (nodist_apparmor_profile_DATA)
-(nodist_apparmor_profile_tunables_DATA): Define it.
-* configure.ac: Generate etc/apparmor.d/tunables/guix. Add
---with-apparmor-profile-dir option.
-* etc/apparmor.d/guix-daemon: New file.
-* etc/apparmor.d/tunables/guix.in: New file.
-* doc/guix.texi: Document AppArmor profiles.
-* gnu/packages/package-management.scm (guix): Add future changes commented.
-
-Change-Id: Iac7df9d642383cc46a2d450c3badef31199ab041
-GNUtoo: rebased:
-- removed .gitignore changes
-- removed manual changes in the "Migrating to the Unprivileged Daemon"
- subsection.
-Signed-off-by: Rutherther
----
- Makefile.am | 7 +++
- configure.ac | 10 ++++
- doc/guix.texi | 39 +++++++++++++
- etc/apparmor.d/guix-daemon | 88 +++++++++++++++++++++++++++++
- etc/apparmor.d/tunables/guix.in | 5 ++
- gnu/packages/package-management.scm | 4 ++
- 6 files changed, 153 insertions(+)
- create mode 100644 etc/apparmor.d/guix-daemon
- create mode 100644 etc/apparmor.d/tunables/guix.in
-
-diff --git a/Makefile.am b/Makefile.am
-index 28546be18c..b54b217416 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -660,6 +660,13 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish
- # SELinux policy
- nodist_selinux_policy_DATA = etc/guix-daemon.cil
-
-+# AppArmor profiles.
-+nodist_apparmor_profile_DATA = \
-+ etc/apparmor.d/guix-daemon
-+
-+nodist_apparmor_profile_tunables_DATA = \
-+ etc/apparmor.d/tunables/guix
-+
- EXTRA_DIST += \
- .dir-locals.el \
- .guix-authorizations \
-diff --git a/configure.ac b/configure.ac
-index 92dede8014..73c7448758 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,6 +64,15 @@ AC_ARG_WITH([selinux-policy-dir],
- [selinux_policydir='${datadir}/selinux/'])
- AC_SUBST([selinux_policydir])
-
-+AC_ARG_WITH([apparmor-profile-dir],
-+ AS_HELP_STRING([--with-apparmor-profile-dir=DIR],
-+ [name of the AppArmor profile directory]),
-+ [apparmor_profiledir="$withval"],
-+ [apparmor_profiledir='${sysconfdir}/apparmor.d'])
-+AC_SUBST([apparmor_profiledir])
-+apparmor_profile_tunablesdir='${apparmor_profiledir}/tunables'
-+AC_SUBST([apparmor_profile_tunablesdir])
-+
- dnl Better be verbose.
- AC_MSG_CHECKING([for the store directory])
- AC_MSG_RESULT([$storedir])
-@@ -271,6 +280,7 @@ AC_CONFIG_FILES([Makefile
- po/guix/Makefile.in
- po/packages/Makefile.in
- etc/guix-daemon.cil
-+ etc/apparmor.d/tunables/guix
- guix/config.scm])
-
- AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm])
-diff --git a/doc/guix.texi b/doc/guix.texi
-index 784114f0bb..f0954f0d5d 100644
---- a/doc/guix.texi
-+++ b/doc/guix.texi
-@@ -109,6 +109,7 @@ Copyright @copyright{} 2022 Reily Siegel@*
- Copyright @copyright{} 2022 Simon Streit@*
- Copyright @copyright{} 2022 (@*
- Copyright @copyright{} 2022 John Kehayias@*
-+Copyright @copyright{} 2025 Noé Lopez@*
-
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.3 or
-@@ -1137,6 +1138,7 @@ the daemon to download pre-built binaries.
- * Build Environment Setup:: Preparing the isolated build environment.
- * Daemon Offload Setup:: Offloading builds to remote machines.
- * SELinux Support:: Using an SELinux policy for the daemon.
-+* AppArmor Support:: Using an AppArmor profile for the daemon.
- @end menu
-
- @node Build Environment Setup
-@@ -1593,6 +1595,43 @@ installation time whenever the Guix package that provides the
- effectively running @code{guix-daemon} executable is upgraded.
- @end enumerate
-
-+@node AppArmor Support
-+@subsection AppArmor Support
-+
-+@cindex AppArmor
-+
-+Guix includes an AppArmor profile for the build daemon in
-+@file{etc/apparmor.d/guix-daemon} that can be installed on systems with
-+strict AppArmor policies to allow it to run unprivileged
-+(@pxref{Build Environment Setup}). Indeed, the unprivileged daemon makes
-+use of Linux user namespaces but these are disallowed
-+without an AppArmor policy on some systems like Ubuntu.
-+
-+To know if this applies to you, check if the
-+@code{kernel.apparmor_restrict_unprivileged_userns} kernel parameter is
-+enabled.
-+
-+@subsubsection Installing the AppArmor profile
-+@cindex AppArmor, profile installation
-+
-+@quotation Note
-+The @code{guix-install.sh} binary installation script offers to perform
-+the steps below for you (@pxref{Binary Installation}).
-+@end quotation
-+
-+Run these commands as root to install the profile:
-+
-+@example
-+export apparmor_sources=/var/guix/profiles/per-user/root/current-guix/etc/apparmor.d
-+cp -f -t /etc/apparmor.d/tunables "$apparmor_sources/tunables/guix"
-+cp -f -t /etc/apparmor.d "$apparmor_sources/guix-daemon"
-+cp -f -t /etc/apparmor.d "$apparmor_sources/guix"
-+apparmor_parser -r /etc/apparmor.d/guix-daemon
-+apparmor_parser -r /etc/apparmor.d/guix
-+@end example
-+
-+After this, the build daemon will be able to function correctly.
-+
- @node Invoking guix-daemon
- @section Invoking @command{guix-daemon}
- @cindex @command{guix-daemon}
-diff --git a/etc/apparmor.d/guix-daemon b/etc/apparmor.d/guix-daemon
-new file mode 100644
-index 0000000000..cb1ee92685
---- /dev/null
-+++ b/etc/apparmor.d/guix-daemon
-@@ -0,0 +1,88 @@
-+abi ,
-+
-+include
-+include
-+
-+profile guix-daemon @{guix_storedir}/*-{guix-daemon,guix}-*/bin/guix-daemon flags=(enforce,attach_disconnected.path=/disconnected) {
-+ include
-+
-+ userns,
-+ signal,
-+ capability sys_admin,
-+ capability net_admin,
-+ capability sys_chroot,
-+ capability setgid,
-+ capability chown,
-+ network dgram,
-+ umount,
-+ mount,
-+ pivot_root,
-+ # Paths inside build chroot
-+ /real-root/ w,
-+ / w,
-+
-+ @{guix_localstatedir}/guix/** rwk,
-+ /var/log/guix/** w,
-+ owner @{PROC}/@{pid}/{fd/,environ} r,
-+ owner @{PROC}/@{pid}/oom_score_adj w,
-+ owner @{PROC}/@{pid}/uid_map rw,
-+ owner @{PROC}/@{pid}/gid_map rw,
-+ owner @{PROC}/@{pid}/setgroups w,
-+ @{guix_storedir}/ r,
-+ @{guix_storedir}/** rwlmk,
-+ @{guix_storedir}/*/bin/guile cx -> guix-builder,
-+ @{guix_storedir}/*-guix-command cx -> guix-helper,
-+ @{guix_storedir}/*-guix-*/bin/guix cx -> guix-helper,
-+ @{etc_rw}/nsswitch.conf r,
-+ @{etc_rw}/passwd r,
-+ @{etc_rw}/group r,
-+ owner /tmp/** rwl,
-+ owner /var/tmp/** rwl,
-+
-+ /usr/bin/newgidmap Ux,
-+
-+ # Site-specific additions and overrides. See local/README for details.
-+ include if exists
-+
-+ profile guix-builder flags=(enforce,attach_disconnected.path=/disconnected) {
-+ include
-+
-+ signal (receive),
-+
-+ @{guix_storedir}/** rwlmkux,
-+
-+ owner /tmp/** rw,
-+
-+ @{PROC}/@{pid}/fd/ r,
-+
-+ /disconnected/** rw,
-+ }
-+
-+ # This is for any time guix is called by the daemon as a helper:
-+ # - guix download
-+ # - guix discover
-+ # - guix gc --list-busy
-+ # - probably more?
-+ profile guix-helper flags=(enforce,attach_disconnected.path=/disconnected) {
-+ include
-+ include
-+
-+ signal (receive),
-+ ptrace (read) peer=guix-daemon,
-+
-+ /disconnected/run/dbus/system_bus_socket rw,
-+ dbus (send, receive),
-+ @{guix_localstatedir}/guix/discover/ rw,
-+ @{guix_localstatedir}/guix/discover/* rw,
-+
-+ @{guix_localstatedir}/guix/substitute/ rw,
-+ @{guix_localstatedir}/guix/substitute/** rwk,
-+
-+ @{guix_sysconfdir}/guix/** r,
-+
-+ @{guix_storedir}/** rwlmix,
-+
-+ @{PROC}/ r,
-+ owner @{PROC}/@{pid}/{fd/,environ} r,
-+ }
-+}
-diff --git a/etc/apparmor.d/tunables/guix.in b/etc/apparmor.d/tunables/guix.in
-new file mode 100644
-index 0000000000..e93f7caeb7
---- /dev/null
-+++ b/etc/apparmor.d/tunables/guix.in
-@@ -0,0 +1,5 @@
-+@{guix_storedir} = @storedir@
-+@{guix_sysconfdir} = @guix_sysconfdir@
-+@{guix_localstatedir} = @guix_localstatedir@
-+
-+include if exists
-\ No newline at end of file
-diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
-index 5a09b1fcf8..9f92e6fdaa 100644
---- a/gnu/packages/package-management.scm
-+++ b/gnu/packages/package-management.scm
-@@ -199,6 +199,10 @@ (define-public guix
- (string-append "--with-bash-completion-dir="
- (assoc-ref %outputs "out")
- "/etc/bash_completion.d")
-+ ;; TODO: Uncomment after guix is updated.
-+ ;; (string-append "--with-apparmor-profile-dir="
-+ ;; (assoc-ref %outputs "out")
-+ ;; "/etc/apparmor.d")
-
- ;; Set 'DOT_USER_PROGRAM' to the empty string so
- ;; we don't keep a reference to Graphviz, whose
---
-2.43.0
-
diff --git a/helpers/DATA/guix/apparmor/0002-etc-Add-AppArmor-profile-for-the-guix-command.patch b/helpers/DATA/guix/apparmor/0002-etc-Add-AppArmor-profile-for-the-guix-command.patch
deleted file mode 100644
index b87277a7..00000000
--- a/helpers/DATA/guix/apparmor/0002-etc-Add-AppArmor-profile-for-the-guix-command.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1de980051855bafb37d7e7df6e7d0e1739a46167 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?No=C3=A9=20Lopez?=
-Date: Mon, 15 Dec 2025 01:03:36 +0100
-Subject: [PATCH 2/2] etc: Add AppArmor profile for the guix command.
-
-* etc/apparmor.d/guix: New file.
-* Makefile.am (nodist_apparmor_profile_DATA): Add it.
-
-Change-Id: I3d61238203d7663ce582717f8e4eac4c6f679928
-Signed-off-by: Rutherther
----
- Makefile.am | 1 +
- etc/apparmor.d/guix | 12 ++++++++++++
- 2 files changed, 13 insertions(+)
- create mode 100644 etc/apparmor.d/guix
-
-diff --git a/Makefile.am b/Makefile.am
-index b54b217416..a811d952c2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -662,6 +662,7 @@ nodist_selinux_policy_DATA = etc/guix-daemon.cil
-
- # AppArmor profiles.
- nodist_apparmor_profile_DATA = \
-+ etc/apparmor.d/guix \
- etc/apparmor.d/guix-daemon
-
- nodist_apparmor_profile_tunables_DATA = \
-diff --git a/etc/apparmor.d/guix b/etc/apparmor.d/guix
-new file mode 100644
-index 0000000000..f1442cf5d3
---- /dev/null
-+++ b/etc/apparmor.d/guix
-@@ -0,0 +1,12 @@
-+abi ,
-+
-+include
-+include
-+
-+# There’s no point in confining the guix executable, since it can run
-+# any user code and so everything is expected. We just need to
-+# explicitely enable userns for systems with the
-+# kernel.apparmor_restrict_unprivileged_userns sysctl.
-+profile guix @{guix_storedir}/{*-guix-command,*-guix-*/bin/guix} flags=(unconfined) {
-+ userns,
-+}
-\ No newline at end of file
---
-2.43.0
-
diff --git a/helpers/DATA/guix/apparmor/0003-debian-build-apparmor-profile.patch b/helpers/DATA/guix/apparmor/0003-debian-build-apparmor-profile.patch
deleted file mode 100644
index 7d18a6d4..00000000
--- a/helpers/DATA/guix/apparmor/0003-debian-build-apparmor-profile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ee98e3a1ccc4d60daad48767e1466586f23521a3 Mon Sep 17 00:00:00 2001
-From: Denis 'GNUtoo' Carikli
-Date: Wed, 6 May 2026 07:41:12 +0200
-Subject: [PATCH] debian: build apparmor profile.
-
-Signed-off-by: Denis 'GNUtoo' Carikli
----
- debian/control | 1 +
- debian/rules | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index 242c44f9be..675ff59936 100644
---- a/debian/control
-+++ b/debian/control
-@@ -4,6 +4,7 @@ Priority: optional
- Maintainer: Trisquel GNU/Linux developers
- XSBC-Original-Maintainer: Vagrant Cascadian
- Build-Depends: debhelper-compat (=13),
-+ dh-apparmor,
- gettext,
- # git and gnupg are used for tests/guix-build-branch.sh.
- git ,
-diff --git a/debian/rules b/debian/rules
-index 8a71f3cdea..8b9f71e7e6 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -68,6 +68,8 @@ override_dh_install:
- printf ' (tag\n (guix import)\n )\n )\n )\n' >> debian/guix/etc/guix/acl
- rmdir debian/guix/usr/lib/*/systemd/system/
- rmdir debian/guix/usr/lib/*/systemd/
-+ dh_apparmor --profile-name=guix -pguix
-+ dh_apparmor --profile-name=guix-daemon -pguix
-
- override_dh_auto_clean:
- dh_auto_clean
---
-2.43.0
-
diff --git a/helpers/DATA/itinerary/patch_changes/001-manually-add-missing-deps.patch b/helpers/DATA/itinerary/patch_changes/001-manually-add-missing-deps.patch
deleted file mode 100644
index 887a625a..00000000
--- a/helpers/DATA/itinerary/patch_changes/001-manually-add-missing-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/control b/debian/control
-index fb3d81f2..a8f07273 100644
---- a/debian/control
-+++ b/debian/control
-@@ -57,6 +57,8 @@ Depends: plasma-framework,
- qml-module-org-kde-kopeninghours,
- qml-module-org-kde-kosmindoormap,
- qml-module-org-kde-kpublictransport,
-+ qml-module-org-kde-kirigami-addons-datetime,
-+ qml-module-org-kde-kirigami-addons-labs-mobileform,
- qml-module-org-kde-prison,
- qml-module-qt-labs-platform,
- qml-module-qt-labs-qmlmodels,
diff --git a/helpers/DATA/kernel/apply_policies.py b/helpers/DATA/kernel/apply_policies.py
deleted file mode 100644
index 61ca1b54..00000000
--- a/helpers/DATA/kernel/apply_policies.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import json
-import subprocess
-import os
-
-def set_annotation(config, arch, flavour, value, annotations_file):
- """Executes the Debian script to enforce a specific kernel configuration."""
-
- cmd = [
- "python3",
- "debian/scripts/misc/annotations",
- "--file", annotations_file,
- "--arch", arch,
- "--flavour", flavour,
- "--config", config,
- "--write", value
- ]
-
- print(f"Setting {config} for {arch} ({flavour}) to '{value}'")
-
- try:
- subprocess.run(cmd, check=True, stdout=subprocess.DEVNULL)
- except subprocess.CalledProcessError:
- print(f" [ERROR] Failed to apply {config} on {arch} ({flavour})", file=sys.stderr)
-
-def main():
- # Fetch the environment variable exported by helper
- target_file = os.environ.get("KERNEL_CONFIG_ANNOTATIONS")
-
- # Fail fast if the annotations file is not defined
- if not target_file:
- print("[FATAL ERROR] KERNEL_CONFIG_ANNOTATIONS environment variable is not set.", file=sys.stderr)
- print("Aborting to prevent modifying the wrong configuration file.", file=sys.stderr)
- sys.exit(1)
-
- print(f"[INFO] Target annotations file: {target_file}")
-
- # Read and parse the JSON policy from stdin
- try:
- policy_dict = json.load(sys.stdin)
- except json.JSONDecodeError as e:
- print(f"[FATAL ERROR] Invalid JSON policy format: {e}", file=sys.stderr)
- sys.exit(1)
-
- # Process the nested dictionary
- for config, archs in policy_dict.items():
- for key, value in archs.items():
-
- # Check if the key contains a flavour delimiter (e.g., "arm64/generic-64k")
- if "/" in key:
- arch, flavour = key.split("/", 1)
- set_annotation(config, arch, flavour, value, target_file)
-
- # Backward compatibility for nested dicts (just in case)
- elif isinstance(value, dict):
- for flavour_nested, val_nested in value.items():
- set_annotation(config, key, flavour_nested, val_nested, target_file)
-
- # If it's just a plain string without a slash, default to 'generic'
- else:
- set_annotation(config, key, "generic", value, target_file)
-
-if __name__ == "__main__":
- main()
diff --git a/helpers/DATA/libreoffice/patch_changes/000-debian-rules_7.3.patch b/helpers/DATA/libreoffice/debian-rules_7.3.patch
similarity index 100%
rename from helpers/DATA/libreoffice/patch_changes/000-debian-rules_7.3.patch
rename to helpers/DATA/libreoffice/debian-rules_7.3.patch
diff --git a/helpers/DATA/libreoffice/patch_changes/001-disable_tests_pyuno_trisquel.patch b/helpers/DATA/libreoffice/patch_changes/001-disable_tests_pyuno_trisquel.patch
deleted file mode 100644
index 4dbd438c..00000000
--- a/helpers/DATA/libreoffice/patch_changes/001-disable_tests_pyuno_trisquel.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/debian/control b/debian/control
-index b0f95119..073ece8e 100644
---- a/debian/control
-+++ b/debian/control
-@@ -196,9 +196,7 @@ Build-Depends-Arch: at-spi2-core [amd64 arm64 armhf] ,
- poppler-data [amd64 arm64 armhf] ,
- pstoedit [amd64 arm64 armhf] ,
- python3-lxml [!ppc64el !riscv64 !s390x] ,
-- python3-pip [!ppc64el !riscv64 !s390x] ,
- python3-setuptools [!ppc64el !riscv64 !s390x] ,
-- python3-venv [!ppc64el !riscv64 !s390x] ,
- qt5-qmake,
- qtbase5-dev,
- qtbase5-dev-tools,
-diff --git a/pyuno/qa/pytests/testimports.py b/pyuno/qa/pytests/testimports.py
-index 29b14736..85ed1a53 100644
---- a/pyuno/qa/pytests/testimports.py
-+++ b/pyuno/qa/pytests/testimports.py
-@@ -33,6 +33,7 @@ class ImportsTest(unittest.TestCase):
- print(str(ssl), file=devnull)
-
- # tdf#162786: make sure importing pip works on all platforms
-+ @unittest.skip("Test disabled on Trisquel")
- def test_pip_import(self):
- import pip
-
-@@ -40,6 +41,7 @@ class ImportsTest(unittest.TestCase):
- with open(os.devnull, "w") as devnull:
- print(str(pip), file=devnull)
-
-+ @unittest.skip("Test disabled on Trisquel")
- def test_venv_import(self):
- import venv
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/amd64/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/amd64/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/amd64/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/amd64/nic-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/amd64/nic-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/amd64/scsi-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/scsi-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/amd64/scsi-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/arm64/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/arm64/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/arm64/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/arm64/nic-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/arm64/nic-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/arm64/scsi-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/scsi-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/arm64/scsi-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/armhf/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/armhf/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/armhf/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/nic-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/nic-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/nic-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/scsi-modules
similarity index 96%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/scsi-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/scsi-modules
index 675462a1..8909dfb7 100644
--- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/i386/scsi-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/nic-modules
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/nic-modules
@@ -0,0 +1 @@
+
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/nic-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/nic-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/nic-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/scsi-modules
similarity index 96%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/scsi-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/scsi-modules
index 675462a1..8909dfb7 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/powerpc/scsi-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/nic-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nic-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/nic-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/scsi-modules
similarity index 96%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/scsi-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/scsi-modules
index 675462a1..8909dfb7 100644
--- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/ppc64el/scsi-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/README.txt b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/README.txt
new file mode 100644
index 00000000..27a8600b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/README.txt
@@ -0,0 +1,4 @@
+#
+# Place the names of udeb modules into this directory that require
+# runtime firmware.
+#
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/nic-modules
similarity index 58%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/nic-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/nic-modules
index 863652ef..2512e839 100644
--- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/nic-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/nic-modules
@@ -1,2 +1 @@
#include
-mdio-bcm-unimac
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/scsi-modules
similarity index 52%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/scsi-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/scsi-modules
index 9b1fa27b..8909dfb7 100644
--- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/s390x/scsi-modules
@@ -1,3 +1 @@
#include
-# To support nvme
-vmd
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/scsi-modules
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/firmware/scsi-modules
@@ -0,0 +1 @@
+
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/kernel-versions b/helpers/DATA/linux-hwe-6.17/udeb/d-i/kernel-versions
index ecb32e3a..791737f8 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/kernel-versions
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/kernel-versions
@@ -10,8 +10,6 @@ arm64 - generic - - -
ppc64el - generic - - -
-riscv64 - generic - - -
-
s390x - generic - - -
# Ports
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/affs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/affs-modules
deleted file mode 100644
index ac282591..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/affs-modules
+++ /dev/null
@@ -1 +0,0 @@
-affs
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/block-modules
new file mode 100644
index 00000000..f937d0e0
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/block-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/crc-modules
new file mode 100644
index 00000000..7e00de70
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/crc-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/crypto-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/crypto-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/crypto-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/crypto-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fat-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/fat-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fat-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fb-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/fb-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fb-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/floppy-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/floppy-modules
new file mode 100644
index 00000000..bc84c4e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/floppy-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fs-core-modules
new file mode 100644
index 00000000..024c2d7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fs-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fs-secondary-modules
new file mode 100644
index 00000000..3689f185
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/fs-secondary-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/isofs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/isofs-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/isofs-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/isofs-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/kernel-image
similarity index 60%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/kernel-image
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/kernel-image
index b17bb591..1d11b192 100644
--- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/kernel-image
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/kernel-image
@@ -1,2 +1 @@
#include
-bestcomm-core ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/md-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/md-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/md-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/message-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/message-modules
new file mode 100644
index 00000000..9b060b37
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/message-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/mouse-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/mouse-modules
new file mode 100644
index 00000000..15fcb00e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/mouse-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/multipath-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/multipath-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/multipath-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/multipath-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/nic-modules
new file mode 100644
index 00000000..2512e839
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/nic-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-shared-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/nic-shared-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-wireless-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-wireless-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/nic-wireless-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/parport-modules
new file mode 100644
index 00000000..83966f77
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/parport-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/scsi-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/scsi-core-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/scsi-core-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/scsi-modules
new file mode 100644
index 00000000..c5e6593a
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/scsi-modules
@@ -0,0 +1,2 @@
+#include
+ipr ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/serial-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/serial-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/serial-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/storage-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/storage-core-modules
new file mode 100644
index 00000000..cb5278ea
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/storage-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/usb-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/usb-storage-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/usb-storage-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/virtio-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/virtio-modules
new file mode 100644
index 00000000..61da3965
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/virtio-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/vlan-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/vlan-modules
new file mode 100644
index 00000000..a8947e0b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64-virtual/vlan-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ata-modules.trisquel-disabled b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ata-modules.trisquel-disabled
deleted file mode 100644
index 9409e7cd..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ata-modules.trisquel-disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/block-modules
new file mode 100644
index 00000000..f937d0e0
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/block-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/btrfs-modules
deleted file mode 100644
index e261e138..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/cdrom-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/cdrom-core-modules
deleted file mode 100644
index e264d7aa..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/cdrom-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/crc-modules
new file mode 100644
index 00000000..7e00de70
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/crc-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/crypto-dm-modules
deleted file mode 100644
index 4c8f2354..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/drm-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/drm-core-modules
deleted file mode 100644
index 0428c279..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/drm-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ext4-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ext4-modules
deleted file mode 100644
index 394c577c..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/f2fs-modules
deleted file mode 100644
index 34359e04..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/f2fs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fat-modules
index cce8fd30..274584eb 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fat-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fat-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fb-modules
index 8e9892fe..87c0ad5b 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fb-modules
@@ -2,3 +2,4 @@
vesafb ?
vga16fb
+
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/floppy-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/floppy-modules
new file mode 100644
index 00000000..bc84c4e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/floppy-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fs-core-modules
new file mode 100644
index 00000000..024c2d7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fs-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fs-secondary-modules
new file mode 100644
index 00000000..3689f185
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/fs-secondary-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/i2c-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/i2c-modules
new file mode 100644
index 00000000..203a607e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/i2c-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ipmi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ipmi-modules
new file mode 100644
index 00000000..d0fc9797
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ipmi-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/jfs-modules
deleted file mode 100644
index 7e4d912b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/kernel-image
index bc759086..1d11b192 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/kernel-image
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/kernel-image
@@ -1,18 +1 @@
#include
-
-# ACPI drivers
-fan
-thermal
-
-# Optimised CRC32
-crc32_pclmul ?
-
-# pmem drivers for UEFI HTTP boot
-nd_pmem
-nfit
-
-# Intel pinctrl drivers
-drivers/pinctrl/intel/**
-
-# SPI devices
-drivers/spi/**
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/loop-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/loop-modules
deleted file mode 100644
index 16446771..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/loop-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/md-modules
index ade088dd..26115e10 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/md-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/md-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/message-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/message-modules
new file mode 100644
index 00000000..9b060b37
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/message-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mmc-core-modules.trisquel-disabled b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mmc-core-modules.trisquel-disabled
deleted file mode 100644
index 7bf38465..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mmc-core-modules.trisquel-disabled
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mmc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mmc-modules
deleted file mode 100644
index dadfd533..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mmc-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mouse-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mouse-modules
new file mode 100644
index 00000000..15fcb00e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/mouse-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/nbd-modules
deleted file mode 100644
index 3c9b3e5d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/nfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/nfs-modules
new file mode 100644
index 00000000..946fb8e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/nfs-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/parport-modules
new file mode 100644
index 00000000..83966f77
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/parport-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/pata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/pata-modules
index 8c4e514a..b0cd6337 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/pata-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/pata-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/plip-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/plip-modules
new file mode 100644
index 00000000..ca7a41bb
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/plip-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ppp-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ppp-modules
index f1ae9b3d..1f26aa1e 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ppp-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/ppp-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/rfkill-modules.trisquel-disabled b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/rfkill-modules.trisquel-disabled
deleted file mode 100644
index 77a2245c..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/rfkill-modules.trisquel-disabled
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/scsi-modules
index 9b1fa27b..c5e6593a 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/scsi-modules
@@ -1,3 +1,2 @@
#include
-# To support nvme
-vmd
+ipr ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/scsi-nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/scsi-nic-modules
deleted file mode 100644
index 089dd5dc..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/scsi-nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/sound-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/sound-modules
deleted file mode 100644
index 68395ab3..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/sound-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/squashfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/squashfs-modules
deleted file mode 100644
index 42d77887..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/storage-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/storage-core-modules
new file mode 100644
index 00000000..cb5278ea
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/storage-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/udf-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/udf-modules
deleted file mode 100644
index b90d7ee9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/uinput-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/uinput-modules
deleted file mode 100644
index 58a83377..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/usb-serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/usb-serial-modules
deleted file mode 100644
index c0a0dc3b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/usb-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/usb-storage-modules
index 272d95e2..8c5e81b5 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/usb-storage-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/usb-storage-modules
@@ -1,2 +1 @@
#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/virtio-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/virtio-modules
new file mode 100644
index 00000000..61da3965
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/virtio-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/vlan-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/vlan-modules
new file mode 100644
index 00000000..a8947e0b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/vlan-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/xfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/xfs-modules
deleted file mode 100644
index c020b5d3..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/amd64/xfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ata-modules
deleted file mode 100644
index 9409e7cd..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ata-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/block-modules
new file mode 100644
index 00000000..f937d0e0
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/block-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/btrfs-modules
deleted file mode 100644
index e261e138..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/cdrom-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/cdrom-core-modules
deleted file mode 100644
index e264d7aa..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/cdrom-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/crc-modules
new file mode 100644
index 00000000..7e00de70
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/crc-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/crypto-dm-modules
deleted file mode 100644
index 4c8f2354..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ext4-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ext4-modules
deleted file mode 100644
index 394c577c..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/f2fs-modules
deleted file mode 100644
index 34359e04..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/f2fs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fb-modules
index 15739430..956d9a69 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fb-modules
@@ -3,14 +3,11 @@
ast
tegra-drm
rockchipdrm
+# Temporarily disabled DRM_HISI_HIBMC, FTBFS on 6.14
hibmc-drm ?
# For panel/backlight on some chromeos devices
panel-simple
-panel-edp
-panel-samsung-atna33xc20
-panel-himax-hx83102
-panel-ilitek-ili9882t
pwm_bl
pwm-cros-ec
@@ -23,37 +20,3 @@ sun8i-mixer
# For panel/backlight on Pinebook Pro
pwm-rockchip
-# For HDMI on some sunxi platforms (e.g. Orange Pi 1+)
-sun8i-drm-hdmi
-
-# For HDMI on some rockchip platforms (e.g. rock64-rk3328)
-nvmem-rockchip-efuse ?
-phy-rockchip-inno-hdmi
-
-# For panel/backlight on MNT Reform 2
-pwm-imx27
-nwl-dsi
-ti-sn65dsi86
-imx-dcss
-mxsfb
-mux-mmio
-imx8mq-interconnect
-
-# Qualcomm devices
-gpu-sched
-
-# Mediatek devices
-mediatek-drm
-mediatek-drm-hdmi ?
-mtk_dp
-mtk_iommu
-mtk-smi
-phy-mtk-dp
-phy-mtk-hdmi-drv
-phy-mtk-mipi-dsi-drv
-pwm-mtk-disp
-
-# DRM bridges
-anx7625
-parade-ps8640
-ite-it6505
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fs-core-modules
new file mode 100644
index 00000000..024c2d7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fs-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fs-secondary-modules
new file mode 100644
index 00000000..3689f185
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/fs-secondary-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/i2c-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/i2c-modules
new file mode 100644
index 00000000..6f839a7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/i2c-modules
@@ -0,0 +1,5 @@
+#include
+i2c-tegra
+i2c-rk3x
+i2c-mv64xxx
+i2c-imx
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/input-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/input-modules
index e4acedaf..5ecb595a 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/input-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/input-modules
@@ -1,3 +1 @@
#include
-
-leds_qcom_lpg ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ipmi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ipmi-modules
new file mode 100644
index 00000000..d0fc9797
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/ipmi-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/jfs-modules
deleted file mode 100644
index 7e4d912b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/kernel-image
index 69e1bb04..1d11b192 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/kernel-image
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/kernel-image
@@ -1,109 +1 @@
#include
-
-# Multifunction devices
-drivers/mfd/**
-
-# Regulators
-drivers/regulator/**
-
-# Some regulators on RK3588 require GPIO
-gpio-rockchip
-
-# NIC,sata, and USB on Armada 8K
-phy-mvebu-cp110-comphy ?
-
-# SoC modules
-drivers/soc/**
-
-# Watchdogs: boot loader may start a watchdog that we need to pet,
-# and/or it may be the only way to trigger reboot
-drivers/watchdog/**
-
-# SPI devices
-drivers/spi/**
-
-# Force mtd as spi/spi-mtk-snfi depends on ecc-mtk,nandcore -> mtd
-mtd ?
-
-# For cros_ec mfd device
-cros_ec_spi ?
-
-# PCIe PHYs
-phy-rockchip-pcie ?
-
-# PCIe x4 on RK3588 (usually NVME)
-phy-rockchip-snps-pcie3
-
-# USB/SATA/PCIe on Rockchip RK3588
-phy-rockchip-naneng-combphy
-
-# For spi-rockchip
-pl330 ?
-
-# Regulator-SoC synchronization
-rockchip-io-domain ?
-
-# Pin controllers
-drivers/pinctrl/**
-
-# EFUSE/OTP drivers
-nvmem-imx-ocotp ?
-nvmem_mtk-efuse
-
-# DRM modules as soc/qcom/phy-qcom-qmp-combo -> aux-hpd-bridge -> drm
-drm
-drm_kms_helper
-
-# Qualcomm devices
-qcom-apcs-ipc-mailbox
-qcom-ipcc
-nvmem_qcom-spmi-sdam
-nvmem_qfprom
-bam_dma
-phy_qcom_edp ?
-phy-qcom-qmp-combo
-phy-qcom-qmp-pcie
-qcom_glink
-qcom_glink_smem
-qcom_glink_rpm
-qcom_smd
-qcom_hwspinlock
-icc-osm-l3
-rpmpd
-qrtr ?
-qrtr-smd ?
-
-qnoc-sc7180
-qnoc-sc8280xp
-qnoc-sc8180x
-qnoc-x1e80100 ?
-
-# Mediatek devices
-mtk-cmdq-mailbox
-phy-mtk-tphy
-pwm-mediatek
-
-# TypeC connector stuff used by phy-qcom-qmp-combo and pmic_glink_altmode modules
-typec ?
-
-# I²C drivers
-i2c-tegra
-i2c-rk3x
-i2c-mv64xxx
-i2c-imx
-i2c-qcom-geni
-i2c-qup
-i2c-omap
-i2c-mt65xx
-
-# TI AM64 / AM65 ICSSG PRU subsystem
-drivers/irqchip/irq-pruss-intc
-drivers/remoteproc/pru_rproc
-
-# RTC
-drivers/rtc/**
-
-# pmem drivers for UEFI HTTP boot (or u-boot)
-of_pmem
-nd_pmem
-nfit
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/loop-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/loop-modules
deleted file mode 100644
index c1c948fa..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/message-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/message-modules
new file mode 100644
index 00000000..9b060b37
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/message-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mmc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mmc-modules
deleted file mode 100644
index c9f12f3b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mmc-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include
-
-phy-rockchip-emmc
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mouse-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mouse-modules
new file mode 100644
index 00000000..15fcb00e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mouse-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/mtd-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mtd-core-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/mtd-core-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/mtd-core-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nbd-modules
deleted file mode 100644
index 3c9b3e5d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nfs-modules
new file mode 100644
index 00000000..946fb8e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nfs-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nic-modules
index 863652ef..2512e839 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nic-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/nic-modules
@@ -1,2 +1 @@
#include
-mdio-bcm-unimac
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/parport-modules
new file mode 100644
index 00000000..83966f77
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/parport-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/plip-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/plip-modules
new file mode 100644
index 00000000..ca7a41bb
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/plip-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/sata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/sata-modules
index 740a93c3..01318c25 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/sata-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/sata-modules
@@ -1,4 +1 @@
#include
-phy-qcom-apq8064-sata
-phy-qcom-ipq806x-sata
-phy-xgene
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/scsi-modules
index a2121610..c5e6593a 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/scsi-modules
@@ -1,6 +1,2 @@
#include
-
-# Universal Flash Storage
-ufs-qcom
-drivers/phy/phy-*-ufs*
-drivers/phy/*/phy-*-ufs*
+ipr ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/scsi-nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/scsi-nic-modules
deleted file mode 100644
index 089dd5dc..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/scsi-nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/sound-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/sound-modules
deleted file mode 100644
index 68395ab3..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/sound-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/squashfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/squashfs-modules
deleted file mode 100644
index 42d77887..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/storage-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/storage-core-modules
new file mode 100644
index 00000000..cb5278ea
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/storage-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/udf-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/udf-modules
deleted file mode 100644
index b90d7ee9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/uinput-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/uinput-modules
deleted file mode 100644
index 58a83377..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/usb-modules
index 8b38cb9a..c598dedd 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/usb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/usb-modules
@@ -1,23 +1 @@
#include
-dwc2
-dwc3
-usb3503
-phy-rockchip-typec
-extcon-usbc-cros-ec
-
-# For USB-C on Pinebook Pro
-fusb302
-tcpm
-
-# For USB on Renesas RZ/G2L-SMARC
-reset-rzg2l-usbphy-ctrl
-
-# USB on Qualcomm devices
-phy-qcom-snps-femto-v2
-gpio-sbu-mux
-phy-qcom-qusb2
-phy-qcom-eusb2-repeater
-phy-qcom-snps-eusb2 ?
-
-# Mediatek devices
-mtu3
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/usb-serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/usb-serial-modules
deleted file mode 100644
index c0a0dc3b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/virtio-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/virtio-modules
new file mode 100644
index 00000000..61da3965
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/virtio-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/vlan-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/vlan-modules
new file mode 100644
index 00000000..a8947e0b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/vlan-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/xfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/xfs-modules
deleted file mode 100644
index 98374e2b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/arm64/xfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled
deleted file mode 100644
index 04d9c884..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled
+++ /dev/null
@@ -1 +0,0 @@
-libata
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/block-modules
new file mode 100644
index 00000000..f937d0e0
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/block-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/btrfs-modules
deleted file mode 100644
index e261e138..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/cdrom-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/cdrom-core-modules
deleted file mode 100644
index 3ff69b48..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/cdrom-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/crc-modules
new file mode 100644
index 00000000..7e00de70
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/crc-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/crypto-dm-modules
deleted file mode 100644
index 4c8f2354..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/drm-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/drm-core-modules
deleted file mode 100644
index 0428c279..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/drm-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ext4-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ext4-modules
deleted file mode 100644
index 394c577c..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/f2fs-modules
deleted file mode 100644
index 34359e04..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/f2fs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fb-modules
deleted file mode 100644
index f3d4b2a6..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fb-modules
+++ /dev/null
@@ -1,5 +0,0 @@
-#include
-
-imxdrm
-dw_hdmi-imx
-tegra-drm
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fs-core-modules
new file mode 100644
index 00000000..024c2d7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fs-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fs-secondary-modules
new file mode 100644
index 00000000..3689f185
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/fs-secondary-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/i2c-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/i2c-modules
new file mode 100644
index 00000000..feb2d8fc
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/i2c-modules
@@ -0,0 +1,4 @@
+#include
+i2c-exynos5 ?
+i2c-mv64xxx
+i2c-rk3x
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ipmi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ipmi-modules
new file mode 100644
index 00000000..d0fc9797
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ipmi-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/jfs-modules
deleted file mode 100644
index 7e4d912b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/kernel-image
index 9a13a033..1d11b192 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/kernel-image
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/kernel-image
@@ -1,28 +1 @@
#include
-
-# GPIO
-gpio-da9052 ?
-gpio-pca953x ?
-gpio-mxc ?
-
-# PCIe PHYs
-phy-omap-control ?
-phy-ti-pipe3 ?
-
-# Regulators
-drivers/regulator/**
-
-# Powersupply
-axp20x_usb_power ?
-
-# Watchdogs: boot loader may start a watchdog that we need to pet,
-# and/or it may be the only way to trigger reboot
-drivers/watchdog/**
-
-# Regulator-SoC synchronization
-rockchip-io-domain ?
-
-# I²C drivers
-i2c-exynos5 ?
-i2c-mv64xxx
-i2c-rk3x
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/loop-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/loop-modules
deleted file mode 100644
index c1c948fa..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mmc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mmc-modules
deleted file mode 100644
index dadfd533..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mmc-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mouse-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mouse-modules
new file mode 100644
index 00000000..15fcb00e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mouse-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mtd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mtd-modules
index fb81032e..38e22a06 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mtd-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/mtd-modules
@@ -1,3 +1,3 @@
#include
-mxc_nand
+mxc_nand ?
marvell_nand
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nbd-modules
deleted file mode 100644
index 3c9b3e5d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nfs-modules
new file mode 100644
index 00000000..946fb8e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nfs-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-modules
index 746c3421..2512e839 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-modules
@@ -1,14 +1 @@
#include
-mvneta
-mvmdio
-smsc911x
-stmmac
-stmmac-platform
-dwmac-generic
-dwmac-altr-socfpga
-dwmac-sunxi ?
-sun4i-emac ?
-xgmac
-ti_cpsw
-davinci_mdio
-mdio-aspeed
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-shared-modules
index 6a8926e9..cc84b14d 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-shared-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/nic-shared-modules
@@ -1,3 +1 @@
#include
-
-phy-gmii-sel
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/parport-modules
new file mode 100644
index 00000000..83966f77
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/parport-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/pata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/pata-modules
deleted file mode 100644
index 2ff7276d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/pata-modules
+++ /dev/null
@@ -1 +0,0 @@
-pata_imx
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/plip-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/plip-modules
new file mode 100644
index 00000000..ca7a41bb
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/plip-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/sata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/sata-modules
index 8fb96734..01318c25 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/sata-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/sata-modules
@@ -1,5 +1 @@
#include
-sata_highbank
-
-# SATA PHYs
-phy-exynos5250-sata ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/scsi-modules
index 675462a1..c5e6593a 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/scsi-modules
@@ -1,2 +1,2 @@
#include
-
+ipr ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/scsi-nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/scsi-nic-modules
deleted file mode 100644
index 089dd5dc..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/scsi-nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/sound-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/sound-modules
deleted file mode 100644
index 68395ab3..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/sound-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/squashfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/squashfs-modules
deleted file mode 100644
index 42d77887..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/storage-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/storage-core-modules
new file mode 100644
index 00000000..cb5278ea
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/storage-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/udf-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/udf-modules
deleted file mode 100644
index b90d7ee9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/uinput-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/uinput-modules
deleted file mode 100644
index 58a83377..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/usb-modules
index 5917b7f7..c598dedd 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/usb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/usb-modules
@@ -1,4 +1 @@
#include
-omap-ocp2scp
-extcon-usb-gpio
-usb3503
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/usb-serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/usb-serial-modules
deleted file mode 100644
index c0a0dc3b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/vlan-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/vlan-modules
new file mode 100644
index 00000000..a8947e0b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/vlan-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ata-modules
deleted file mode 100644
index 6ca33ce0..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ata-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-libata
-ata_generic
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/block-modules
new file mode 100644
index 00000000..19f95757
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/block-modules
@@ -0,0 +1,43 @@
+aoe ?
+aten ?
+bcm2835 ?
+bpck ?
+bpck6 ?
+cciss ?
+comm ?
+cpqarray ?
+DAC960 ?
+dstr ?
+epat ?
+epia ?
+fit2 ?
+fit3 ?
+friq ?
+frpw ?
+hpsa ?
+hio ?
+kbic ?
+ktti ?
+nbd ?
+nvme ?
+on20 ?
+on26 ?
+paride ?
+pcd ?
+pd ?
+pf ?
+pg ?
+pt ?
+sdhci-tegra ?
+sx8 ?
+umem ?
+virtio_blk ?
+xen-blkfront ?
+mtip32xx ?
+mmc_block ?
+sdhci ?
+sdhci-pci ?
+sdhci-acpi ?
+tifm_sd ?
+dw_mmc ?
+dw_mmc_pltfm ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/block-modules.powerpc b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/block-modules.powerpc
new file mode 100644
index 00000000..ca126b7b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/block-modules.powerpc
@@ -0,0 +1,31 @@
+aoe ?
+aten ?
+bpck ?
+bpck6 ?
+cciss ?
+comm ?
+cpqarray ?
+DAC960 ?
+dstr ?
+epat ?
+epia ?
+fit2 ?
+fit3 ?
+friq ?
+frpw ?
+kbic ?
+ktti ?
+nbd ?
+on20 ?
+on26 ?
+paride ?
+pcd ?
+pd ?
+pf ?
+pg ?
+ps3disk ?
+ps3vram ?
+pt ?
+sx8 ?
+umem ?
+virtio_blk ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/btrfs-modules
deleted file mode 100644
index 00531f65..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-btrfs
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/cdrom-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/cdrom-core-modules
deleted file mode 100644
index 62e5e83a..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/cdrom-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-cdrom ?
-sr_mod ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crc-modules
new file mode 100644
index 00000000..cbdc152b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crc-modules
@@ -0,0 +1,6 @@
+crc-ccitt
+crc32_generic ?
+crc32c_generic ?
+crc-itu-t
+crc16
+crc7 ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-dm-modules
deleted file mode 100644
index 189131fc..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-dm-crypt
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-modules
index c9eb89fb..449677ae 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-modules
@@ -1,16 +1,78 @@
-aes_generic
-blowfish_generic ?
-twofish_generic ?
-serpent_generic ?
-sha256_generic ?
-arc4 ?
-cbc ?
-ccm ?
-ctr
-ecb
-xts
-michael_mic ?
-
-# For cryptsetup
+aesni-intel ?
+aes-x86_64 ?
+af_alg ?
+algif_hash ?
algif_skcipher ?
-essiv ?
+ansi_cprng ?
+anubis ?
+arc4 ?
+async_memcpy ?
+async_pq ?
+async_raid6_recov ?
+async_tx ?
+async_xor ?
+authenc ?
+authencesn ?
+blowfish_common ?
+blowfish_generic ?
+blowfish-x86_64 ?
+camellia ?
+cast5 ?
+cast6 ?
+ccm ?
+crc32_generic ?
+crc32c_generic ?
+crc32-vx_s390 ?
+cryptd ?
+cryptoloop ?
+crypto_null ?
+crypto_user ?
+ctr ?
+cts ?
+des_generic ?
+fcrypt ?
+gcm ?
+gf128mul ?
+ghash-clmulni-intel ?
+ghash-generic ?
+khazad ?
+lrw ?
+lzo ?
+md4 ?
+michael_mic ?
+padlock-aes ?
+padlock-sha ?
+paes_s390 ?
+pcbc ?
+pcrypt ?
+pkey ?
+raid6test ?
+rmd128 ?
+rmd160 ?
+rmd256 ?
+rmd320 ?
+salsa20_generic ?
+salsa20-x86_64 ?
+seed ?
+seqiv ?
+serpent_generic ?
+serpent-sse2-x86_64 ?
+sha1-ssse3 ?
+sha512_generic ?
+tcrypt ?
+tea ?
+tgr192 ?
+twofish_common ?
+twofish_generic ?
+twofish-x86_64 ?
+twofish-x86_64-3way ?
+vmac ?
+wp512 ?
+xcbc ?
+xor ?
+xts ?
+zcrypt ?
+zcrypt_cex2a ?
+zcrypt_cex4 ?
+zcrypt_pcixcc ?
+zlib ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/dasd-extra-modules.s390x b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/dasd-extra-modules.s390x
new file mode 100644
index 00000000..fff5ab6d
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/dasd-extra-modules.s390x
@@ -0,0 +1 @@
+dasd_diag_mod ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/dasd-modules.s390x b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/dasd-modules.s390x
new file mode 100644
index 00000000..8e6185b8
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/dasd-modules.s390x
@@ -0,0 +1,3 @@
+dasd_mod ?
+dasd_fba_mod ?
+dasd_eckd_mod ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/drm-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/drm-core-modules
deleted file mode 100644
index 8cd9f2a8..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/drm-core-modules
+++ /dev/null
@@ -1,4 +0,0 @@
-# Those are required by not only FB modules
-drm ?
-drm_kms_helper ?
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ext4-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ext4-modules
deleted file mode 100644
index 61003425..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ext4-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-ext4
-jbd2
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/f2fs-modules
deleted file mode 100644
index 08e5e7fa..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/f2fs-modules
+++ /dev/null
@@ -1 +0,0 @@
-f2fs
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fat-modules
index 0498cf83..6c56db21 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fat-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fat-modules
@@ -1,6 +1,8 @@
fat ?
-vfat
-# the default codepage for fat (as of 2.6.8)
+vfat ?
+
+# Supporting modules ?
nls_cp437 ?
-# the default i/o character set for fat (as of 4.7.2-1)
+nls_iso8859-1 ?
+nls_utf8 ?
nls_ascii ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fb-modules
index ee7307ad..eae829f8 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fb-modules
@@ -1,11 +1,3 @@
-# We don't include all DRM drivers here as on many platforms we can
-# call system firmware to get hold of a simple framebuffer
-
-virtio-gpu ?
-
-# Input modules that depend on drm
-i2c-hid ?
-i2c-hid-acpi ?
-i2c-hid-of ?
-i2c-hid-of-elan ?
-i2c-hid-of-goodix ?
+fbcon ?
+vesafb ?
+vga16fb ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/firewire-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/firewire-core-modules
index bcc31d50..dbb92297 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/firewire-core-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/firewire-core-modules
@@ -1,3 +1,4 @@
-firewire-core
-firewire-ohci
-firewire-sbp2
+firewire-core ?
+firewire-ohci ?
+firewire-sbp2 ?
+firewire-net ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/floppy-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/floppy-modules
new file mode 100644
index 00000000..ca8d7ffe
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/floppy-modules
@@ -0,0 +1 @@
+floppy ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fs-core-modules
new file mode 100644
index 00000000..6cadcf43
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fs-core-modules
@@ -0,0 +1,5 @@
+ext2 ?
+ext4 ?
+jfs ?
+reiserfs ?
+xfs ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fs-secondary-modules
new file mode 100644
index 00000000..db46bb75
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/fs-secondary-modules
@@ -0,0 +1,5 @@
+btrfs ?
+fuse ?
+ntfs ?
+hfs ?
+hfsplus ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/hfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/hfs-modules
deleted file mode 100644
index 4a311558..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/hfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-hfs
-hfsplus
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i2c-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i2c-modules
new file mode 100644
index 00000000..0c4999fa
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i2c-modules
@@ -0,0 +1,3 @@
+i2c-core
+i2c-algo-bit
+i2c-designware-platform ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/block-modules
new file mode 100644
index 00000000..f937d0e0
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/block-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/crc-modules
new file mode 100644
index 00000000..7e00de70
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/crc-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/crypto-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/crypto-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/crypto-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/crypto-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fat-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/fat-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fat-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fb-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/fb-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fb-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/floppy-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/floppy-modules
new file mode 100644
index 00000000..bc84c4e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/floppy-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fs-core-modules
new file mode 100644
index 00000000..024c2d7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fs-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fs-secondary-modules
new file mode 100644
index 00000000..3689f185
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/fs-secondary-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/isofs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/isofs-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/isofs-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/isofs-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/kernel-image
similarity index 60%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/kernel-image
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/kernel-image
index b17bb591..1d11b192 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/kernel-image
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/kernel-image
@@ -1,2 +1 @@
#include
-bestcomm-core ?
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/md-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/md-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/md-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/message-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/message-modules
new file mode 100644
index 00000000..9b060b37
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/message-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/mouse-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/mouse-modules
new file mode 100644
index 00000000..15fcb00e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/mouse-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/multipath-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/multipath-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/multipath-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/multipath-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/nic-modules
new file mode 100644
index 00000000..2512e839
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/nic-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/nic-shared-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/nic-shared-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-wireless-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-wireless-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/nic-wireless-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/parport-modules
new file mode 100644
index 00000000..83966f77
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/parport-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/scsi-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/scsi-core-modules
new file mode 100644
index 00000000..778a022f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/scsi-core-modules
@@ -0,0 +1,4 @@
+#include
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/scsi-modules
new file mode 100644
index 00000000..c5e6593a
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/scsi-modules
@@ -0,0 +1,2 @@
+#include
+ipr ?
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/serial-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/serial-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/serial-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/storage-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/storage-core-modules
new file mode 100644
index 00000000..cb5278ea
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/storage-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/usb-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/usb-storage-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/usb-storage-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/virtio-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/virtio-modules
new file mode 100644
index 00000000..61da3965
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/virtio-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/vlan-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/vlan-modules
new file mode 100644
index 00000000..a8947e0b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386-virtual/vlan-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/block-modules
new file mode 100644
index 00000000..f937d0e0
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/block-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/crc-modules
new file mode 100644
index 00000000..7e00de70
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/crc-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/crypto-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/crypto-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/crypto-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/crypto-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fat-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/fat-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fat-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/ppc64el/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fb-modules
similarity index 81%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/ppc64el/fb-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fb-modules
index 9b0ad3c9..aba524d9 100644
--- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/ppc64el/fb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fb-modules
@@ -1,3 +1 @@
#include
-
-ast
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/firewire-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/firewire-core-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/firewire-core-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/firewire-core-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/floppy-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/floppy-modules
new file mode 100644
index 00000000..bc84c4e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/floppy-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fs-core-modules
new file mode 100644
index 00000000..024c2d7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fs-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fs-secondary-modules
new file mode 100644
index 00000000..3689f185
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/fs-secondary-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/i2c-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/i2c-modules
new file mode 100644
index 00000000..203a607e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/i2c-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/input-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/input-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/input-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/input-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/ipmi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/ipmi-modules
new file mode 100644
index 00000000..d0fc9797
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/ipmi-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/isofs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/isofs-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/isofs-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/isofs-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/kernel-image
new file mode 100644
index 00000000..1d11b192
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/kernel-image
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/md-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/md-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/md-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/message-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/message-modules
new file mode 100644
index 00000000..9b060b37
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/message-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/mouse-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/mouse-modules
new file mode 100644
index 00000000..15fcb00e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/mouse-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/mtd-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/mtd-core-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/mtd-core-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/mtd-core-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/multipath-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/multipath-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/multipath-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/multipath-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nfs-modules
new file mode 100644
index 00000000..946fb8e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nfs-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-modules
new file mode 100644
index 00000000..2512e839
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-pcmcia-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-pcmcia-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-pcmcia-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/arm64/nic-shared-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-shared-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-usb-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-usb-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-usb-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/nic-wireless-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/nic-wireless-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/nic-wireless-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/parport-modules
new file mode 100644
index 00000000..83966f77
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/parport-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/pata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/pata-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/pata-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/pata-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/pcmcia-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/pcmcia-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/pcmcia-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/pcmcia-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/pcmcia-storage-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/pcmcia-storage-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/pcmcia-storage-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/plip-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/plip-modules
new file mode 100644
index 00000000..ca7a41bb
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/plip-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/ppp-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/ppp-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/ppp-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/ppp-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/sata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/sata-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/sata-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/sata-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/scsi-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/scsi-core-modules
new file mode 100644
index 00000000..778a022f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/scsi-core-modules
@@ -0,0 +1,4 @@
+#include
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/scsi-modules
new file mode 100644
index 00000000..c5e6593a
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/scsi-modules
@@ -0,0 +1,2 @@
+#include
+ipr ?
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/serial-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/powerpc/serial-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/serial-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/speakup-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/speakup-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/amd64/speakup-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/speakup-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/storage-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/storage-core-modules
new file mode 100644
index 00000000..cb5278ea
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/storage-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/usb-modules
similarity index 100%
rename from helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/usb-modules
diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/usb-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/usb-storage-modules
rename to helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/usb-storage-modules
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/virtio-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/virtio-modules
new file mode 100644
index 00000000..61da3965
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/virtio-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/vlan-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/vlan-modules
new file mode 100644
index 00000000..a8947e0b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/i386/vlan-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/input-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/input-modules
index ffce6cf9..ade79138 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/input-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/input-modules
@@ -1,53 +1,75 @@
-evdev
-
-# Include HID drivers by default
+hid ?
+hid-a4tech ?
+hid-apple ?
+hid-appleir ?
+hid-aureal ?
+hid-belkin ?
+hid-bright ?
+hid-cherry ?
+hid-chicony ?
+hid-corsair ?
+hid-cp2112 ?
+hid-cypress ?
+hid-dell ?
+hid-elecom ?
+hid-elo ?
+hid-ezkey ?
+hid-generic ?
+hid-gfrm ?
+hid-gt683r ?
+hid-gyration ?
+hid-holtek-kbd ?
+hid-holtek-mouse ?
+hid-hyperv ?
+hid-kensington ?
+hid-keytouch ?
+hid-kye ?
+hid-lcpower ?
+hid-lenovo ?
+hid-logitech ?
+hid-logitech-dj ?
+hid-logitech-hidpp ?
+hid-magicmouse ?
+hid-microsoft ?
+hid-monterey ?
+hid-multitouch ?
+hid-ntrig ?
+hid-ortek ?
+hid-penmount ?
+hid-petalynx ?
+hid-picolcd ?
+hid-pl ?
+hid-plantronics ?
+hid-primax ?
+hid-rmi ?
+hid-roccat ?
+hid-roccat-arvo ?
+hid-roccat-common ?
+hid-roccat-isku ?
+hid-roccat-kone ?
+hid-roccat-koneplus ?
+hid-roccat-konepure ?
+hid-roccat-kovaplus ?
+hid-roccat-lua ?
+hid-roccat-pyra ?
+hid-roccat-ryos ?
+hid-roccat-savu ?
+hid-samsung ?
+hid-sony ?
+hid-speedlink ?
+hid-sunplus ?
+hid-thingm ?
+hid-tivo ?
+hid-topseed ?
+hid-twinhan ?
+hid-uclogic ?
+hid-waltop ?
+hid-wiimote ?
+hid-xinmo ?
+hid-zydacron ?
+uhid ?
+usbhid ?
drivers/hid/**
-
-# Include keyboards
drivers/input/keyboard/** ?
-
-# Exclude i2c-hid which depends on drm(!)
-i2c-hid -
-i2c-hid-acpi -
-i2c-hid-of -
-i2c-hid-of-elan -
-i2c-hid-of-goodix -
-
-# Exclude drivers for anything but keyboard and mouse/trackball/touchpad
drivers/hid/hid-*ff -
-hid-dr -
-hid-elecom -
-hid-gyration -
-hid-icade -
-hid-lcpower -
-hid-ntrig -
-hid-petalynx -
-hid-picolcd -
-hid-pl -
-hid-prodikeys -
-hid-ps3remote -
-hid-quanta -
drivers/hid/hid-roccat-ko* -
-hid-roccat-pyra -
-hid-saitek -
-hid-sensor-hub -
-hid-sony -
-hid-tivo -
-hid-twinhan -
-hid-uclogic -
-hid-wacom -
-hid-waltop -
-hid-wiimote -
-hid-zydacron -
-wacom -
-
-# Miscellaneous input drivers
-synaptics_usb ?
-wistron_btns ?
-gpio_keys ?
-soc_button_array ?
-hyperv-keyboard ?
-virtio_console ?
-virtio_input ?
-olpc_apsp ?
-psmouse ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ipmi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ipmi-modules
new file mode 100644
index 00000000..d539daa1
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ipmi-modules
@@ -0,0 +1,5 @@
+ipmi_devintf ?
+ipmi_msghandler ?
+ipmi_poweroff ?
+ipmi_si ?
+ipmi_watchdog ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/jffs2-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/jffs2-modules
deleted file mode 100644
index 19f4e109..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/jffs2-modules
+++ /dev/null
@@ -1 +0,0 @@
-jffs2
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/jfs-modules
deleted file mode 100644
index aa604c46..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-jfs
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/kernel-image
index 37fa1dfd..02275ce0 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/kernel-image
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/kernel-image
@@ -1,64 +1,31 @@
-# Clocks
-drivers/clk/** ?
-
-af_packet
-bitrev ?
-eeprom_93cx6 ?
-firmware_class
-mbcache
-mfd-core ?
-nls_base
-# Default I/O charset for most filesystems that do character conversion
-nls_utf8 ?
-thermal_sys ?
-
-# In case they become modular again
-lz4_compress ?
-lz4hc_compress ?
-lz4_decompress ?
-lzo_compress
-lzo_decompress
-zlib_deflate
-zstd_compress
-zstd_decompress
-
-# Basic paravirtual modules
-hv_utils ?
-hv_vmbus ?
-virtio ?
-virtio_balloon ?
-virtio_mmio ?
-virtio_pci ?
-virtio_ring ?
-
-# The installer generally needs good entropy sources
-drivers/char/hw_random/**
-
-# LPSS might be needed for I2C (e.g. for touchpads on laptops), SPI, UART
-intel_lpss ?
-intel_lpss_acpi ?
-intel_lpss_pci ?
-
-# I²C subsystem and common drivers
-i2c-core ?
-i2c-algo-bit ?
-i2c-designware-platform ?
-
-# EFI
-efivarfs ?
-
-# LED subsystem and common drivers
-led-class ?
-ledtrig-audio ?
-leds-gpio ?
-
-# CRC algorithms
-crc-ccitt
-libcrc32c ?
-crc32_generic ?
-crc32c_generic ?
-crc-itu-t ?
-crc16
-crc7 ?
-crc8 ?
-crc64 ?
+ast ?
+gpio-pca953x ?
+gpio-regulator ?
+hibmc-drm ?
+i2c-mux ?
+i2c-mux-pinctrl ?
+i2c-tegra ?
+max8907 ?
+max8907-regulator ?
+nvec ?
+nvec_kbd ?
+nvec_paz00 ?
+nvec_power ?
+nvec_ps2 ?
+palmas-regulator ?
+rtc-em3027 ?
+rtc-max8907 ?
+rtc-palmas ?
+rtc-tps6586x ?
+rtc-tps65910 ?
+tps51632-regulator ?
+tps62360-regulator ?
+tps65090-charger ?
+tps65090-regulator ?
+tps6586x-regulator ?
+tps65910-regulator ?
+host1x ?
+tegra-drm ?
+pwm_bl ?
+pwm-tegra ?
+panel-simple ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/loop-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/loop-modules
deleted file mode 100644
index 1ef2ddf2..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-loop
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/md-modules
index 97eb8cd9..64217bf5 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/md-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/md-modules
@@ -1,15 +1,16 @@
-md-mod
-dm-mod
-raid0
-raid1
-raid456
-raid10
-dm-mirror
-dm-raid
-dm-snapshot
-dm-thin-pool
-bcache
+dm-crypt ?
+dm-mirror ?
+dm-raid ?
+dm-snapshot ?
+dm-zero ?
+faulty ?
+linear ?
+multipath ?
+raid0 ?
+raid1 ?
+raid10 ?
+raid456 ?
-# RAID-related libraries, also used by btrfs
-raid6_pq
-xor
+# Extras
+dm-raid45 ?
+dm-loop ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/message-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/message-modules
new file mode 100644
index 00000000..fd0e9e24
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/message-modules
@@ -0,0 +1,9 @@
+mptbase ?
+mptctl ?
+mptfc ?
+mptlan ?
+mptsas ?
+mpt2sas ?
+mpt3sas ?
+mptscsih ?
+mptspi ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/message-modules.powerpc b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/message-modules.powerpc
new file mode 100644
index 00000000..b9308e26
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/message-modules.powerpc
@@ -0,0 +1,7 @@
+mptbase
+mptctl
+mptfc
+mptlan
+mptsas
+mptscsih
+mptspi
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/minix-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/minix-modules
deleted file mode 100644
index aa6ca5db..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/minix-modules
+++ /dev/null
@@ -1 +0,0 @@
-minix
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mmc-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mmc-core-modules
deleted file mode 100644
index 67128eac..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mmc-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-mmc_core
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mmc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mmc-modules
deleted file mode 100644
index c7aa372b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mmc-modules
+++ /dev/null
@@ -1,8 +0,0 @@
-mmc_block
-drivers/mmc/host/**
-
-# Multifunction card reader driver
-tifm_7xx1 ?
-
-# Adds a dependency on pcmcia-modules
-sdricoh_cs -
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mouse-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mouse-modules
new file mode 100644
index 00000000..7b062564
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/mouse-modules
@@ -0,0 +1,2 @@
+psmouse ?
+usbmouse ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/multipath-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/multipath-modules
index 2e235994..51b21b29 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/multipath-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/multipath-modules
@@ -1,4 +1,5 @@
-dm-multipath
-dm-round-robin
-dm-service-time
+dm-multipath ?
+dm-round-robin ?
+dm-service-time ?
+dm-queue-length ?
drivers/scsi/device_handler/*
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nbd-modules
deleted file mode 100644
index cb3ca605..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-nbd
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nfs-modules
index a5bfd2ce..a08f5387 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nfs-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nfs-modules
@@ -1,3 +1,6 @@
-nfs
-lockd
-sunrpc
+nfs ?
+nfs_acl ?
+nfsv3 ?
+lockd ?
+sunrpc ?
+cifs ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-modules
index 45ddeaae..fa9673ea 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-modules
@@ -1,29 +1,215 @@
-# Include Ethernet switch, controller and PHY drivers by default
-drivers/net/dsa/** ?
-drivers/net/ethernet/**
-
-# Include paravirtual network drivers
-hv_netvsc ?
+3c359 ?
+3c501 ?
+3c503 ?
+3c505 ?
+3c507 ?
+3c509 ?
+3c515 ?
+3c523 ?
+3c527 ?
+3c59x ?
+8139cp ?
+8139too ?
+82596 ?
+abyss ?
+ac3200 ?
+adm8211 ?
+airo ?
+airport ?
+alx ?
+amd8111e ?
+amd-xgbe ?
+aquantia ?
+arcnet ?
+arc-rawmode ?
+arc-rimi ?
+arlan ?
+at1700 ?
+ath5k ?
+ath9k ?
+ath9k_htc ?
+atl1 ?
+atl1c ?
+atl1e ?
+atl2 ?
+atmel ?
+atmel_pci ?
+b44 ?
+bcm87xx ?
+be2net ?
+bmac ?
+bnx2 ?
+bnx2x ?
+bnxt_en ?
+bonding ?
+brcmfmac ?
+brcmsmac ?
+broadcom ?
+xgmac ?
+cassini ?
+ccwgroup ?
+com20020 ?
+com20020-pci ?
+com90io ?
+com90xx ?
+cs89x0 ?
+ctcm ?
+cxgb4 ?
+de2104x ?
+de4x5 ?
+de600 ?
+de620 ?
+defxx ?
+depca ?
+dl2k ?
+dmfe ?
+dummy ?
+e100 ?
+e1000 ?
+e1000e ?
+e2100 ?
+eepro ?
+eepro100 ?
+eexpress ?
+enic ?
+epic100 ?
+eql ?
+es3210 ?
+eth16i ?
+ewrk3 ?
+fealnx ?
+forcedeth ?
+fsm ?
+ibmveth ?
+ibmvnic ?
+igb ?
+ps3_gelic ?
+hamachi ?
+hclge ?
+hermes ?
+hfi1 ?
+hinic ?
+hns_dsaf ?
+hns_enet_drv ?
+hns_mdio ?
+hns3 ?
+hp ?
+hp100 ?
+hp-plus ?
+i40e ?
+i40evf ?
+ibmtr ?
+ipddp ?
+ipw2100 ?
+ipw2200 ?
+iwl3945 ?
+iwl4965 ?
+iwl-legacy ?
+iwldvm ?
+iwlmvm ?
+iwlwifi ?
+ixgb ?
+ixgbe ?
+lance ?
+lanstreamer ?
+lcs ?
+lasi_82596 ?
+lne390 ?
+lp486e ?
+mace ?
+marvell ?
+mdio-thunder ?
+mlx4_core ?
+mlx4_en ?
+mlx5_core ?
+mv643xx_eth ?
+myri_sbus ?
+natsemi ?
+ne ?
+ne2 ?
+ne2k-pci ?
+ne3210 ?
+netconsole ?
+netiucv ?
+netsec ?
+netxen_nic ?
+ni5010 ?
+ni52 ?
+ni65 ?
+nicpf ?
+nicvf ?
+niu ?
+ns83820 ?
+olympic ?
+orinoco ?
+orinoco_pci ?
+orinoco_plx ?
+orinoco_tmd ?
+pcnet32 ?
+qcom-emac ?
+qede ?
+qeth ?
+qeth_l2 ?
+qeth_l3 ?
+qlcnic ?
+r815x ?
+r8169 ?
+rate_control ?
+realtek ?
+rfc1051 ?
+rfc1201 ?
+rrunner ?
+rt2400 ?
+rt2400pci ?
+rt2500 ?
+rt2500pci ?
+rt2800pci ?
+rt61pci ?
+s2io ?
+sfc ?
+shaper ?
+sis190 ?
+sis900 ?
+spidernet ?
+skfp ?
+skge ?
+sk98lin ?
+sky2 ?
+smc9194 ?
+smc-ultra ?
+smc-ultra32 ?
+starfire ?
+strip ?
+sunbmac ?
+sundance ?
+sungem ?
+sungem_phy ?
+sunhme ?
+sunlance ?
+sunqe ?
+sunvnet ?
+tg3 ?
+tlan ?
+tms380tr ?
+tmspci ?
+tulip ?
+tun ?
+typhoon ?
+uli526x ?
+via-rhine ?
+via-velocity ?
virtio_net ?
+wavelan ?
+wd ?
+winbond-840 ?
+yellowfin ?
+znet ?
vmxnet3 ?
xen-netfront ?
-
-# Include VLAN driver
-8021q
-
-# Include bonding driver
-bonding
-
-# Exclude drivers packaged in nic-pcmcia-modules
+xgene-enet ?
+drivers/net/dsa/** ?
+drivers/net/ethernet/**
drivers/net/**_cs -
-b44 -
-xircom_cb -
-
-# Exclude libraries packaged in nic-{common,shared} modules
-8390 -
-fixed_phy -
-libphy -
-mdio_devres -
-
-# Exclude iSCSI drivers packaged in scsi-modules
-cnic -
+drivers/net/wireless/**
+drivers/staging/rtl8** ?
+drivers/net/wireless/**_cs -
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-modules.powerpc b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-modules.powerpc
new file mode 100644
index 00000000..05c63ea7
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-modules.powerpc
@@ -0,0 +1,152 @@
+3c359 ?
+3c501 ?
+3c503 ?
+3c505 ?
+3c507 ?
+3c509 ?
+3c515 ?
+3c523 ?
+3c527 ?
+3c59x ?
+8139cp ?
+8139too ?
+82596 ?
+abyss ?
+ac3200 ?
+adm8211 ?
+airo ?
+airport ?
+amd8111e ?
+arc4 ?
+arcnet ?
+arc-rawmode ?
+arc-rimi ?
+arlan ?
+at1700 ?
+atl1 ?
+atl1e ?
+atl2 ?
+atmel ?
+atmel_pci ?
+b44 ?
+bcm43xx ?
+bcm43xx-mac80211 ?
+bmac ?
+bnx2 ?
+bnx2x ?
+bonding ?
+cassini ?
+com20020 ?
+com20020-pci ?
+com90io ?
+com90xx ?
+cs89x0 ?
+de2104x ?
+de4x5 ?
+de600 ?
+de620 ?
+defxx ?
+depca ?
+dl2k ?
+dmfe ?
+dummy ?
+e100 ?
+e1000 ?
+e1000e ?
+e2100 ?
+eepro ?
+eepro100 ?
+eexpress ?
+epic100 ?
+eql ?
+es3210 ?
+eth16i ?
+ewrk3 ?
+fealnx ?
+forcedeth ?
+igb ?
+hamachi ?
+hermes ?
+hp ?
+hp100 ?
+hp-plus ?
+ibmtr ?
+ibmveth ?
+ipddp ?
+ipw2100 ?
+ipw2200 ?
+ipw3945 ?
+ixgb ?
+lance ?
+lanstreamer ?
+lasi_82596 ?
+lne390 ?
+lp486e ?
+mace ?
+mv643xx_eth ?
+myri_sbus ?
+natsemi ?
+ne ?
+ne2 ?
+ne2k-pci ?
+ne3210 ?
+netconsole ?
+netxen_nic ?
+ni5010 ?
+ni52 ?
+ni65 ?
+niu ?
+ns83820 ?
+olympic ?
+orinoco ?
+orinoco_pci ?
+orinoco_plx ?
+orinoco_tmd ?
+pcnet32 ?
+ps3_gelic ?
+r8169 ?
+rate_control ?
+rfc1051 ?
+rfc1201 ?
+rrunner ?
+rt2400 ?
+rt2500 ?
+rt61pci ?
+s2io ?
+shaper ?
+sis190 ?
+sis900 ?
+spidernet ?
+skfp ?
+skge ?
+sk98lin ?
+sky2 ?
+smc9194 ?
+smc-ultra ?
+smc-ultra32 ?
+starfire ?
+strip ?
+sunbmac ?
+sundance ?
+sungem ?
+sungem_phy ?
+sunhme ?
+sunlance ?
+sunqe ?
+sunvnet ?
+tg3 ?
+tlan ?
+tms380tr ?
+tmspci ?
+tulip ?
+tun ?
+typhoon ?
+uli526x ?
+via-rhine ?
+via-velocity ?
+virtio_net ?
+wavelan ?
+wd ?
+winbond-840 ?
+yellowfin ?
+znet ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-pcmcia-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-pcmcia-modules
index a0f4d745..759e36a5 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-pcmcia-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-pcmcia-modules
@@ -1,5 +1,21 @@
-# Include PCMCIA Ethernet and wireless drivers by default
+3c574_cs ?
+3c589_cs ?
+airo_cs ?
+atmel_cs ?
+axnet_cs ?
+com20020_cs ?
+fmvj18x_cs ?
+ibmtr_cs ?
+netwave_cs ?
+nmclan_cs ?
+orinoco_cs ?
+pcnet_cs ?
+ray_cs ?
+smc91c92_cs ?
+wavelan_cs ?
+wl3501_cs ?
+xirc2ps_cs ?
+xircom_cb ?
+xircom_tulip_cb ?
drivers/net/ethernet/**_cs
drivers/net/wireless/**_cs
-b44 ?
-xircom_cb
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-shared-modules
index f47cbe4a..ea6f53ce 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-shared-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-shared-modules
@@ -1,11 +1,26 @@
-drivers/net/phy/**
-
+# PHY
8390 ?
-fixed_phy ?
-libphy ?
-mdio_devres ?
mii ?
-of_mdio ?
-pps_core ?
-ptp ?
-selftests ?
+
+# CRC modules
+crc-ccitt ?
+crc-itu-t ?
+
+# mac80211 stuff
+mac80211 ?
+cfg80211 ?
+
+# rt2x00 lib (since rt2x00 is split across usb/pci/cb
+rt2x00lib ?
+rt2800lib ?
+
+# Atheros library (since drivers are split across nic-modules/nic-usb-modules)
+ath ?
+
+# Wireless 802.11 modules
+lib80211 ?
+cfg80211 ?
+lib80211_crypt_ccmp ?
+lib80211_crypt_tkip ?
+lib80211_crypt_wep ?
+drivers/net/phy/**
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-usb-modules
index 975fc24c..36b82b56 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-usb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-usb-modules
@@ -1,12 +1,35 @@
-# Include USB wired drivers by default
+ax88179_178a ?
+catc ?
+kaweth ?
+pegasus ?
+prism2_usb ?
+rtl8150 ?
+usbnet ?
+zd1211rw ?
+zd1201 ?
+rt2500usb ?
+rt73usb ?
+rt2570 ?
+rt2800usb ?
+rt2x00usb ?
+cdc_ether ?
+asix ?
+cdc_eem ?
+cdc_ether ?
+cdc-phonet ?
+cdc_subset ?
+dm9601 ?
+gl620a ?
+hso ?
+int51x1 ?
+mcs7830 ?
+net1080 ?
+plusb ?
+rndis_host ?
+r8152 ?
+smsc95xx ?
+zaurus ?
+carl9170 ?
+smsc75xx ?
+smsc95xx ?
drivers/net/usb/*
-
-# Exclude wireless modem drivers which need extra configuration
-cdc_mbim -
-cdc-phonet -
-hso -
-huawei_cdc_ncm -
-kalmia -
-lg-vl600 -
-qmi_wwan -
-sierra_net -
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-wireless-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-wireless-modules
index 7c0f7919..09a90874 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-wireless-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/nic-wireless-modules
@@ -8,6 +8,15 @@ vt6656_stage ?
# Exclude drivers packaged in nic-pcmcia-modules
drivers/net/wireless/**_cs -
+airo -
+hostap_plx -
+
+# Don't separate these from their driver families
+libertas_cs ?
+spectrum_cs ?
+
+# Exclude drivers packaged in nic-usb-modules
+rndis_wlan -
# Exclude debug driver
mac80211_hwsim -
@@ -16,6 +25,3 @@ mac80211_hwsim -
lib80211_crypt_wep ?
lib80211_crypt_ccmp ?
lib80211_crypt_tkip ?
-
-# (pending) ath11k_pci soft-dep:
-qrtr_mhi ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/parport-modules
new file mode 100644
index 00000000..75fe0b92
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/parport-modules
@@ -0,0 +1,2 @@
+parport ?
+parport_pc ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pata-modules
index 1d963a18..9c9c6407 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pata-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pata-modules
@@ -1,9 +1,48 @@
-# Include PATA drivers by default
+pata_ali ?
+pata_amd ?
+pata_artop ?
+pata_atiixp ?
+pata_atp867x ?
+pata_cmd640 ?
+pata_cmd64x ?
+pata_cs5520 ?
+pata_cs5530 ?
+pata_cs5535 ?
+pata_cs5536 ?
+pata_cypress ?
+pata_efar ?
+pata_hpt366 ?
+pata_hpt37x ?
+pata_hpt3x2n ?
+pata_hpt3x3 ?
+pata_isapnp ?
+pata_it8213 ?
+pata_it821x ?
+pata_jmicron ?
+pata_legacy ?
+pata_macio ?
+pata_marvell ?
+pata_mpiix ?
+pata_netcell ?
+pata_ninja32 ?
+pata_ns87410 ?
+pata_ns87415 ?
+pata_oldpiix ?
+pata_optidma ?
+pata_opti ?
+pata_pcmcia ?
+pata_pdc2027x ?
+pata_pdc202xx_old ?
+pata_qdi ?
+pata_radisys ?
+pata_rdc ?
+pata_rz1000 ?
+pata_sc1200 ?
+pata_sch ?
+pata_serverworks ?
+pata_sil680 ?
+pata_sl82c105 ?
+pata_triflex ?
+pata_via ?
+pata_winbond ?
drivers/ata/pata_*
-
-# Exclude pata_sis, which goes in sata-modules as a dependency of sata_sis
-pata_sis -
-
-# Exclude drivers packaged in pcmcia-storage-modules
-pata_ninja32 -
-pata_pcmcia -
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-modules
index ab5b4b23..06a50311 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-modules
@@ -1,8 +1,8 @@
-pcmcia
-
-i82092
+i82092 ?
i82365 ?
-pcmcia_core
-tcic ?
-yenta_socket
+pcmcia ?
+pcmcia_core ?
pd6729 ?
+rsrc_nonstatic ?
+tcic ?
+yenta_socket ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-storage-modules
index b6b17216..bb042a64 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-storage-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/pcmcia-storage-modules
@@ -1,2 +1,6 @@
-pata_ninja32 ?
pata_pcmcia ?
+qlogic_cs ?
+fdomain_cs ?
+aha152x_cs ?
+nsp_cs ?
+sym53c500_cs ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/plip-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/plip-modules
new file mode 100644
index 00000000..446e2bd3
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/plip-modules
@@ -0,0 +1 @@
+plip ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/affs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/affs-modules
deleted file mode 100644
index f12f6ace..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/affs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/affs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ata-modules
deleted file mode 100644
index 39540d4b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ata-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/btrfs-modules
deleted file mode 100644
index 9eeeb149..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/btrfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/cdrom-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/cdrom-core-modules
deleted file mode 100644
index feed89a1..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/cdrom-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/cdrom-core-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/crypto-dm-modules
deleted file mode 100644
index 6613c798..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/crypto-dm-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/crypto-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/crypto-modules
deleted file mode 100644
index 8fa818fb..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/crypto-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/drm-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/drm-core-modules
deleted file mode 100644
index 0428c279..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/drm-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ext4-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ext4-modules
deleted file mode 100644
index 664c3118..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ext4-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/f2fs-modules
deleted file mode 100644
index 34359e04..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/f2fs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/fat-modules
deleted file mode 100644
index 043dc560..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/fat-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/fat-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/fb-modules
deleted file mode 100644
index 8857d558..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/fb-modules
+++ /dev/null
@@ -1,4 +0,0 @@
-# We *don't* want the extra modules listed in powerpc/fb-modules
-#include
-
-ast
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/firewire-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/firewire-core-modules
deleted file mode 100644
index 035ab316..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/firewire-core-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/hfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/hfs-modules
deleted file mode 100644
index a85f6914..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/hfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/hfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/hypervisor-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/hypervisor-modules
deleted file mode 100644
index 29ceb615..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/hypervisor-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-hvcserver
-hvcs
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/input-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/input-modules
deleted file mode 100644
index 38a88894..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/input-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/input-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/isofs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/isofs-modules
deleted file mode 100644
index 5a032617..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/isofs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/isofs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/jfs-modules
deleted file mode 100644
index b71ebd35..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/jfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/kernel-image
deleted file mode 100644
index cccdb6e2..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/kernel-image
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "../powerpc/kernel-image"
-
-# PowerMac fan control support
-i2c-powermac ?
-windfarm_core ?
-windfarm_cpufreq_clamp ?
-windfarm_lm75_sensor ?
-windfarm_max6690_sensor ?
-windfarm_pid ?
-windfarm_pm121 ?
-windfarm_pm112 ?
-windfarm_pm81 ?
-windfarm_pm91 ?
-windfarm_pm72 ?
-windfarm_rm31 ?
-windfarm_smu_controls ?
-windfarm_smu_sat ?
-windfarm_smu_sensors ?
-windfarm_ad7417_sensor ?
-windfarm_fcu_controls ?
-windfarm_lm87_sensor ?
-windfarm_pid ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/loop-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/loop-modules
deleted file mode 100644
index e2273687..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/loop-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/md-modules
deleted file mode 100644
index 93be33f9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/md-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/md-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/mmc-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/mmc-core-modules
deleted file mode 100644
index 5308bc43..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/mmc-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/mmc-core-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/multipath-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/multipath-modules
deleted file mode 100644
index fcb0045b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/multipath-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nbd-modules
deleted file mode 100644
index ff7fc80e..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nbd-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-modules
deleted file mode 100644
index 7578f433..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-pcmcia-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-pcmcia-modules
deleted file mode 100644
index 3f521e9d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-pcmcia-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-shared-modules
deleted file mode 100644
index 5b05e0d4..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-shared-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-usb-modules
deleted file mode 100644
index 790780af..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-usb-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-usb-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-wireless-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-wireless-modules
deleted file mode 100644
index b25c130d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/nic-wireless-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-wireless-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pata-modules
deleted file mode 100644
index bb9cbe3a..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pata-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pcmcia-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pcmcia-modules
deleted file mode 100644
index e508df66..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pcmcia-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pcmcia-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pcmcia-storage-modules
deleted file mode 100644
index f00f2460..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/pcmcia-storage-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pcmcia-storage-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ppp-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ppp-modules
deleted file mode 100644
index eb7ab74a..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ppp-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/sata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/sata-modules
deleted file mode 100644
index 591ad741..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/sata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/sata-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-core-modules
deleted file mode 100644
index c972a471..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-core-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-modules
deleted file mode 100644
index 74a81772..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-modules
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "../powerpc/scsi-modules"
-
-# Really SATA, but keep it with ps3rom as they both depend on ps3stor_lib
-ps3disk ?
-
-# Exclude target driver
-ibmvscsis -
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-nic-modules
deleted file mode 100644
index edcfa738..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/scsi-nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-nic-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/serial-modules
deleted file mode 100644
index 349196e3..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/serial-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/squashfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/squashfs-modules
deleted file mode 100644
index 32a1b6ff..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/squashfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/udf-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/udf-modules
deleted file mode 100644
index 6c72cbc1..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/udf-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/uinput-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/uinput-modules
deleted file mode 100644
index 5020f7cc..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/uinput-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-modules
deleted file mode 100644
index 9c5b10a7..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-serial-modules
deleted file mode 100644
index e25b5586..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-serial-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-storage-modules
deleted file mode 100644
index 5f278e65..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/usb-storage-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-storage-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/xfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/xfs-modules
deleted file mode 100644
index c850127e..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc-powerpc64/xfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/xfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/affs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/affs-modules
deleted file mode 100644
index 3f0e4bb9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/affs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ata-modules
deleted file mode 100644
index b81c0f38..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/btrfs-modules
deleted file mode 100644
index e261e138..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/cdrom-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/cdrom-core-modules
deleted file mode 100644
index e264d7aa..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/cdrom-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/crypto-dm-modules
deleted file mode 100644
index 4c8f2354..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/drm-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/drm-core-modules
deleted file mode 100644
index 0428c279..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/drm-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ext4-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ext4-modules
deleted file mode 100644
index 394c577c..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/f2fs-modules
deleted file mode 100644
index 34359e04..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/f2fs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/fat-modules
deleted file mode 100644
index cce8fd30..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/fat-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/fb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/fb-modules
deleted file mode 100644
index 3a53ab26..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/fb-modules
+++ /dev/null
@@ -1,7 +0,0 @@
-#include
-
-# 32-bit PowerMacs mostly have either ATI Rage 128 or Radeon graphics
-# chips for which the offb driver doesn't work properly. aty128fb is
-# currently built-in but that could plausibly change in future.
-aty128fb
-radeonfb
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/hfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/hfs-modules
deleted file mode 100644
index 57d12f64..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/hfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/input-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/input-modules
deleted file mode 100644
index 51e37ced..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/input-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include
-atkbd
-i8042
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/jfs-modules
deleted file mode 100644
index 925a43a9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/jfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/loop-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/loop-modules
deleted file mode 100644
index 16446771..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/loop-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/md-modules
deleted file mode 100644
index ade088dd..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/md-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/mmc-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/mmc-core-modules
deleted file mode 100644
index 7bf38465..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/mmc-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nbd-modules
deleted file mode 100644
index 3c9b3e5d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-shared-modules
deleted file mode 100644
index a6f274a4..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/nic-shared-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-llc
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/pcmcia-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/pcmcia-storage-modules
deleted file mode 100644
index 9fbaff30..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/pcmcia-storage-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ppp-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ppp-modules
deleted file mode 100644
index f1ae9b3d..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/ppp-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/sata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/sata-modules
deleted file mode 100644
index 071cb860..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/sata-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/scsi-nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/scsi-nic-modules
deleted file mode 100644
index 089dd5dc..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/scsi-nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/squashfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/squashfs-modules
deleted file mode 100644
index 42d77887..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/udf-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/udf-modules
deleted file mode 100644
index b90d7ee9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/uinput-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/uinput-modules
deleted file mode 100644
index 58a83377..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-serial-modules
deleted file mode 100644
index c0a0dc3b..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-storage-modules
deleted file mode 100644
index 272d95e2..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/usb-storage-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/xfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/xfs-modules
deleted file mode 100644
index c020b5d3..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/powerpc/xfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include
-
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64 b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64
deleted file mode 120000
index a3e2a578..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64
+++ /dev/null
@@ -1 +0,0 @@
-powerpc-powerpc64
\ No newline at end of file
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ata-modules
deleted file mode 100644
index 03599667..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/ata-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/block-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/block-modules
new file mode 100644
index 00000000..f937d0e0
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/block-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/btrfs-modules
deleted file mode 100644
index 1d9d7d86..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/btrfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/cdrom-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/cdrom-core-modules
deleted file mode 100644
index 4e22480a..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/cdrom-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/cdrom-core-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crc-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crc-modules
new file mode 100644
index 00000000..7e00de70
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crc-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crypto-dm-modules
deleted file mode 100644
index f00e2932..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/crypto-dm-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crypto-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crypto-modules
index 1d84b7f9..3a1e862b 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crypto-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/crypto-modules
@@ -1 +1 @@
-#include "../ppc64/crypto-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/drm-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/drm-core-modules
deleted file mode 100644
index 0428c279..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/drm-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ext4-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ext4-modules
deleted file mode 100644
index b145b0d9..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/ext4-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/f2fs-modules
deleted file mode 100644
index 34359e04..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/f2fs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fat-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fat-modules
index 016d9727..274584eb 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fat-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fat-modules
@@ -1 +1 @@
-#include "../ppc64/fat-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/firewire-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/firewire-core-modules
deleted file mode 100644
index 5a7791fe..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/firewire-core-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/floppy-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/floppy-modules
new file mode 100644
index 00000000..bc84c4e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/floppy-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fs-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fs-core-modules
new file mode 100644
index 00000000..024c2d7f
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fs-core-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fs-secondary-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fs-secondary-modules
new file mode 100644
index 00000000..3689f185
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/fs-secondary-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/hypervisor-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/hypervisor-modules
deleted file mode 100644
index 2c8e7d82..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/hypervisor-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/hypervisor-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/i2c-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/i2c-modules
new file mode 100644
index 00000000..203a607e
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/i2c-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/input-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/input-modules
index 94d6a117..5ecb595a 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/input-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/input-modules
@@ -1 +1 @@
-#include "../ppc64/input-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ipmi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ipmi-modules
new file mode 100644
index 00000000..d0fc9797
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ipmi-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/isofs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/isofs-modules
index ff9a9e5c..da4fa9a3 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/isofs-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/isofs-modules
@@ -1 +1 @@
-#include "../ppc64/isofs-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/jfs-modules
deleted file mode 100644
index 86a502bd..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/jfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/kernel-image
index 24366533..1d11b192 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/kernel-image
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/kernel-image
@@ -1 +1 @@
-#include "../ppc64/kernel-image"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/loop-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/loop-modules
deleted file mode 100644
index 2373df64..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/loop-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/md-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/md-modules
index be97ac8b..26115e10 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/md-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/md-modules
@@ -1 +1 @@
-#include "../ppc64/md-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/message-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/message-modules
new file mode 100644
index 00000000..9b060b37
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/message-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/multipath-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/multipath-modules
index d6965bdb..a8b69b25 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/multipath-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/multipath-modules
@@ -1 +1 @@
-#include "../ppc64/multipath-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nbd-modules
deleted file mode 100644
index 9037d8f6..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/nbd-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nfs-modules
new file mode 100644
index 00000000..946fb8e4
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nfs-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-modules
index f6922641..2512e839 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-modules
@@ -1 +1 @@
-#include "../ppc64/nic-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-shared-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-shared-modules
index c8ff13b1..cc84b14d 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-shared-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-shared-modules
@@ -1 +1 @@
-#include "../ppc64/nic-shared-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-wireless-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-wireless-modules
index 68609a32..53fd18d7 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-wireless-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/nic-wireless-modules
@@ -1 +1 @@
-#include "../ppc64/nic-wireless-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/parport-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/parport-modules
new file mode 100644
index 00000000..83966f77
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/parport-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/plip-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/plip-modules
new file mode 100644
index 00000000..ca7a41bb
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/plip-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ppp-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ppp-modules
index 21261522..1f26aa1e 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ppp-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/ppp-modules
@@ -1 +1 @@
-#include "../ppc64/ppp-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/sata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/sata-modules
index 92f711ac..01318c25 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/sata-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/sata-modules
@@ -1 +1 @@
-#include "../ppc64/sata-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-core-modules
index b764c2b2..dd65d661 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-core-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-core-modules
@@ -1 +1 @@
-#include "../ppc64/scsi-core-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-modules
index c3979d67..8909dfb7 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-modules
@@ -1 +1 @@
-#include "../ppc64/scsi-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-nic-modules
deleted file mode 100644
index 089dd5dc..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/scsi-nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/serial-modules
index 111ebcd6..6ab8b8c3 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/serial-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/serial-modules
@@ -1 +1 @@
-#include "../ppc64/serial-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/squashfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/squashfs-modules
deleted file mode 100644
index 557d0d20..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/squashfs-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/storage-core-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/storage-core-modules
new file mode 100644
index 00000000..ebffb373
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/storage-core-modules
@@ -0,0 +1,2 @@
+#include
+ipr ?
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/udf-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/udf-modules
deleted file mode 100644
index c7471ab0..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/udf-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/uinput-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/uinput-modules
deleted file mode 100644
index 4a3898f1..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/uinput-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-modules
index a113185a..c598dedd 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-modules
@@ -1 +1 @@
-#include "../ppc64/usb-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-serial-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-serial-modules
deleted file mode 100644
index c7fe81a4..00000000
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ppc64/usb-serial-modules"
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-storage-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-storage-modules
index 43d2811a..8c5e81b5 100644
--- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-storage-modules
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/usb-storage-modules
@@ -1 +1 @@
-#include "../ppc64/usb-storage-modules"
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/virtio-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/virtio-modules
new file mode 100644
index 00000000..61da3965
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/virtio-modules
@@ -0,0 +1 @@
+#include
diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/vlan-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/vlan-modules
new file mode 100644
index 00000000..a8947e0b
--- /dev/null
+++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/ppc64el/vlan-modules
@@ -0,0 +1 @@
+#include