Merge "Revert "Stardandize makefiles for puppet-modules-wrs""

2019-02-07 14:50:12 +00:00 · 2019-02-07 14:50:12 +00:00 · 0abad126e5
parent 8121910a97 d2c2746004
commit 0abad126e5
27 changed files with 57 additions and 130 deletions
--- a/puppet-modules-wrs/puppet-dcmanager/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-dcmanager/centos/build_srpm.data
@ -1,2 +1,3 @@
 SRC_DIR="src"
+COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
--- a/puppet-modules-wrs/puppet-dcmanager/centos/puppet-dcmanager.spec
+++ b/puppet-modules-wrs/puppet-dcmanager/centos/puppet-dcmanager.spec
@ -10,6 +10,7 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown

 Source0:        %{name}-%{version}.tar.gz
+Source1:        LICENSE

 BuildArch:      noarch

@ -19,15 +20,16 @@ BuildRequires: python2-devel
 A puppet module for dcmanager

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
+
--- a/puppet-modules-wrs/puppet-dcmanager/src/Makefile
+++ b/puppet-modules-wrs/puppet-dcmanager/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/dcmanager
-	cp -R dcmanager/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-dcorch/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-dcorch/centos/build_srpm.data
@ -1,2 +1,3 @@
 SRC_DIR="src"
+COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
--- a/puppet-modules-wrs/puppet-dcorch/centos/puppet-dcorch.spec
+++ b/puppet-modules-wrs/puppet-dcorch/centos/puppet-dcorch.spec
@ -10,6 +10,7 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown

 Source0:        %{name}-%{version}.tar.gz
+Source1:        LICENSE

 BuildArch:      noarch

@ -19,16 +20,16 @@ BuildRequires: python2-devel
 A puppet module for dcorch

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license  LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}

--- a/puppet-modules-wrs/puppet-dcorch/src/Makefile
+++ b/puppet-modules-wrs/puppet-dcorch/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/dcorch
-	cp -R dcorch/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-fm/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-fm/centos/build_srpm.data
@ -1,2 +1,3 @@
 SRC_DIR="src"
+COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
--- a/puppet-modules-wrs/puppet-fm/centos/puppet-fm.spec
+++ b/puppet-modules-wrs/puppet-fm/centos/puppet-fm.spec
@ -10,6 +10,7 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown

 Source0:        %{name}-%{version}.tar.gz
+Source1:        LICENSE

 BuildArch:      noarch

@ -19,15 +20,15 @@ BuildRequires: python2-devel
 A puppet module for Fault Management

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
--- a/puppet-modules-wrs/puppet-fm/src/Makefile
+++ b/puppet-modules-wrs/puppet-fm/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/fm
-	cp -R fm/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
@ -1,2 +1,3 @@
 SRC_DIR="src"
+COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=9
--- a/puppet-modules-wrs/puppet-mtce/centos/puppet-mtce.spec
+++ b/puppet-modules-wrs/puppet-mtce/centos/puppet-mtce.spec
@ -10,6 +10,7 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown

 Source0:        %{name}-%{version}.tar.gz
+Source1:        LICENSE

 BuildArch:      noarch

@ -19,15 +20,16 @@ BuildRequires: python2-devel
 A puppet module for mtce

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
+
--- a/puppet-modules-wrs/puppet-mtce/src/Makefile
+++ b/puppet-modules-wrs/puppet-mtce/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/mtce
-	cp -R mtce/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-nfv/centos/puppet-nfv.spec
+++ b/puppet-modules-wrs/puppet-nfv/centos/puppet-nfv.spec
@ -19,16 +19,16 @@ BuildRequires: python2-devel
 A puppet module for nfv

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}

--- a/puppet-modules-wrs/puppet-nfv/src/Makefile
+++ b/puppet-modules-wrs/puppet-nfv/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/nfv
-	cp -R nfv/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-nova_api_proxy/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-nova_api_proxy/centos/build_srpm.data
@ -1,2 +1,3 @@
 SRC_DIR="src"
+COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=2
--- a/puppet-modules-wrs/puppet-nova_api_proxy/centos/puppet-nova_api_proxy.spec
+++ b/puppet-modules-wrs/puppet-nova_api_proxy/centos/puppet-nova_api_proxy.spec
@ -10,6 +10,7 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown

 Source0:        %{name}-%{version}.tar.gz
+Source1:        LICENSE

 BuildArch:      noarch

@ -19,15 +20,16 @@ BuildRequires: python2-devel
 A puppet module for Nova API Proxy

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to packstack/puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
+
--- a/puppet-modules-wrs/puppet-nova_api_proxy/src/Makefile
+++ b/puppet-modules-wrs/puppet-nova_api_proxy/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/nova_api_proxy
-	cp -R nova_api_proxy/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-patching/centos/puppet-patching.spec
+++ b/puppet-modules-wrs/puppet-patching/centos/puppet-patching.spec
@ -19,15 +19,16 @@ BuildRequires: python2-devel
 A puppet module for patching

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to packstack/puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
+
--- a/puppet-modules-wrs/puppet-patching/src/Makefile
+++ b/puppet-modules-wrs/puppet-patching/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/patching
-	cp -R patching/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-smapi/centos/puppet-smapi.spec
+++ b/puppet-modules-wrs/puppet-smapi/centos/puppet-smapi.spec
@ -19,15 +19,14 @@ BuildRequires: python2-devel
 A puppet module for smapi

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
--- a/puppet-modules-wrs/puppet-smapi/src/Makefile
+++ b/puppet-modules-wrs/puppet-smapi/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/smapi
-	cp -R smapi/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-sshd/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-sshd/centos/build_srpm.data
@ -1,2 +1,3 @@
 SRC_DIR="src"
+COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
--- a/puppet-modules-wrs/puppet-sshd/centos/puppet-sshd.spec
+++ b/puppet-modules-wrs/puppet-sshd/centos/puppet-sshd.spec
@ -10,6 +10,7 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown

 Source0:        %{name}-%{version}.tar.gz
+Source1:        LICENSE

 BuildArch:      noarch

@ -19,15 +20,15 @@ BuildRequires: python2-devel
 A puppet module for sshd

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
--- a/puppet-modules-wrs/puppet-sshd/src/Makefile
+++ b/puppet-modules-wrs/puppet-sshd/src/Makefile
@ -1,9 +0,0 @@
-
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/sshd
-	cp -R sshd/ $(MODULEDIR)/
--- a/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
@ -1,2 +1,3 @@
 SRC_DIR="src"
+COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=4
--- a/puppet-modules-wrs/puppet-sysinv/centos/puppet-sysinv.spec
+++ b/puppet-modules-wrs/puppet-sysinv/centos/puppet-sysinv.spec
@ -10,6 +10,7 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown

 Source0:        %{name}-%{version}.tar.gz
+Source1:        LICENSE

 BuildArch:      noarch

@ -19,16 +20,16 @@ BuildRequires: python2-devel
 A puppet module for sysinv

 %prep
-%setup
+%autosetup -c %{module_dir}

 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-make install \
-     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
+cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules

 %files
-%license LICENSE
+%license  %{name}-%{version}/LICENSE
 %{_datadir}/puppet/modules/%{module_dir}

--- a/puppet-modules-wrs/puppet-sysinv/src/Makefile
+++ b/puppet-modules-wrs/puppet-sysinv/src/Makefile
@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-MODULEDIR ?= /usr/share/puppet/modules
-
-install:
-	install -d -m 0755 $(MODULEDIR)/sysinv
-	cp -R sysinv/ $(MODULEDIR)/