From 0436f37bf05b7d4ab48569ba115901824922ecf1 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 27 Jun 2018 16:46:39 -0400 Subject: [PATCH] Rename mwa-* subdirectories to match the git repo name mwa-delphia -> stx-clients mwa-pitta -> stx-config mwa-cleo -> stx-fault mwa-gplv2 -> stx-gplv2 mwa-gplv3 -> stx-gplv3 mwa-solon -> stx-ha mwa-sparta -> stx-integ mwa-beas -> stx-metal mwa-thales -> stx-nfv mwa-chilon -> stx-update mwa-perian -> stx-upstream Edit build_srpm.data files to remove references to mwa-* directories. Substitute $STX_BASE, $GIT_BASE, $PKG_BASE as required. While editing build_srpm.data, might also move some files on the principle ... $PKG_BASE/files is for distro independednt files $PKG_BASE/centos/files is for CentOS specific files Depends-On: https://review.openstack.org/579954 Depends-On: https://review.openstack.org/579957 Change-Id: I9a5020b9c258a94ee7717a75ac9102cd67a8d2bb Signed-off-by: Scott Little --- integrity/PKG-INFO | 12 ------------ integrity/centos/build_srpm.data | 4 ++-- .../patches/0001-integrity-kcompat-support.patch | 0 .../0002-integrity-expose-module-params.patch | 0 .../0003-integrity-restrict-by-iversion.patch | 0 ...0004-integrity-disable-set-xattr-on-imasig.patch | 0 .../patches/Changes-for-CentOS-7.4-support.patch | 0 .../patches/integrity-kmod.spec.patchlist | 0 intel-e1000e/centos/build_srpm.data | 5 ++--- intel-e1000e/{centos => }/files/GPL-v2.0.txt | 0 intel-i40e/PKG-INFO | 13 ------------- intel-i40e/centos/build_srpm.data | 5 ++--- intel-i40e/{centos => }/files/GPL-v2.0.txt | 0 intel-i40evf/PKG-INFO | 13 ------------- intel-i40evf/centos/build_srpm.data | 5 ++--- intel-i40evf/{centos => }/files/GPL-v2.0.txt | 0 intel-ixgbe/centos/build_srpm.data | 5 ++--- intel-ixgbe/{centos => }/files/GPL-v2.0.txt | 0 intel-ixgbevf/centos/build_srpm.data | 5 ++--- intel-ixgbevf/{centos => }/files/GPL-v2.0.txt | 0 qat17/centos/build_srpm.data | 4 ++-- tpmdd/PKG-INFO | 13 ------------- tpmdd/centos/build_srpm.data | 6 +++--- tpmdd/{centos => }/files/COPYING | 0 tpmdd/{centos => }/files/README | 0 tpmdd/{centos => }/files/modules-load.conf | 0 26 files changed, 17 insertions(+), 73 deletions(-) delete mode 100644 integrity/PKG-INFO rename integrity/{ => centos}/patches/0001-integrity-kcompat-support.patch (100%) rename integrity/{ => centos}/patches/0002-integrity-expose-module-params.patch (100%) rename integrity/{ => centos}/patches/0003-integrity-restrict-by-iversion.patch (100%) rename integrity/{ => centos}/patches/0004-integrity-disable-set-xattr-on-imasig.patch (100%) rename integrity/{ => centos}/patches/Changes-for-CentOS-7.4-support.patch (100%) rename integrity/{ => centos}/patches/integrity-kmod.spec.patchlist (100%) rename intel-e1000e/{centos => }/files/GPL-v2.0.txt (100%) delete mode 100644 intel-i40e/PKG-INFO rename intel-i40e/{centos => }/files/GPL-v2.0.txt (100%) delete mode 100644 intel-i40evf/PKG-INFO rename intel-i40evf/{centos => }/files/GPL-v2.0.txt (100%) rename intel-ixgbe/{centos => }/files/GPL-v2.0.txt (100%) rename intel-ixgbevf/{centos => }/files/GPL-v2.0.txt (100%) delete mode 100644 tpmdd/PKG-INFO rename tpmdd/{centos => }/files/COPYING (100%) rename tpmdd/{centos => }/files/README (100%) rename tpmdd/{centos => }/files/modules-load.conf (100%) diff --git a/integrity/PKG-INFO b/integrity/PKG-INFO deleted file mode 100644 index 751b82a..0000000 --- a/integrity/PKG-INFO +++ /dev/null @@ -1,12 +0,0 @@ -Metadata-Version: 1.1 -Name: integrity-kmod -Version: 4.12 -Summary: Integrity Linux* Kernel Modules -Home-page: http://tpmdd.sourceforge.net/ -Author: -Author-email: -License: GPL -Description: -This package contains the Linux driver and modules for the Integrity subsystem - -Platform: UNKNOWN diff --git a/integrity/centos/build_srpm.data b/integrity/centos/build_srpm.data index 89d451b..16ebb10 100644 --- a/integrity/centos/build_srpm.data +++ b/integrity/centos/build_srpm.data @@ -1,5 +1,5 @@ COPY_LIST=" \ $FILES_BASE/* \ - $CGCS_BASE/mwa-gplv2/integrity/patches/* \ - $CGCS_BASE/downloads/integrity-kmod-668a8270.tar.gz" + $PATCHES_BASE/* \ + $STX_BASE/downloads/integrity-kmod-668a8270.tar.gz" TIS_PATCH_VER=5 diff --git a/integrity/patches/0001-integrity-kcompat-support.patch b/integrity/centos/patches/0001-integrity-kcompat-support.patch similarity index 100% rename from integrity/patches/0001-integrity-kcompat-support.patch rename to integrity/centos/patches/0001-integrity-kcompat-support.patch diff --git a/integrity/patches/0002-integrity-expose-module-params.patch b/integrity/centos/patches/0002-integrity-expose-module-params.patch similarity index 100% rename from integrity/patches/0002-integrity-expose-module-params.patch rename to integrity/centos/patches/0002-integrity-expose-module-params.patch diff --git a/integrity/patches/0003-integrity-restrict-by-iversion.patch b/integrity/centos/patches/0003-integrity-restrict-by-iversion.patch similarity index 100% rename from integrity/patches/0003-integrity-restrict-by-iversion.patch rename to integrity/centos/patches/0003-integrity-restrict-by-iversion.patch diff --git a/integrity/patches/0004-integrity-disable-set-xattr-on-imasig.patch b/integrity/centos/patches/0004-integrity-disable-set-xattr-on-imasig.patch similarity index 100% rename from integrity/patches/0004-integrity-disable-set-xattr-on-imasig.patch rename to integrity/centos/patches/0004-integrity-disable-set-xattr-on-imasig.patch diff --git a/integrity/patches/Changes-for-CentOS-7.4-support.patch b/integrity/centos/patches/Changes-for-CentOS-7.4-support.patch similarity index 100% rename from integrity/patches/Changes-for-CentOS-7.4-support.patch rename to integrity/centos/patches/Changes-for-CentOS-7.4-support.patch diff --git a/integrity/patches/integrity-kmod.spec.patchlist b/integrity/centos/patches/integrity-kmod.spec.patchlist similarity index 100% rename from integrity/patches/integrity-kmod.spec.patchlist rename to integrity/centos/patches/integrity-kmod.spec.patchlist diff --git a/intel-e1000e/centos/build_srpm.data b/intel-e1000e/centos/build_srpm.data index 1c54cf2..23938c6 100644 --- a/intel-e1000e/centos/build_srpm.data +++ b/intel-e1000e/centos/build_srpm.data @@ -1,5 +1,4 @@ COPY_LIST=" \ - $FILES_BASE/* \ - $CGCS_BASE/mwa-gplv2/intel-e1000e/files/* \ - $CGCS_BASE/downloads/e1000e-3.3.6.tar.gz" + $PKG_BASE/files/* \ + $STX_BASE/downloads/e1000e-3.3.6.tar.gz" TIS_PATCH_VER=1 diff --git a/intel-e1000e/centos/files/GPL-v2.0.txt b/intel-e1000e/files/GPL-v2.0.txt similarity index 100% rename from intel-e1000e/centos/files/GPL-v2.0.txt rename to intel-e1000e/files/GPL-v2.0.txt diff --git a/intel-i40e/PKG-INFO b/intel-i40e/PKG-INFO deleted file mode 100644 index 7d67ac1..0000000 --- a/intel-i40e/PKG-INFO +++ /dev/null @@ -1,13 +0,0 @@ -Metadata-Version: 1.1 -Name: i40e-kmod -Version: 1.4.25 -Summary: i40e Linux* Base Driver for the Intel(R) XL710 Ethernet Controller Family -Home-page: http://www.intel.com/network/connectivity/products/server_adapters.htm -Author: -Author-email: -License: GPL -Description: -This package contains the Linux driver for the Intel(R) Ethernet Connection -XL710 Family of devices. - -Platform: UNKNOWN diff --git a/intel-i40e/centos/build_srpm.data b/intel-i40e/centos/build_srpm.data index 73df0e4..cea18e3 100644 --- a/intel-i40e/centos/build_srpm.data +++ b/intel-i40e/centos/build_srpm.data @@ -1,5 +1,4 @@ COPY_LIST=" \ - $FILES_BASE/* \ - $CGCS_BASE/mwa-gplv2/intel-i40e/files/* \ - $CGCS_BASE/downloads/i40e-2.4.3.tar.gz" + $PKG_BASE/files/* \ + $STX_BASE/downloads/i40e-2.4.3.tar.gz" TIS_PATCH_VER=6 diff --git a/intel-i40e/centos/files/GPL-v2.0.txt b/intel-i40e/files/GPL-v2.0.txt similarity index 100% rename from intel-i40e/centos/files/GPL-v2.0.txt rename to intel-i40e/files/GPL-v2.0.txt diff --git a/intel-i40evf/PKG-INFO b/intel-i40evf/PKG-INFO deleted file mode 100644 index d35d936..0000000 --- a/intel-i40evf/PKG-INFO +++ /dev/null @@ -1,13 +0,0 @@ -Metadata-Version: 1.1 -Name: i40evf-kmod -Version: 1.4.15 -Summary: Linux* Driver for Intel(R) XL710/X710 Virtual Function -Home-page: http://www.intel.com/network/connectivity/products/server_adapters.htm -Author: -Author-email: -License: GPL -Description: -This package contains the Linux driver for the Virtual Functions of Intel(R) -Ethernet Connection XL710 Family of devices. - -Platform: UNKNOWN diff --git a/intel-i40evf/centos/build_srpm.data b/intel-i40evf/centos/build_srpm.data index f05768c..1547596 100644 --- a/intel-i40evf/centos/build_srpm.data +++ b/intel-i40evf/centos/build_srpm.data @@ -1,5 +1,4 @@ COPY_LIST=" \ - $FILES_BASE/* \ - $CGCS_BASE/mwa-gplv2/intel-i40evf/files/* \ - $CGCS_BASE/downloads/i40evf-3.4.2.tar.gz" + $PKG_BASE/files/* \ + $STX_BASE/downloads/i40evf-3.4.2.tar.gz" TIS_PATCH_VER=4 diff --git a/intel-i40evf/centos/files/GPL-v2.0.txt b/intel-i40evf/files/GPL-v2.0.txt similarity index 100% rename from intel-i40evf/centos/files/GPL-v2.0.txt rename to intel-i40evf/files/GPL-v2.0.txt diff --git a/intel-ixgbe/centos/build_srpm.data b/intel-ixgbe/centos/build_srpm.data index ce5c045..ddade5e 100644 --- a/intel-ixgbe/centos/build_srpm.data +++ b/intel-ixgbe/centos/build_srpm.data @@ -1,5 +1,4 @@ COPY_LIST=" \ - $FILES_BASE/* \ - $CGCS_BASE/mwa-gplv2/intel-ixgbe/files/* \ - $CGCS_BASE/downloads/ixgbe-5.2.3.tar.gz" + $PKG_BASE/files/* \ + $STX_BASE/downloads/ixgbe-5.2.3.tar.gz" TIS_PATCH_VER=2 diff --git a/intel-ixgbe/centos/files/GPL-v2.0.txt b/intel-ixgbe/files/GPL-v2.0.txt similarity index 100% rename from intel-ixgbe/centos/files/GPL-v2.0.txt rename to intel-ixgbe/files/GPL-v2.0.txt diff --git a/intel-ixgbevf/centos/build_srpm.data b/intel-ixgbevf/centos/build_srpm.data index 3fc72c9..893af6d 100644 --- a/intel-ixgbevf/centos/build_srpm.data +++ b/intel-ixgbevf/centos/build_srpm.data @@ -1,5 +1,4 @@ COPY_LIST=" \ - $FILES_BASE/* \ - $CGCS_BASE/mwa-gplv2/intel-ixgbevf/files/* \ - $CGCS_BASE/downloads/ixgbevf-4.2.1.tar.gz" + $PKG_BASE/files/* \ + $STX_BASE/downloads/ixgbevf-4.2.1.tar.gz" TIS_PATCH_VER=2 diff --git a/intel-ixgbevf/centos/files/GPL-v2.0.txt b/intel-ixgbevf/files/GPL-v2.0.txt similarity index 100% rename from intel-ixgbevf/centos/files/GPL-v2.0.txt rename to intel-ixgbevf/files/GPL-v2.0.txt diff --git a/qat17/centos/build_srpm.data b/qat17/centos/build_srpm.data index fae30f9..33c3c5a 100644 --- a/qat17/centos/build_srpm.data +++ b/qat17/centos/build_srpm.data @@ -1,6 +1,6 @@ COPY_LIST=" \ - $CGCS_BASE/mwa-gplv2/qat17/files/* \ - $CGCS_BASE/downloads/qat1.7.upstream.l.1.0.3-42.tar.gz \ + $PKG_BASE/files/* \ + $STX_BASE/downloads/qat1.7.upstream.l.1.0.3-42.tar.gz \ " TIS_PATCH_VER=4 BUILD_IS_SLOW=3 diff --git a/tpmdd/PKG-INFO b/tpmdd/PKG-INFO deleted file mode 100644 index f439004..0000000 --- a/tpmdd/PKG-INFO +++ /dev/null @@ -1,13 +0,0 @@ -Metadata-Version: 1.1 -Name: tpm-kmod -Version: 4.12 -Summary: TPM Linux* Base Driver and Kernel Module -Home-page: http://tpmdd.sourceforge.net/ -Author: -Author-email: -License: GPL -Description: -This package contains the Linux driver and modules for the TPM 1.2 and 2.0 -Family of devices. - -Platform: UNKNOWN diff --git a/tpmdd/centos/build_srpm.data b/tpmdd/centos/build_srpm.data index cb44fe8..128c19a 100644 --- a/tpmdd/centos/build_srpm.data +++ b/tpmdd/centos/build_srpm.data @@ -1,5 +1,5 @@ COPY_LIST=" \ - $FILES_BASE/* \ - $CGCS_BASE/mwa-gplv2/tpmdd/patches/* \ - $CGCS_BASE/downloads/tpm-kmod-668a8270.tar.gz" + $PKG_BASE/files/* \ + $PKG_BASE/patches/* \ + $STX_BASE/downloads/tpm-kmod-668a8270.tar.gz" TIS_PATCH_VER=5 diff --git a/tpmdd/centos/files/COPYING b/tpmdd/files/COPYING similarity index 100% rename from tpmdd/centos/files/COPYING rename to tpmdd/files/COPYING diff --git a/tpmdd/centos/files/README b/tpmdd/files/README similarity index 100% rename from tpmdd/centos/files/README rename to tpmdd/files/README diff --git a/tpmdd/centos/files/modules-load.conf b/tpmdd/files/modules-load.conf similarity index 100% rename from tpmdd/centos/files/modules-load.conf rename to tpmdd/files/modules-load.conf