diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 768f73c9a..c32768fde 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -104,7 +104,6 @@ collector # platform-util platform-util platform-util-noncontroller -platform-util-controller # monitor-tools monitor-tools @@ -278,6 +277,7 @@ tboot # memcached memcached +memcached-custom # kubernetes kubernetes diff --git a/centos_pkg_dirs b/centos_pkg_dirs index c6ba846d7..9fa5e7fbb 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -103,6 +103,7 @@ filesystem/filesystem-scripts utilities/branding config-files/io-scheduler config-files/sudo-config +config-files/memcached-custom tools/collector grub/grubby utilities/platform-util diff --git a/config-files/memcached-custom/centos/build_srpm.data b/config-files/memcached-custom/centos/build_srpm.data new file mode 100644 index 000000000..2c3b2cb8b --- /dev/null +++ b/config-files/memcached-custom/centos/build_srpm.data @@ -0,0 +1,2 @@ +SRC_DIR="files" +TIS_PATCH_VER=1 diff --git a/config-files/memcached-custom/centos/memcached-custom.spec b/config-files/memcached-custom/centos/memcached-custom.spec new file mode 100644 index 000000000..e7ca386fe --- /dev/null +++ b/config-files/memcached-custom/centos/memcached-custom.spec @@ -0,0 +1,31 @@ +Summary: memcached-custom +Name: memcached-custom +Version: 1.0 +Release: %{tis_patch_ver}%{?_tis_dist} +License: Apache-2.0 +Group: base +Packager: StarlingX +URL: unknown +BuildArch: noarch +Source: %name-%version.tar.gz + +Summary: package memcached service files to system folder. + +%description +package memcached service files to system folder. + +%prep +%setup + +%build + +%install +%{__install} -d %{buildroot}%{_sysconfdir}/systemd/system +%{__install} -m 644 -p memcached.service %{buildroot}%{_sysconfdir}/systemd/system/memcached.service + +%post + +%files +%defattr(-,root,root,-) +%{_sysconfdir}/systemd/system/memcached.service + diff --git a/utilities/platform-util/scripts/memcached.service b/config-files/memcached-custom/files/memcached.service similarity index 100% rename from utilities/platform-util/scripts/memcached.service rename to config-files/memcached-custom/files/memcached.service diff --git a/utilities/platform-util/centos/platform-util.spec b/utilities/platform-util/centos/platform-util.spec index 8b04c97c6..69f3e6983 100644 --- a/utilities/platform-util/centos/platform-util.spec +++ b/utilities/platform-util/centos/platform-util.spec @@ -13,6 +13,8 @@ BuildRequires: python-setuptools BuildRequires: python2-pip BuildRequires: python2-wheel +%global _buildsubdir %{_builddir}/%{name}-%{version} + %description Platform utilities @@ -22,12 +24,6 @@ Summary: non controller platform utilities %description -n platform-util-noncontroller Platform utilities that don't get packaged on controller hosts -%package -n platform-util-controller -Summary: controller platform utilities - -%description -n platform-util-controller -Platform utilities that packaged on controllers or one node system - %define local_dir /usr/local %define local_bindir %{local_dir}/bin %define local_sbindir %{local_dir}/sbin @@ -41,15 +37,17 @@ Platform utilities that packaged on controllers or one node system %py2_build_wheel %install + + %{__python} setup.py install --root=$RPM_BUILD_ROOT \ --install-lib=%{pythonroot} \ --prefix=/usr \ --install-data=/usr/share \ --single-version-externally-managed + mkdir -p $RPM_BUILD_ROOT/wheels install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ -%global _buildsubdir %{_builddir}/%{name}-%{version} install -d %{buildroot}%{local_bindir} install %{_buildsubdir}/scripts/cgcs_tc_setup.sh %{buildroot}%{local_bindir} install %{_buildsubdir}/scripts/remotelogging_tc_setup.sh %{buildroot}%{local_bindir} @@ -63,7 +61,6 @@ install -m 700 -p -D %{_buildsubdir}/scripts/patch-restart-haproxy %{buildroot}% install -d %{buildroot}/etc/systemd/system install -m 644 -p -D %{_buildsubdir}/scripts/opt-platform.mount %{buildroot}/etc/systemd/system install -m 644 -p -D %{_buildsubdir}/scripts/opt-platform.service %{buildroot}/etc/systemd/system -install -m 644 -p -D %{_buildsubdir}/scripts/memcached.service %{buildroot}/etc/systemd/system # Mask the systemd ctrl-alt-delete.target, to disable reboot on ctrl-alt-del ln -sf /dev/null %{buildroot}/etc/systemd/system/ctrl-alt-del.target @@ -98,10 +95,6 @@ systemctl enable opt-platform.service /etc/systemd/system/opt-platform.mount /etc/systemd/system/opt-platform.service -%files -n platform-util-controller -%defattr(-,root,root,-) -/etc/systemd/system/memcached.service - %package wheels Summary: %{name} wheels