[OS-BUILD PATCH] redhat/configs: enable usbip for rhel

[José Ignacio Tornos Martínez (via Email Bridge)]

From: Jose Ignacio Tornos Martinez

redhat/configs: enable usbip for rhel

usbip feature has been requested to be enabled for rhel internal testing
(https://issues.redhat.com/browse/RHEL-56984).
Since it is for internal testing the generated modules will be saved in
internal rpm.
Unify configuration with fedora (it was previously enabled).

Signed-off-by: Jose Ignacio Tornos Martinez

diff --git a/redhat/configs/fedora/generic/CONFIG_USBIP_CORE b/redhat/configs/common/generic/CONFIG_USBIP_CORE
rename from redhat/configs/fedora/generic/CONFIG_USBIP_CORE
rename to redhat/configs/common/generic/CONFIG_USBIP_CORE
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_USBIP_CORE
+++ b/redhat/configs/common/generic/CONFIG_USBIP_CORE
diff --git a/redhat/configs/fedora/generic/CONFIG_USBIP_DEBUG b/redhat/configs/common/generic/CONFIG_USBIP_DEBUG
rename from redhat/configs/fedora/generic/CONFIG_USBIP_DEBUG
rename to redhat/configs/common/generic/CONFIG_USBIP_DEBUG
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_USBIP_DEBUG
+++ b/redhat/configs/common/generic/CONFIG_USBIP_DEBUG
diff --git a/redhat/configs/fedora/generic/CONFIG_USBIP_HOST b/redhat/configs/common/generic/CONFIG_USBIP_HOST
rename from redhat/configs/fedora/generic/CONFIG_USBIP_HOST
rename to redhat/configs/common/generic/CONFIG_USBIP_HOST
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_USBIP_HOST
+++ b/redhat/configs/common/generic/CONFIG_USBIP_HOST
diff --git a/redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_HCD b/redhat/configs/common/generic/CONFIG_USBIP_VHCI_HCD
rename from redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_HCD
rename to redhat/configs/common/generic/CONFIG_USBIP_VHCI_HCD
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_HCD
+++ b/redhat/configs/common/generic/CONFIG_USBIP_VHCI_HCD
diff --git a/redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_HC_PORTS b/redhat/configs/common/generic/CONFIG_USBIP_VHCI_HC_PORTS
rename from redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_HC_PORTS
rename to redhat/configs/common/generic/CONFIG_USBIP_VHCI_HC_PORTS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_HC_PORTS
+++ b/redhat/configs/common/generic/CONFIG_USBIP_VHCI_HC_PORTS
diff --git a/redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_NR_HCS b/redhat/configs/common/generic/CONFIG_USBIP_VHCI_NR_HCS
rename from redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_NR_HCS
rename to redhat/configs/common/generic/CONFIG_USBIP_VHCI_NR_HCS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_USBIP_VHCI_NR_HCS
+++ b/redhat/configs/common/generic/CONFIG_USBIP_VHCI_NR_HCS
diff --git a/redhat/configs/rhel/generic/CONFIG_USBIP_CORE b/redhat/configs/rhel/generic/CONFIG_USBIP_CORE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_USBIP_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_USBIP_CORE is not set
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
@@ -350,7 +350,7 @@ rules:
   - drivers/usb/misc/.*: modules
   - drivers/usb/serial/.*: modules
   - drivers/usb/typec/mux/nb7vpq904m.*: modules
-  - drivers/usb/usbip/.*: modules-extra
+  - drivers/usb/usbip/.*: modules-internal
   - drivers/usb/.*: modules-core

- drivers/vdpa/mlx5/mlx5_vdpa.*: modules

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3458

[Bastien Nocera (via Email Bridge)]

From: Bastien Nocera on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3458#note_2177839...

Please make sure to verify the location of the new modules, but otherwise
LGTM.