integ/base/openssh/centos/meta_patches/spec-remove-TC-config-files.patch
Scott Little bab9bb6b69 Internal restructuring of stx-integ
Create new directories:
   ceph
   config
   config-files
   filesystem
   kernel
   kernel/kernel-modules
   ldap
   logging
   strorage-drivers
   tools
   utilities
   virt

Retire directories:
   connectivity
   core
   devtools
   support
   extended

Delete two packages:
   tgt
   irqbalance

Relocated packages:
   base/
      dhcp
      initscripts
      libevent
      lighttpd
      linuxptp
      memcached
      net-snmp
      novnc
      ntp
      openssh
      pam
      procps
      sanlock
      shadow
      sudo
      systemd
      util-linux
      vim
      watchdog

   ceph/
      python-cephclient

   config/
      facter
      puppet-4.8.2
      puppet-modules

   filesystem/
      e2fsprogs
      nfs-utils
      nfscheck

   kernel/
      kernel-std
      kernel-rt

   kernel/kernel-modules/
      mlnx-ofa_kernel

   ldap/
      nss-pam-ldapd
      openldap

   logging/
      syslog-ng
      logrotate

   networking/
      lldpd
      iproute
      mellanox
      python-ryu
      mlx4-config

   python/
      python-2.7.5
      python-django
      python-gunicorn
      python-setuptools
      python-smartpm
      python-voluptuous

   security/
      shim-signed
      shim-unsigned
      tboot

   strorage-drivers/
      python-3parclient
      python-lefthandclient

   virt/
      cloud-init
      libvirt
      libvirt-python
      qemu

   tools/
      storage-topology
      vm-topology

   utilities/
      tis-extensions
      namespace-utils
      nova-utils
      update-motd

Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 10:06:31 -04:00

41 lines
993 B
Diff

From a0a4b7c9e1cdc4d77c2e6aa61d74e3898aca86a5 Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Tue, 20 Mar 2018 10:14:56 -0400
Subject: [PATCH 1/1] CGTS-9265: remove TC specific config files
The hardcoded sshd_config and ssh_config files are replaced by
patches to openssh.
---
SPECS/openssh.spec | 8 --------
1 file changed, 8 deletions(-)
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
index 72ec438..7ee5bd8 100644
--- a/SPECS/openssh.spec
+++ b/SPECS/openssh.spec
@@ -88,10 +88,6 @@ Source11: sshd.service
Source12: sshd-keygen.service
Source13: sshd-keygen
-# WRS
-Source14: sshd_config
-Source15: ssh_config
-
# Internal debug
Patch0: openssh-5.9p1-wIm.patch
@@ -689,10 +685,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
popd
%endif
-# WRS: Overwrite with our config
-install -m 0640 %{SOURCE14} $RPM_BUILD_ROOT/etc/ssh/sshd_config
-install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT/etc/ssh/ssh_config
-
%clean
rm -rf $RPM_BUILD_ROOT
--
1.8.3.1