Skip to content

Commit f1deef4

Browse files
committed
rocky: generalize rule for kunit and test kmod placement
1 parent bc8a48f commit f1deef4

1 file changed

Lines changed: 4 additions & 25 deletions

File tree

ciq/SOURCES/def_variants.yaml.rocky

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ packages:
1818
- modules
1919

2020
rules:
21+
- .*kunit.*: modules-internal
22+
exact_pkg: True
23+
- .*test[^/]*.ko: modules-internal
24+
2125
- arch/.*: modules-core
2226
- block/t10-pi.ko: modules-core
2327
- crypto/.*: modules-core
@@ -28,7 +32,6 @@ rules:
2832
- drivers/acpi/.*: modules-core
2933
- drivers/ata/.*: modules-core
3034

31-
- drivers/base/.*(kunit|test).*: modules-internal
3235
- drivers/base/regmap/regmap-sdw.*: modules
3336
- drivers/base/.*: modules-core
3437
- drivers/block/floppy.*: modules-extra
@@ -40,7 +43,6 @@ rules:
4043
- drivers/cdx/.*: modules-core
4144
- drivers/char/mwave.*: modules
4245
- drivers/char/.*: modules-core
43-
- drivers/clk/.*(test|kunit).*: modules-internal
4446
- drivers/clk/.*: modules-core
4547
- drivers/counter/.*: modules-core
4648
- drivers/cpufreq/amd-pstate-ut.ko: modules-internal
@@ -56,13 +58,11 @@ rules:
5658
- drivers/dax/.*: modules-core
5759
- drivers/dca/.*: modules-core
5860
- drivers/devfreq/.*: modules-core
59-
- drivers/dma/dmatest.*: modules-internal
6061
- drivers/dma/.*: modules-core
6162

6263
- drivers/edac/.*: modules-core
6364
- drivers/extcon/.*: modules-core
6465

65-
- drivers/firmware/.*(test|kunit).*: modules-internal
6666
- drivers/firmware/iscsi_ibft.*: modules
6767
- drivers/firmware/.*: modules-core
6868
- drivers/fsi/.*: modules-core
@@ -81,24 +81,20 @@ rules:
8181
- drivers/gpu/drm/mxsfb/.*: modules-core
8282
- drivers/gpu/drm/panfrost/.*: modules-core
8383
- drivers/gpu/drm/qxl/.*: modules-core
84-
- drivers/gpu/drm/scheduler/.*(test|kunit).*: modules-internal
8584
- drivers/gpu/drm/scheduler/.*: modules-core
8685
- drivers/gpu/drm/solomon/.*: modules-core
87-
- drivers/gpu/drm/tests/.*: modules-internal
8886
- drivers/gpu/drm/tidss/.*: modules-core
8987
- drivers/gpu/drm/tiny/.*: modules-core
9088
- drivers/gpu/drm/ttm/.*: modules-core
9189
- drivers/gpu/drm/udl/.*: modules-core
9290
- drivers/gpu/drm/v3d/.*: modules-core
9391
- drivers/gpu/drm/vgem/.*: modules-core
9492
- drivers/gpu/drm/virtio/.*: modules-core
95-
- drivers/gpu/drm/vkms/.*(test|kunit).*: modules-internal
9693
- drivers/gpu/drm/vkms/.*: modules-core
9794
- drivers/gpu/drm/vmwgfx/.*: modules-core
9895
- drivers/gpu/drm/xlnx/.*: modules-core
9996
- drivers/gpu/host1x/.*: modules-core
10097

101-
- drivers/hid/.*test.*: modules-internal
10298
- drivers/hid/hid-asus.*: modules
10399
- drivers/hid/hid-nintendo.*: modules
104100
- drivers/hid/hid-picolcd.*: modules
@@ -123,15 +119,12 @@ rules:
123119
- drivers/i2c/.*: modules-core
124120
- drivers/i3c/.*: modules-core
125121
- drivers/iio/adc/dln2-adc.*: modules-extra
126-
- drivers/iio/test/.*: modules-internal
127122
- drivers/input/gameport/.*: modules
128123
- drivers/input/joystick/.*: modules-extra
129124
- drivers/input/tablet/.*: modules
130-
- drivers/input/tests/.*: modules-internal
131125
- drivers/input/touchscreen/.*: modules
132126
- drivers/input/.*: modules-core
133127
- drivers/interconnect/.*: modules-core
134-
- drivers/iommu/.*test.ko: modules-internal
135128
- drivers/iommu/.*: modules-core
136129
- drivers/irqchip/.*: modules-core
137130

@@ -249,7 +242,6 @@ rules:
249242
- drivers/perf/.*: modules-core
250243
- drivers/phy/.*: modules-core
251244
- drivers/pinctrl/.*: modules-core
252-
- drivers/platform/chrome/.*test.*: modules-internal
253245
- drivers/platform/x86/intel/intel_vsec.*: modules-core
254246
- drivers/pmdomain/.*: modules-core
255247
- drivers/powercap/intel_rapl_tpmi.*: modules
@@ -266,7 +258,6 @@ rules:
266258
- drivers/remoteproc/.*: modules-core
267259
- drivers/reset/.*: modules-core
268260
- drivers/rpmsg/.*: modules-core
269-
- drivers/rtc/.*test.*: modules-internal
270261
- drivers/rtc/.*: modules-core
271262

272263
- drivers/s390/net/ism.*: modules
@@ -373,7 +364,6 @@ rules:
373364
- drivers/w1/slaves/w1_smem.*: modules-extra
374365
- drivers/w1/slaves/w1_therm.*: modules-extra
375366

376-
- fs/.*test.*: modules-internal
377367
- fs/9p/.*: modules-core
378368
- fs/afs/.*: modules-partner
379369
- fs/affs/affs.*: modules-extra
@@ -413,27 +403,18 @@ rules:
413403
- fs/xfs/.*: modules-core
414404
- fs/zonefs/.*: modules-core
415405

416-
- kernel/.*test.*: modules-internal
417-
- kernel/lib/kunit/.*: modules-internal
418406
- kernel/locking/locktorture.*: modules-internal
419407
- kernel/rcu/rcuscale.*: modules-internal
420408
- kernel/rcu/rcutorture.*: modules-internal
421409
- kernel/rcu/refscale.*: modules-internal
422-
- kernel/resource_kunit.*: modules-internal
423410
- kernel/scftorture.*: modules-internal
424411
- kernel/torture.*: modules-internal
425412
- kernel/.*: modules-core
426413

427-
- lib/test_lockup.*: modules-extra
428-
- lib/.*(test|kunit).*: modules-internal
429-
exact_pkg: True
430414
- lib/.*: modules-core
431415

432-
- mm/kasan/kasan_test: modules-internal
433-
- mm/kfence/.*test.*: modules-internal
434416
- mm/zsmalloc.ko: modules-core
435417

436-
- net/.*test.*: modules-internal
437418
- net/802/.*: modules-core
438419
- net/8021q/.*: modules-core
439420
- net/9p/9pnet_rdma.ko: modules
@@ -499,8 +480,6 @@ rules:
499480
- net/xfrm/.*: modules-core
500481

501482
- samples/.*: modules-internal
502-
- sound/pci/.*test.*: modules-internal
503-
- sound/soc/.*test.*: modules-internal
504483

505484
- virt/.*: modules-core
506485

0 commit comments

Comments
 (0)