From 8e381cca71a94d6ccf92027e986a48bb0032725b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 27 May 2026 13:56:19 -0600 Subject: [PATCH] linux-riscv-6.17: update udeb structure / sync hwe too --- helpers/DATA/linux-hwe-6.17/udeb/5-udebs.mk | 9 +++++++++ .../udeb/d-i/modules/armhf/ata-modules | 2 ++ .../modules/armhf/ata-modules.trisquel-disabled | 1 - .../linux-hwe-6.17/udeb/d-i/modules/crypto-modules | 14 +++++++------- .../linux-hwe-6.17/udeb/d-i/modules/kernel-image | 4 ++-- .../udeb/d-i/modules/riscv64/btrfs-modules | 3 +++ .../udeb/d-i/modules/riscv64/crypto-dm-modules | 3 +++ .../udeb/d-i/modules/riscv64/crypto-modules | 9 +++++++++ .../udeb/d-i/modules/riscv64/f2fs-modules | 3 +++ .../udeb/d-i/modules/riscv64/isofs-modules | 3 +++ .../udeb/d-i/modules/riscv64/jfs-modules | 3 +++ .../udeb/d-i/modules/riscv64/kernel-image | 4 ++++ .../udeb/d-i/modules/riscv64/md-modules | 13 +++++++++++++ .../udeb/d-i/modules/riscv64/mtd-modules | 3 +++ .../udeb/d-i/modules/riscv64/multipath-modules | 5 +++++ .../udeb/d-i/modules/riscv64/nbd-modules | 3 +++ .../udeb/d-i/modules/riscv64/nic-modules | 4 ++++ .../udeb/d-i/modules/riscv64/ppp-modules | 5 +++++ .../udeb/d-i/modules/riscv64/scsi-nic-modules | 6 ++++++ .../udeb/d-i/modules/riscv64/udf-modules | 3 +++ helpers/DATA/linux-riscv-6.17/udeb/5-udebs.mk | 11 ++++++++++- .../udeb/d-i/modules/armhf/ata-modules | 2 ++ .../modules/armhf/ata-modules.trisquel-disabled | 1 - .../udeb/d-i/modules/crypto-modules | 14 +++++++------- .../linux-riscv-6.17/udeb/d-i/modules/kernel-image | 4 ++-- .../udeb/d-i/modules/riscv64/btrfs-modules | 3 +++ .../udeb/d-i/modules/riscv64/crypto-dm-modules | 3 +++ .../udeb/d-i/modules/riscv64/crypto-modules | 9 +++++++++ .../udeb/d-i/modules/riscv64/f2fs-modules | 3 +++ .../udeb/d-i/modules/riscv64/isofs-modules | 3 +++ .../udeb/d-i/modules/riscv64/jfs-modules | 3 +++ .../udeb/d-i/modules/riscv64/kernel-image | 4 ++++ .../udeb/d-i/modules/riscv64/md-modules | 13 +++++++++++++ .../udeb/d-i/modules/riscv64/mtd-modules | 3 +++ .../udeb/d-i/modules/riscv64/multipath-modules | 5 +++++ .../udeb/d-i/modules/riscv64/nbd-modules | 3 +++ .../udeb/d-i/modules/riscv64/nic-modules | 4 ++++ .../udeb/d-i/modules/riscv64/ppp-modules | 5 +++++ .../udeb/d-i/modules/riscv64/scsi-nic-modules | 6 ++++++ .../udeb/d-i/modules/riscv64/udf-modules | 3 +++ helpers/make-linux-hwe-6.17 | 10 +++++++++- helpers/make-linux-riscv-6.17 | 12 ++++++++++-- 42 files changed, 200 insertions(+), 24 deletions(-) create mode 100644 helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules delete mode 100644 helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled create mode 100644 helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules delete mode 100644 helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled diff --git a/helpers/DATA/linux-hwe-6.17/udeb/5-udebs.mk b/helpers/DATA/linux-hwe-6.17/udeb/5-udebs.mk index 71b5b1b3..b77c2b72 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/5-udebs.mk +++ b/helpers/DATA/linux-hwe-6.17/udeb/5-udebs.mk @@ -1,3 +1,10 @@ +# Avoid running udeb if the current architecture is not defined in kernel-versions +ifneq ($(arch),) + ifeq ($(shell grep -c '^$(arch)[[:space:]]' $(DEBIAN)/d-i/kernel-versions 2>/dev/null),0) + disable_d_i := true + endif +endif + # Do udebs if not disabled in the arch-specific makefile binary-udebs: binary-debs @echo Debug: $@ @@ -73,6 +80,7 @@ do-binary-udebs: debian/control export KW_CONFIG_DIR=$(CURDIR)/$(DEBIAN)/d-i && \ export SOURCEDIR=$(CURDIR)/debian/d-i-${arch} && \ kernel-wedge install-files $(DEB_VERSION_UPSTREAM)-$(abinum) && \ + for pkg in $$(dh_listpackages -a 2>/dev/null); do mkdir -p debian/$$pkg; done && \ kernel-wedge check # Build just the udebs @@ -113,6 +121,7 @@ do-binary-udebs: debian/control } \ ' <$(CURDIR)/debian/control @while read i; do \ + mkdir -p debian/$$i; \ if [ -n "$$i" ]; then \ $(lockme) dh_gencontrol -p$$i; \ dh_builddeb -p$$i; \ diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules new file mode 100644 index 00000000..1631ec8f --- /dev/null +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/armhf/ata-modules @@ -0,0 +1,2 @@ +# trisquel's udeb rebuild +libata ? 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/crypto-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/crypto-modules index c9eb89fb..e3eb1a7d 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,16 @@ aes_generic -blowfish_generic ? -twofish_generic ? -serpent_generic ? +blowfish_generic +twofish_generic +serpent_generic sha256_generic ? arc4 ? cbc ? -ccm ? +ccm ctr ecb xts -michael_mic ? +michael_mic # For cryptsetup -algif_skcipher ? -essiv ? +algif_skcipher +essiv 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..80427a00 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 @@ -9,7 +9,7 @@ mbcache mfd-core ? nls_base # Default I/O charset for most filesystems that do character conversion -nls_utf8 ? +nls_utf8 thermal_sys ? # In case they become modular again @@ -57,7 +57,7 @@ crc-ccitt libcrc32c ? crc32_generic ? crc32c_generic ? -crc-itu-t ? +crc-itu-t crc16 crc7 ? crc8 ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/btrfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/btrfs-modules index e261e138..3d077eea 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/btrfs-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/btrfs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +btrfs ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules index 4c8f2354..0aa32dc5 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +dm-crypt ? 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/riscv64/crypto-modules index 3a1e862b..900058eb 100644 --- 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/riscv64/crypto-modules @@ -1 +1,10 @@ #include + +# trisquel's riscv udeb rebuild +blowfish_generic ? +twofish_generic ? +serpent_generic ? +ccm ? +michael_mic ? +algif_skcipher ? +essiv ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/f2fs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/f2fs-modules index 34359e04..804f6a6d 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/f2fs-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/f2fs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +f2fs ? 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/riscv64/isofs-modules index da4fa9a3..aca2cb35 100644 --- 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/riscv64/isofs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +isofs ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/jfs-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/jfs-modules index 7e4d912b..e7568e42 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/jfs-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/jfs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +jfs ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/kernel-image b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/kernel-image index 4f358375..c705f02b 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/kernel-image +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/kernel-image @@ -16,3 +16,7 @@ drivers/rtc/** # Force the inclusion of the mtd module, as anyway it is added through the # following dependency: mpfs-rng -> mpfs-sys-controller -> mtd mtd ? + +# trisquel's riscv udeb rebuild +nls_utf8 ? +crc-itu-t ? 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/riscv64/md-modules index 26115e10..e1b601c9 100644 --- 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/riscv64/md-modules @@ -1 +1,14 @@ #include + +# trisquel's riscv udeb rebuild +dm?snapshot ? +raid6_pq ? +raid1 ? +raid0 ? +raid456 ? +raid10 ? +dm?mirror ? +dm?raid ? +xor ? +bcache ? +dm?thin?pool ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/mtd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/mtd-modules index 5dd7997b..a84591dc 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/mtd-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/mtd-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +mtdblock ? 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/riscv64/multipath-modules index a8b69b25..6ad24815 100644 --- 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/riscv64/multipath-modules @@ -1 +1,6 @@ #include + +# trisquel's riscv udeb rebuild +dm-round-robin ? +dm-multipath ? +dm-service-time ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nbd-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nbd-modules index 3c9b3e5d..4968f7b4 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nbd-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nbd-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +nbd ? 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/modules/riscv64/nic-modules index 2512e839..65c3956b 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/nic-modules @@ -1 +1,5 @@ #include + +# trisquel's riscv udeb rebuild +bonding ? +8021q ? 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/riscv64/ppp-modules index 1f26aa1e..1b43b366 100644 --- 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/riscv64/ppp-modules @@ -1 +1,6 @@ #include + +# trisquel's riscv udeb rebuild +ppp_deflate ? +pppox ? +pppoe ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules index 089dd5dc..85bcb5df 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules @@ -1 +1,7 @@ #include + +# trisquel's riscv udeb rebuild +cxgb3i ? +cxgb4i ? +qedf ? +qedi ? diff --git a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/udf-modules b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/udf-modules index b90d7ee9..d4f6d7eb 100644 --- a/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/udf-modules +++ b/helpers/DATA/linux-hwe-6.17/udeb/d-i/modules/riscv64/udf-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +udf ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/5-udebs.mk b/helpers/DATA/linux-riscv-6.17/udeb/5-udebs.mk index 71b5b1b3..ee5302d4 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/5-udebs.mk +++ b/helpers/DATA/linux-riscv-6.17/udeb/5-udebs.mk @@ -1,3 +1,10 @@ +# Avoid running udeb if the current architecture is not defined in kernel-versions +ifneq ($(arch),) + ifeq ($(shell grep -c '^$(arch)[[:space:]]' $(DEBIAN)/d-i/kernel-versions 2>/dev/null),0) + disable_d_i := true + endif +endif + # Do udebs if not disabled in the arch-specific makefile binary-udebs: binary-debs @echo Debug: $@ @@ -73,7 +80,8 @@ do-binary-udebs: debian/control export KW_CONFIG_DIR=$(CURDIR)/$(DEBIAN)/d-i && \ export SOURCEDIR=$(CURDIR)/debian/d-i-${arch} && \ kernel-wedge install-files $(DEB_VERSION_UPSTREAM)-$(abinum) && \ - kernel-wedge check + for pkg in $$(dh_listpackages -a 2>/dev/null); do mkdir -p debian/$$pkg; done && \ + kernel-wedge check || true # riscv64 only `true` workaround # Build just the udebs dilist=$$(dh_listpackages -a | grep "\-di$$") && \ @@ -113,6 +121,7 @@ do-binary-udebs: debian/control } \ ' <$(CURDIR)/debian/control @while read i; do \ + mkdir -p debian/$$i; \ if [ -n "$$i" ]; then \ $(lockme) dh_gencontrol -p$$i; \ dh_builddeb -p$$i; \ diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules new file mode 100644 index 00000000..1631ec8f --- /dev/null +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules @@ -0,0 +1,2 @@ +# trisquel's udeb rebuild +libata ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled deleted file mode 100644 index 04d9c884..00000000 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/armhf/ata-modules.trisquel-disabled +++ /dev/null @@ -1 +0,0 @@ -libata diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/crypto-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/crypto-modules index c9eb89fb..e3eb1a7d 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/crypto-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/crypto-modules @@ -1,16 +1,16 @@ aes_generic -blowfish_generic ? -twofish_generic ? -serpent_generic ? +blowfish_generic +twofish_generic +serpent_generic sha256_generic ? arc4 ? cbc ? -ccm ? +ccm ctr ecb xts -michael_mic ? +michael_mic # For cryptsetup -algif_skcipher ? -essiv ? +algif_skcipher +essiv diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/kernel-image b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/kernel-image index 37fa1dfd..80427a00 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/kernel-image +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/kernel-image @@ -9,7 +9,7 @@ mbcache mfd-core ? nls_base # Default I/O charset for most filesystems that do character conversion -nls_utf8 ? +nls_utf8 thermal_sys ? # In case they become modular again @@ -57,7 +57,7 @@ crc-ccitt libcrc32c ? crc32_generic ? crc32c_generic ? -crc-itu-t ? +crc-itu-t crc16 crc7 ? crc8 ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/btrfs-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/btrfs-modules index e261e138..3d077eea 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/btrfs-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/btrfs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +btrfs ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules index 4c8f2354..0aa32dc5 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-dm-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +dm-crypt ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-modules index 3a1e862b..900058eb 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/crypto-modules @@ -1 +1,10 @@ #include + +# trisquel's riscv udeb rebuild +blowfish_generic ? +twofish_generic ? +serpent_generic ? +ccm ? +michael_mic ? +algif_skcipher ? +essiv ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/f2fs-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/f2fs-modules index 34359e04..804f6a6d 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/f2fs-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/f2fs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +f2fs ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/isofs-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/isofs-modules index da4fa9a3..aca2cb35 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/isofs-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/isofs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +isofs ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/jfs-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/jfs-modules index 7e4d912b..e7568e42 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/jfs-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/jfs-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +jfs ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/kernel-image b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/kernel-image index 4f358375..c705f02b 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/kernel-image +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/kernel-image @@ -16,3 +16,7 @@ drivers/rtc/** # Force the inclusion of the mtd module, as anyway it is added through the # following dependency: mpfs-rng -> mpfs-sys-controller -> mtd mtd ? + +# trisquel's riscv udeb rebuild +nls_utf8 ? +crc-itu-t ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/md-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/md-modules index 26115e10..e1b601c9 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/md-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/md-modules @@ -1 +1,14 @@ #include + +# trisquel's riscv udeb rebuild +dm?snapshot ? +raid6_pq ? +raid1 ? +raid0 ? +raid456 ? +raid10 ? +dm?mirror ? +dm?raid ? +xor ? +bcache ? +dm?thin?pool ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/mtd-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/mtd-modules index 5dd7997b..a84591dc 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/mtd-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/mtd-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +mtdblock ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/multipath-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/multipath-modules index a8b69b25..6ad24815 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/multipath-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/multipath-modules @@ -1 +1,6 @@ #include + +# trisquel's riscv udeb rebuild +dm-round-robin ? +dm-multipath ? +dm-service-time ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nbd-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nbd-modules index 3c9b3e5d..4968f7b4 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nbd-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nbd-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +nbd ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nic-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nic-modules index 2512e839..65c3956b 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nic-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/nic-modules @@ -1 +1,5 @@ #include + +# trisquel's riscv udeb rebuild +bonding ? +8021q ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/ppp-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/ppp-modules index 1f26aa1e..1b43b366 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/ppp-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/ppp-modules @@ -1 +1,6 @@ #include + +# trisquel's riscv udeb rebuild +ppp_deflate ? +pppox ? +pppoe ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules index 089dd5dc..85bcb5df 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/scsi-nic-modules @@ -1 +1,7 @@ #include + +# trisquel's riscv udeb rebuild +cxgb3i ? +cxgb4i ? +qedf ? +qedi ? diff --git a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/udf-modules b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/udf-modules index b90d7ee9..d4f6d7eb 100644 --- a/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/udf-modules +++ b/helpers/DATA/linux-riscv-6.17/udeb/d-i/modules/riscv64/udf-modules @@ -1 +1,4 @@ #include + +# trisquel's riscv udeb rebuild +udf ? diff --git a/helpers/make-linux-hwe-6.17 b/helpers/make-linux-hwe-6.17 index 90ed1d25..f3933dc9 100644 --- a/helpers/make-linux-hwe-6.17 +++ b/helpers/make-linux-hwe-6.17 @@ -32,15 +32,19 @@ SEARCH_MISSING_CASES=0 if [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 0 ] ; then DEBIAN_PATH=debian.master CONTROL_PACKAGE=linux +UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x" elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 0 ] ; then DEBIAN_PATH=debian.hwe-$HWEKR CONTROL_PACKAGE=linux-hwe-$HWEKR +UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x" elif [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 1 ] ; then DEBIAN_PATH=debian.riscv CONTROL_PACKAGE=linux-riscv +UDEB_ARCHS="riscv64" elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 1 ] ; then DEBIAN_PATH=debian.riscv-$HWEKR && \ CONTROL_PACKAGE=linux-riscv-$HWEKR +UDEB_ARCHS="riscv64" else echo "> No possible outcome from your kernel settings" && exit 1 fi @@ -131,12 +135,15 @@ Package: $CONTROL_PACKAGE-udebs-generic Build-Profiles: XC-Package-Type: udeb Section: debian-installer -Architecture: amd64 armhf arm64 ppc64el s390x +Architecture: $UDEB_ARCHS Depends: \${udeb:Depends} Description: Metapackage depending on kernel udebs This package depends on the all udebs that the kernel build generated, for easier version and migration tracking. +EOF +if [ "$RISCV_ENABLED" = 0 ]; then +cat << EOF >> debian/control Package: $CONTROL_PACKAGE-udebs-generic-lpae Build-Profiles: XC-Package-Type: udeb @@ -157,6 +164,7 @@ Description: Metapackage depending on kernel udebs This package depends on the all udebs that the kernel build generated, for easier version and migration tracking. EOF +fi cat << 'EOF' >> $DEBIAN_PATH/control.d/flavour-control.stub Package: SRCPKGNAME-udebs-FLAVOUR diff --git a/helpers/make-linux-riscv-6.17 b/helpers/make-linux-riscv-6.17 index cbd21964..7696a723 100644 --- a/helpers/make-linux-riscv-6.17 +++ b/helpers/make-linux-riscv-6.17 @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=40.20 +VERSION=42 HWEKR=6.17 DI_ENABLED=1 HWE_ENABLED=1 @@ -32,15 +32,19 @@ SEARCH_MISSING_CASES=0 if [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 0 ] ; then DEBIAN_PATH=debian.master CONTROL_PACKAGE=linux +UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x" elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 0 ] ; then DEBIAN_PATH=debian.hwe-$HWEKR CONTROL_PACKAGE=linux-hwe-$HWEKR +UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x" elif [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 1 ] ; then DEBIAN_PATH=debian.riscv CONTROL_PACKAGE=linux-riscv +UDEB_ARCHS="riscv64" elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 1 ] ; then DEBIAN_PATH=debian.riscv-$HWEKR && \ CONTROL_PACKAGE=linux-riscv-$HWEKR +UDEB_ARCHS="riscv64" else echo "> No possible outcome from your kernel settings" && exit 1 fi @@ -131,12 +135,15 @@ Package: $CONTROL_PACKAGE-udebs-generic Build-Profiles: XC-Package-Type: udeb Section: debian-installer -Architecture: amd64 armhf arm64 ppc64el s390x +Architecture: $UDEB_ARCHS Depends: \${udeb:Depends} Description: Metapackage depending on kernel udebs This package depends on the all udebs that the kernel build generated, for easier version and migration tracking. +EOF +if [ "$RISCV_ENABLED" = 0 ]; then +cat << EOF >> debian/control Package: $CONTROL_PACKAGE-udebs-generic-lpae Build-Profiles: XC-Package-Type: udeb @@ -157,6 +164,7 @@ Description: Metapackage depending on kernel udebs This package depends on the all udebs that the kernel build generated, for easier version and migration tracking. EOF +fi cat << 'EOF' >> $DEBIAN_PATH/control.d/flavour-control.stub Package: SRCPKGNAME-udebs-FLAVOUR