From: Jan Stancek <jstancek@xxxxxxxxxx>
redhat: generalize rule for kunit and test kmod placement
Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>
diff --git a/redhat/fedora_files/def_variants.yaml.fedora b/redhat/fedora_files/def_variants.yaml.fedora
index blahblah..blahblah 100644
--- a/redhat/fedora_files/def_variants.yaml.fedora
+++ b/redhat/fedora_files/def_variants.yaml.fedora
@@ -19,6 +19,10 @@ packages:
rules:
+ - .*kunit.*: modules-internal
+ exact_pkg: True
+ - .*test[^/]*.ko: modules-internal
+
- arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
if_variant_in: ["rt"]
@@ -31,7 +35,6 @@ rules:
- drivers/acpi/.*: modules-core
- drivers/ata/.*: modules-core
- - drivers/base/.*(kunit|test).*: modules-internal
- drivers/base/regmap/regmap-sdw.*: modules
- drivers/base/.*: modules-core
- drivers/block/floppy.*: modules-extra
@@ -42,7 +45,6 @@ rules:
- drivers/cdx/.*: modules-core
- drivers/char/mwave.*: modules
- drivers/char/.*: modules-core
- - drivers/clk/.*(test|kunit).*: modules-internal
- drivers/clk/.*: modules-core
- drivers/counter/.*: modules-core
- drivers/cpufreq/.*: modules-core
@@ -57,13 +59,11 @@ rules:
- drivers/dax/.*: modules-core
- drivers/dca/.*: modules-core
- drivers/devfreq/.*: modules-core
- - drivers/dma/dmatest.*: modules-internal
- drivers/dma/.*: modules-core
- drivers/edac/.*: modules-core
- drivers/extcon/.*: modules-core
- - drivers/firmware/cirrus/test/.*: modules-internal
- drivers/firmware/iscsi_ibft.*: modules
- drivers/firmware/.*: modules-core
- drivers/fsi/.*: modules-core
@@ -86,7 +86,6 @@ rules:
- drivers/gpu/drm/qxl/.*: modules-core
- drivers/gpu/drm/scheduler/.*: modules-core
- drivers/gpu/drm/solomon/.*: modules-core
- - drivers/gpu/drm/tests/.*: modules-internal
- drivers/gpu/drm/tidss/.*: modules-core
- drivers/gpu/drm/tiny/.*: modules-core
- drivers/gpu/drm/ttm/.*: modules-core
@@ -99,7 +98,6 @@ rules:
- drivers/gpu/drm/xlnx/.*: modules-core
- drivers/gpu/host1x/.*: modules-core
- - drivers/hid/.*test.*: modules-internal
- drivers/hid/hid-asus.*: modules
- drivers/hid/hid-nintendo.*: modules
- drivers/hid/hid-picolcd.*: modules
@@ -128,17 +126,14 @@ rules:
- drivers/iio/light/.*: modules
- drivers/iio/pressure/.*: modules
- drivers/iio/proximity/.*: modules
- - drivers/iio/test/.*: modules-internal
- drivers/iio/.*: modules-core
- drivers/input/gameport/.*: modules
- drivers/input/joystick/.*: modules-extra
- drivers/input/misc/pcspkr.*: modules-extra
- drivers/input/tablet/.*: modules
- - drivers/input/tests/.*: modules-internal
- drivers/input/touchscreen/.*: modules
- drivers/input/.*: modules-core
- drivers/interconnect/.*: modules-core
- - drivers/iommu/.*test.ko: modules-internal
- drivers/iommu/.*: modules-core
- drivers/irqchip/.*: modules-core
@@ -151,7 +146,6 @@ rules:
- drivers/message/fusion/.*: modules
- drivers/message/.*: modules-core
- drivers/mfd/dln2.*: modules-extra
- - drivers/misc/misc_minor_kunit.*: modules-internal
- drivers/misc/.*: modules-core
- drivers/mux/.*: modules-core
@@ -254,7 +248,6 @@ rules:
- drivers/perf/.*: modules-core
- drivers/phy/.*: modules-core
- drivers/pinctrl/.*: modules-core
- - drivers/platform/chrome/.*test.*: modules-internal
- drivers/pmdomain/.*: modules-core
- drivers/powercap/intel_rapl_tpmi.*: modules
- drivers/powercap/.*: modules-core
@@ -272,7 +265,6 @@ rules:
- drivers/remoteproc/.*: modules-core
- drivers/reset/.*: modules-core
- drivers/rpmsg/.*: modules-core
- - drivers/rtc/.*test.*: modules-internal
- drivers/rtc/.*: modules-core
- drivers/s390/.*: modules-core
@@ -376,7 +368,6 @@ rules:
- drivers/w1/slaves/w1_smem.*: modules-extra
- drivers/w1/slaves/w1_therm.*: modules-extra
- - fs/.*test.*: modules-internal
- fs/9p/.*: modules-core
- fs/afs/.*: modules-core
- fs/affs/affs.*: modules-extra
@@ -415,24 +406,16 @@ rules:
- fs/xfs/.*: modules-core
- fs/zonefs/.*: modules-core
- - kernel/.*test.*: modules-internal
- kernel/locking/locktorture.*: modules-internal
- kernel/rcu/rcuscale.*: modules-internal
- kernel/rcu/rcutorture.*: modules-internal
- kernel/rcu/refscale.*: modules-internal
- - kernel/resource_kunit.*: modules-internal
- kernel/scftorture.*: modules-internal
- kernel/torture.*: modules-internal
- kernel/.*: modules-core
- - lib/.*(test|kunit).*: modules-internal
- exact_pkg: True
- lib/.*: modules-core
- - mm/kasan/kasan_test: modules-internal
- - mm/kfence/.*test.*: modules-internal
-
- - net/.*test.*: modules-internal
- net/802/.*: modules-core
- net/8021q/.*: modules-core
- net/9p/9pnet_rdma.ko: modules
@@ -501,9 +484,6 @@ rules:
- net/xdp/.*: modules-core
- net/xfrm/.*: modules-core
- - sound/pci/.*test.*: modules-internal
- - sound/soc/.*test.*: modules-internal
-
- virt/.*: modules-core
- default: modules
diff --git a/redhat/rhel_files/def_variants.yaml.rhel b/redhat/rhel_files/def_variants.yaml.rhel
index blahblah..blahblah 100644
--- a/redhat/rhel_files/def_variants.yaml.rhel
+++ b/redhat/rhel_files/def_variants.yaml.rhel
@@ -22,6 +22,10 @@ packages:
- modules
rules:
+ - .*kunit.*: modules-internal
+ exact_pkg: True
+ - .*test[^/]*.ko: modules-internal
+
- arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
if_variant_in: ["rt"]
@@ -35,7 +39,6 @@ rules:
- drivers/acpi/.*: modules-core
- drivers/ata/.*: modules-core
- - drivers/base/.*(kunit|test).*: modules-internal
- drivers/base/regmap/regmap-sdw.*: modules
- drivers/base/.*: modules-core
- drivers/block/floppy.*: modules-extra
@@ -47,7 +50,6 @@ rules:
- drivers/cdx/.*: modules-core
- drivers/char/mwave.*: modules
- drivers/char/.*: modules-core
- - drivers/clk/.*(test|kunit).*: modules-internal
- drivers/clk/.*: modules-core
- drivers/counter/.*: modules-core
- drivers/cpufreq/amd-pstate-ut.ko: modules-internal
@@ -63,13 +65,11 @@ rules:
- drivers/dax/.*: modules-core
- drivers/dca/.*: modules-core
- drivers/devfreq/.*: modules-core
- - drivers/dma/dmatest.*: modules-internal
- drivers/dma/.*: modules-core
- drivers/edac/.*: modules-core
- drivers/extcon/.*: modules-core
- - drivers/firmware/cirrus/test/.*: modules-internal
- drivers/firmware/iscsi_ibft.*: modules
- drivers/firmware/.*: modules-core
- drivers/fsi/.*: modules-core
@@ -92,7 +92,6 @@ rules:
- drivers/gpu/drm/qxl/.*: modules-core
- drivers/gpu/drm/scheduler/.*: modules-core
- drivers/gpu/drm/solomon/.*: modules-core
- - drivers/gpu/drm/tests/.*: modules-internal
- drivers/gpu/drm/tidss/.*: modules-core
- drivers/gpu/drm/tiny/.*: modules-core
- drivers/gpu/drm/ttm/.*: modules-core
@@ -105,7 +104,6 @@ rules:
- drivers/gpu/drm/xlnx/.*: modules-core
- drivers/gpu/host1x/.*: modules-core
- - drivers/hid/.*test.*: modules-internal
- drivers/hid/hid-asus.*: modules
- drivers/hid/hid-nintendo.*: modules
- drivers/hid/hid-picolcd.*: modules
@@ -130,15 +128,12 @@ rules:
- drivers/i2c/.*: modules-core
- drivers/i3c/.*: modules-core
- drivers/iio/adc/dln2-adc.*: modules-extra
- - drivers/iio/test/.*: modules-internal
- drivers/input/gameport/.*: modules
- drivers/input/joystick/.*: modules-extra
- drivers/input/tablet/.*: modules
- - drivers/input/tests/.*: modules-internal
- drivers/input/touchscreen/.*: modules
- drivers/input/.*: modules-core
- drivers/interconnect/.*: modules-core
- - drivers/iommu/.*test.ko: modules-internal
- drivers/iommu/.*: modules-core
- drivers/irqchip/.*: modules-core
@@ -151,7 +146,6 @@ rules:
- drivers/message/fusion/.*: modules
- drivers/message/.*: modules-core
- drivers/mfd/dln2.*: modules-extra
- - drivers/misc/misc_minor_kunit.*: modules-internal
- drivers/misc/.*: modules-core
- drivers/mux/.*: modules-core
@@ -257,7 +251,6 @@ rules:
- drivers/perf/.*: modules-core
- drivers/phy/.*: modules-core
- drivers/pinctrl/.*: modules-core
- - drivers/platform/chrome/.*test.*: modules-internal
- drivers/platform/x86/intel/intel_vsec.*: modules-core
- drivers/pmdomain/.*: modules-core
- drivers/powercap/intel_rapl_tpmi.*: modules
@@ -276,7 +269,6 @@ rules:
- drivers/remoteproc/.*: modules-core
- drivers/reset/.*: modules-core
- drivers/rpmsg/.*: modules-core
- - drivers/rtc/.*test.*: modules-internal
- drivers/rtc/.*: modules-core
- drivers/s390/net/ism.*: modules
@@ -383,7 +375,6 @@ rules:
- drivers/w1/slaves/w1_smem.*: modules-extra
- drivers/w1/slaves/w1_therm.*: modules-extra
- - fs/.*test.*: modules-internal
- fs/9p/.*: modules-core
- fs/afs/.*: modules-partner
- fs/affs/affs.*: modules-extra
@@ -423,26 +414,18 @@ rules:
- fs/xfs/.*: modules-core
- fs/zonefs/.*: modules-core
- - kernel/.*test.*: modules-internal
- kernel/locking/locktorture.*: modules-internal
- kernel/rcu/rcuscale.*: modules-internal
- kernel/rcu/rcutorture.*: modules-internal
- kernel/rcu/refscale.*: modules-internal
- - kernel/resource_kunit.*: modules-internal
- kernel/scftorture.*: modules-internal
- kernel/torture.*: modules-internal
- kernel/.*: modules-core
- - lib/test_lockup.*: modules-extra
- - lib/.*(test|kunit).*: modules-internal
- exact_pkg: True
- lib/.*: modules-core
- - mm/kasan/kasan_test: modules-internal
- - mm/kfence/.*test.*: modules-internal
- mm/zsmalloc.ko: modules-core
- - net/.*test.*: modules-internal
- net/802/.*: modules-core
- net/8021q/.*: modules-core
- net/9p/9pnet_rdma.ko: modules
@@ -518,8 +501,6 @@ rules:
- net/xfrm/.*: modules-core
- samples/.*: modules-internal
- - sound/pci/.*test.*: modules-internal
- - sound/soc/.*test.*: modules-internal
- virt/.*: modules-core
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3648
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
