X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-kmod%2Fpersistent-module-load-poky.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-kmod%2Fpersistent-module-load-poky.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=8ce779c56449aefd3c5d01c03b44c7c783f8f3df;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-kmod/persistent-module-load-poky.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-kmod/persistent-module-load-poky.patch
deleted file mode 100644
index 8ce779c..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-kmod/persistent-module-load-poky.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ruN a/manifests/load.pp b/manifests/load.pp
---- a/manifests/load.pp	2020-05-13 10:13:02.620078850 +0000
-+++ b/manifests/load.pp	2020-05-13 10:16:12.488077982 +0000
-@@ -56,10 +56,18 @@
- 
-   case $::osfamily {
-     'Debian': {
--      augeas {"Manage ${name} in ${file}":
--        incl    => $file,
--        lens    => 'Modules.lns',
--        changes => $changes,
-+      if $::operatingsystem == 'poky-stx' {
-+        file { "/etc/modules-load.d/${name}.conf":
-+          ensure  => $ensure,
-+          mode    => '0644',
-+          content => template('kmod/poky.modprobe.erb'),
-+        }
-+      } else {
-+        augeas {"Manage ${name} in ${file}":
-+          incl    => $file,
-+          lens    => 'Modules.lns',
-+          changes => $changes,
-+        }
-       }
-     }
-     'RedHat': {
-diff -ruN a/templates/poky.modprobe.erb b/templates/poky.modprobe.erb
---- a/templates/poky.modprobe.erb	1970-01-01 00:00:00.000000000 +0000
-+++ b/templates/poky.modprobe.erb	2020-05-13 10:14:46.612078375 +0000
-@@ -0,0 +1 @@
-+vfio_pci