mirror of
https://github.com/xcat2/confluent.git
synced 2024-11-29 04:50:21 +00:00
Removing the confluent_xcat subdirectory
After some discussion with the team, let's keep the xcat related "glue" out of the confluent project, for now. This will give me more time to figure out how things will come together and integrate for xCAT3. For xCAT2, a xCAT-confluent RPM is added to xcat-core project to be consistent with how xCAT2 is packaged today.
This commit is contained in:
parent
d06f5cc966
commit
2f65612b71
@ -1 +0,0 @@
|
||||
include confluent/plugins/console/*
|
@ -1,32 +0,0 @@
|
||||
|
||||
PKGNAME=confluent_xcat
|
||||
VERNUM=`cat VERSION`
|
||||
|
||||
all: clean prepare confluent_xcat
|
||||
|
||||
prepare:
|
||||
@echo [${PKGNAME}] preparing...
|
||||
mkdir -p rpmbuild/BUILD
|
||||
mkdir -p rpmbuild/BUILDROOT
|
||||
mkdir -p rpmbuild/RPMS
|
||||
mkdir -p rpmbuild/SOURCES
|
||||
mkdir -p rpmbuild/SPECS
|
||||
mkdir -p rpmbuild/SRPMS
|
||||
|
||||
|
||||
confluent_xcat:
|
||||
@echo [${PKGNAME}] building...
|
||||
sed -e "s/#VERSION#/${VERNUM}/" setup.py.tmpl > setup.py
|
||||
python setup.py sdist > /dev/null 2>&1
|
||||
cp dist/*.tar.gz rpmbuild/SOURCES
|
||||
sed -e "s/#VERSION#/${VERNUM}/" ${PKGNAME}.spec.tmpl > rpmbuild/SPECS/${PKGNAME}.spec
|
||||
rpmbuild -ba rpmbuild/SPECS/${PKGNAME}.spec
|
||||
|
||||
clean:
|
||||
@echo [${PKGNAME}] cleaning...
|
||||
rm -rf rpmbuild
|
||||
rm -f setup.py
|
||||
rm -rf ${PKGNAME}.egg-info
|
||||
rm -rf dist
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
xCAT integration with confluent systems management server
|
@ -1 +0,0 @@
|
||||
1.0
|
@ -1 +0,0 @@
|
||||
../confluent_server/buildrpm
|
@ -1,2 +0,0 @@
|
||||
#!/bin/bash
|
||||
exec /opt/xcat/share/xcat/cons/hmc $CONFLUENT_NODE
|
@ -1,41 +0,0 @@
|
||||
%define name confluent_xcat
|
||||
%define version #VERSION#
|
||||
%define release 1
|
||||
|
||||
Summary: xCAT integration with confluent systems management server
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
License: Apache2
|
||||
Group: Development/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
Prefix: %{_prefix}
|
||||
BuildArch: noarch
|
||||
Requires: confluent_server
|
||||
Vendor: Victor Hu <vhu@us.ibm.com>
|
||||
Url: http://xcat.sf.net/
|
||||
|
||||
%description
|
||||
xCAT integration with confluent system management server
|
||||
|
||||
%prep
|
||||
%setup -n %{name}-%{version} -n %{name}-%{version}
|
||||
|
||||
%build
|
||||
python setup.py build
|
||||
|
||||
%install
|
||||
python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES.bare --install-purelib=/opt/xcat/lib/python --install-scripts=/opt/xcat/bin
|
||||
for file in $(grep xcat/__init__.py INSTALLED_FILES.bare); do
|
||||
rm $RPM_BUILD_ROOT/$file
|
||||
done
|
||||
grep -v xcat/__init__.py INSTALLED_FILES.bare > INSTALLED_FILES
|
||||
cat INSTALLED_FILES
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f INSTALLED_FILES
|
||||
%defattr(-,root,root)
|
@ -1 +0,0 @@
|
||||
../confluent_server/makesetup
|
@ -1 +0,0 @@
|
||||
confluent_server>=0.1
|
@ -1,18 +0,0 @@
|
||||
[metadata]
|
||||
name = confluent_xcat
|
||||
summary = xCAT integration with confluent systems management server
|
||||
description-file =
|
||||
README.txt
|
||||
author = Victor Hu
|
||||
author-email = vhu@us.ibm.com
|
||||
home-page = http://xcat.sf.net/
|
||||
classifier =
|
||||
Intended Audience :: Information Technology
|
||||
Intended Audience :: System Administrators
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
Programming Language :: Python :: 2.6
|
||||
Programming Language :: Python :: 2.7
|
||||
|
||||
[files]
|
||||
packages =
|
@ -1,14 +0,0 @@
|
||||
from setuptools import setup
|
||||
import os
|
||||
|
||||
setup(
|
||||
name='confluent_xcat',
|
||||
version='#VERSION#',
|
||||
author='Victor Hu',
|
||||
author_email='vhu@us.ibm.com',
|
||||
url='http://xcat.sf.net/',
|
||||
description='xCAT integration with confluent systems management server',
|
||||
#packages=['xcat'],
|
||||
install_requires=['confluent_server > 1.0.0'],
|
||||
data_files=[('/opt/confluent/lib/python/confluent/plugins/console/', ['confluent/plugins/console/xcathmc.sh'])],
|
||||
)
|
Loading…
Reference in New Issue
Block a user