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-puppi%2Fpuppet-puppi-updates-for-poky-stx.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-puppi%2Fpuppet-puppi-updates-for-poky-stx.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=571f95bfa5ea5b2d669c6856ae4a227b45f8b99f;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-puppi/puppet-puppi-updates-for-poky-stx.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-puppi/puppet-puppi-updates-for-poky-stx.patch
deleted file mode 100644
index 571f95b..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-puppi/puppet-puppi-updates-for-poky-stx.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/manifests/extras.pp b/manifests/extras.pp
-index 14f88a7..3d20115 100644
---- a/manifests/extras.pp
-+++ b/manifests/extras.pp
-@@ -107,6 +107,7 @@ class puppi::extras {
-   $packages_run = $::operatingsystem ? {
-     /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => [ 'yum repolist' , 'rpm -qa' ] ,
-     /(?i:Debian|Ubuntu|Mint)/                    => [ 'apt-config dump' , 'apt-cache stats' , 'apt-key list' , 'dpkg -l' ],
-+    /(?i:poky-stx)/                              => [ 'rpm -qa' ] ,
-     /(Solaris)/                                  => [ 'pkginfo' ],
-     /(Archlinux)/                                => [ 'pacman -Qet' ],
-     default                                      => [ 'echo' ],
-diff --git a/manifests/params.pp b/manifests/params.pp
-index e236fb4..9fc34a1 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -74,11 +74,13 @@ class puppi::params  {
-   $info_package_query = $::operatingsystem ? {
-     /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -qi',
-     /(?i:Ubuntu|Debian|Mint)/          => 'dpkg -s',
-+    /(?i:poky-stx)/                              => 'rpm -qi' ,
-     default                    => 'echo',
-   }
-   $info_package_list = $::operatingsystem ? {
-     /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -ql',
-     /(?i:Ubuntu|Debian|Mint)/                    => 'dpkg -L',
-+    /(?i:poky-stx)/                              => 'rpm -ql',
-     default                                      => 'echo',
-   }
-   $info_service_check = $::operatingsystem ? {