[PATCH 0/2 v2] Fix Issues #743 and #744
From: chandrureddy <chandra@linux.vnet.ibm.com> Fix Issue #744 - gingerbase: objectstore issues plug in path for gingerbase been changed to /var/lib/gingerbase Fix issue 'unable to open database file' and gingerbase.py Fix Issue #743 - gingerbase: fail to create RPM. In files gingerbase.spec.fedora.in and gignerbase.spec.suse.in and make-deb.sh.in add setup instruction correct the file section day correction Name changed from gingerbase to ginger-base Added files ChangeLog and CONTRIBUTE.md VERSION changed to 2.0.0 Review Comments taken care. chandrureddy (2): Plug in path for gingerbase been changed to /var/lib/gingerbase Fix issue 'unable to open database file' in gingerbase.py In files gingerbase.spec.fedora.in and gignerbase.spec.suse.in and make-deb.sh.in add setup instruction correct the file section day correction Name changed from gingerbase to ginger-base src/wok/plugins/gingerbase/CONTRIBUTE.md | 19 +++++++++++++ src/wok/plugins/gingerbase/ChangeLog | 31 ++++++++++++++++++++++ src/wok/plugins/gingerbase/Makefile.am | 18 +++++++------ src/wok/plugins/gingerbase/VERSION | 2 +- src/wok/plugins/gingerbase/config.py.in | 6 ++--- .../gingerbase/contrib/gingerbase.spec.fedora.in | 26 +++++++----------- .../gingerbase/contrib/gingerbase.spec.suse.in | 30 ++++++++++----------- src/wok/plugins/gingerbase/contrib/make-deb.sh.in | 2 +- src/wok/plugins/gingerbase/gingerbase.conf | 2 +- src/wok/plugins/gingerbase/gingerbase.py | 16 +++++------ 10 files changed, 98 insertions(+), 54 deletions(-) create mode 100644 src/wok/plugins/gingerbase/CONTRIBUTE.md create mode 100644 src/wok/plugins/gingerbase/ChangeLog -- 2.1.0
From: chandrureddy <chandra@linux.vnet.ibm.com> --- src/wok/plugins/gingerbase/Makefile.am | 15 +++++++-------- src/wok/plugins/gingerbase/config.py.in | 6 +++--- src/wok/plugins/gingerbase/gingerbase.conf | 2 +- src/wok/plugins/gingerbase/gingerbase.py | 16 ++++++++-------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/wok/plugins/gingerbase/Makefile.am b/src/wok/plugins/gingerbase/Makefile.am index 99a69df..e7a89f6 100644 --- a/src/wok/plugins/gingerbase/Makefile.am +++ b/src/wok/plugins/gingerbase/Makefile.am @@ -80,8 +80,8 @@ do_substitution = \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]wokdir[@],$(wokdir),g' \ -e 's,[@]gingerbasedir[@],$(gingerbasedir),g' \ - -e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \ - -e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \ + -e 's,[@]gingerbaseversion[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]gingerbaserelease[@],$(PACKAGE_RELEASE),g' \ -e 's,[@]withspice[@],$(WITH_SPICE),g' config.py: config.py.in Makefile @@ -94,8 +94,8 @@ config.py: config.py.in Makefile install-deb: install cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/ - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports deb: contrib/make-deb.sh @@ -131,18 +131,17 @@ ChangeLog: fi install-data-local: - $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/kimchi/ + $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/gingerbase/ $(MKDIR_P) $(DESTDIR)$(gingerbasedir) $(INSTALL_DATA) API.json $(DESTDIR)$(gingerbasedir)/API.json - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports uninstall-local: @if test -f $(DESTDIR)/etc/systemd/system/wokd.service.d/gingerbase.conf; then \ $(RM) $(DESTDIR)/etc/systemd/system/wokd.service.d/gingerbase.conf; \ fi; \ $(RM) $(DESTDIR)$(gingerbasedir)/API.json - $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports - $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/kimchi/objectstore_gingerbase + $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports VERSION: @if test -d .git; then \ diff --git a/src/wok/plugins/gingerbase/config.py.in b/src/wok/plugins/gingerbase/config.py.in index 922c914..9d911da 100644 --- a/src/wok/plugins/gingerbase/config.py.in +++ b/src/wok/plugins/gingerbase/config.py.in @@ -27,12 +27,12 @@ gingerBaseLock = threading.Lock() def get_debugreports_path(): - return os.path.join('/var/lib/kimchi', 'debugreports') + return os.path.join(PluginPaths('gingerbase').conf_dir, 'debugreports') def get_object_store(): - return os.path.join('/var/lib/kimchi', - 'objectstore' + '_gingerbase') + return os.path.join(PluginPaths('gingerbase').state_dir, + 'objectstore_gingerbase') class GingerBasePaths(PluginPaths): diff --git a/src/wok/plugins/gingerbase/gingerbase.conf b/src/wok/plugins/gingerbase/gingerbase.conf index cbe3358..560e38b 100644 --- a/src/wok/plugins/gingerbase/gingerbase.conf +++ b/src/wok/plugins/gingerbase/gingerbase.conf @@ -20,7 +20,7 @@ tools.wokauth.on = True [/data/debugreports] tools.staticdir.on = True -tools.staticdir.dir = '/var/lib/kimchi/debugreports' +tools.staticdir.dir = wok.config.PluginPaths('gingerbase').state_dir + '/debugreports' tools.nocache.on = False tools.wokauth.on = True tools.staticdir.content_types = {'xz': 'application/x-xz'} diff --git a/src/wok/plugins/gingerbase/gingerbase.py b/src/wok/plugins/gingerbase/gingerbase.py index 0d3709e..bca1503 100644 --- a/src/wok/plugins/gingerbase/gingerbase.py +++ b/src/wok/plugins/gingerbase/gingerbase.py @@ -29,6 +29,14 @@ from wok.root import WokRoot class GingerBase(WokRoot): def __init__(self, wok_options): + make_dirs = [ + os.path.dirname(os.path.abspath(config.get_object_store())), + os.path.abspath(config.get_debugreports_path()) + ] + for directory in make_dirs: + if not os.path.isdir(directory): + os.makedirs(directory) + if hasattr(wok_options, "model"): self.model = wok_options.model elif wok_options.test: @@ -48,13 +56,5 @@ class GingerBase(WokRoot): self.domain = 'gingerbase' self.messages = messages - make_dirs = [ - os.path.dirname(os.path.abspath(config.get_object_store())), - os.path.abspath(config.get_debugreports_path()) - ] - for directory in make_dirs: - if not os.path.isdir(directory): - os.makedirs(directory) - def get_custom_conf(self): return config.GingerBaseConfig() -- 2.1.0
On 30/10/2015 12:16, chandra@linux.vnet.ibm.com wrote:
From: chandrureddy <chandra@linux.vnet.ibm.com>
--- src/wok/plugins/gingerbase/Makefile.am | 15 +++++++-------- src/wok/plugins/gingerbase/config.py.in | 6 +++--- src/wok/plugins/gingerbase/gingerbase.conf | 2 +- src/wok/plugins/gingerbase/gingerbase.py | 16 ++++++++-------- 4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/wok/plugins/gingerbase/Makefile.am b/src/wok/plugins/gingerbase/Makefile.am index 99a69df..e7a89f6 100644 --- a/src/wok/plugins/gingerbase/Makefile.am +++ b/src/wok/plugins/gingerbase/Makefile.am @@ -80,8 +80,8 @@ do_substitution = \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]wokdir[@],$(wokdir),g' \ -e 's,[@]gingerbasedir[@],$(gingerbasedir),g' \ - -e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \ - -e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \ + -e 's,[@]gingerbaseversion[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]gingerbaserelease[@],$(PACKAGE_RELEASE),g' \ -e 's,[@]withspice[@],$(WITH_SPICE),g'
config.py: config.py.in Makefile @@ -94,8 +94,8 @@ config.py: config.py.in Makefile
install-deb: install cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/ - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports
deb: contrib/make-deb.sh @@ -131,18 +131,17 @@ ChangeLog: fi
install-data-local: - $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/kimchi/ + $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/gingerbase/ $(MKDIR_P) $(DESTDIR)$(gingerbasedir) $(INSTALL_DATA) API.json $(DESTDIR)$(gingerbasedir)/API.json - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports
uninstall-local: @if test -f $(DESTDIR)/etc/systemd/system/wokd.service.d/gingerbase.conf; then \ $(RM) $(DESTDIR)/etc/systemd/system/wokd.service.d/gingerbase.conf; \ fi; \ $(RM) $(DESTDIR)$(gingerbasedir)/API.json - $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports - $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/kimchi/objectstore_gingerbase + $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports
VERSION: @if test -d .git; then \ diff --git a/src/wok/plugins/gingerbase/config.py.in b/src/wok/plugins/gingerbase/config.py.in index 922c914..9d911da 100644 --- a/src/wok/plugins/gingerbase/config.py.in +++ b/src/wok/plugins/gingerbase/config.py.in @@ -27,12 +27,12 @@ gingerBaseLock = threading.Lock()
def get_debugreports_path(): - return os.path.join('/var/lib/kimchi', 'debugreports') + return os.path.join(PluginPaths('gingerbase').conf_dir, 'debugreports')
def get_object_store(): - return os.path.join('/var/lib/kimchi', - 'objectstore' + '_gingerbase') + return os.path.join(PluginPaths('gingerbase').state_dir, + 'objectstore_gingerbase')
As the directory is exclusive for gingerbase matters, we can name the file only as 'objectstore'
class GingerBasePaths(PluginPaths): diff --git a/src/wok/plugins/gingerbase/gingerbase.conf b/src/wok/plugins/gingerbase/gingerbase.conf index cbe3358..560e38b 100644 --- a/src/wok/plugins/gingerbase/gingerbase.conf +++ b/src/wok/plugins/gingerbase/gingerbase.conf @@ -20,7 +20,7 @@ tools.wokauth.on = True
[/data/debugreports] tools.staticdir.on = True -tools.staticdir.dir = '/var/lib/kimchi/debugreports' +tools.staticdir.dir = wok.config.PluginPaths('gingerbase').state_dir + '/debugreports' tools.nocache.on = False tools.wokauth.on = True tools.staticdir.content_types = {'xz': 'application/x-xz'} diff --git a/src/wok/plugins/gingerbase/gingerbase.py b/src/wok/plugins/gingerbase/gingerbase.py index 0d3709e..bca1503 100644 --- a/src/wok/plugins/gingerbase/gingerbase.py +++ b/src/wok/plugins/gingerbase/gingerbase.py @@ -29,6 +29,14 @@ from wok.root import WokRoot
class GingerBase(WokRoot): def __init__(self, wok_options): + make_dirs = [ + os.path.dirname(os.path.abspath(config.get_object_store())), + os.path.abspath(config.get_debugreports_path()) + ] + for directory in make_dirs: + if not os.path.isdir(directory): + os.makedirs(directory) + if hasattr(wok_options, "model"): self.model = wok_options.model elif wok_options.test: @@ -48,13 +56,5 @@ class GingerBase(WokRoot): self.domain = 'gingerbase' self.messages = messages
- make_dirs = [ - os.path.dirname(os.path.abspath(config.get_object_store())), - os.path.abspath(config.get_debugreports_path()) - ] - for directory in make_dirs: - if not os.path.isdir(directory): - os.makedirs(directory) - def get_custom_conf(self): return config.GingerBaseConfig()
On 10/30/2015 10:52 PM, Aline Manera wrote:
On 30/10/2015 12:16, chandra@linux.vnet.ibm.com wrote:
From: chandrureddy <chandra@linux.vnet.ibm.com>
--- src/wok/plugins/gingerbase/Makefile.am | 15 +++++++-------- src/wok/plugins/gingerbase/config.py.in | 6 +++--- src/wok/plugins/gingerbase/gingerbase.conf | 2 +- src/wok/plugins/gingerbase/gingerbase.py | 16 ++++++++-------- 4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/wok/plugins/gingerbase/Makefile.am b/src/wok/plugins/gingerbase/Makefile.am index 99a69df..e7a89f6 100644 --- a/src/wok/plugins/gingerbase/Makefile.am +++ b/src/wok/plugins/gingerbase/Makefile.am @@ -80,8 +80,8 @@ do_substitution = \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]wokdir[@],$(wokdir),g' \ -e 's,[@]gingerbasedir[@],$(gingerbasedir),g' \ - -e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \ - -e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \ + -e 's,[@]gingerbaseversion[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]gingerbaserelease[@],$(PACKAGE_RELEASE),g' \ -e 's,[@]withspice[@],$(WITH_SPICE),g'
config.py: config.py.in Makefile @@ -94,8 +94,8 @@ config.py: config.py.in Makefile
install-deb: install cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/ - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports
deb: contrib/make-deb.sh @@ -131,18 +131,17 @@ ChangeLog: fi
install-data-local: - $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/kimchi/ + $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/gingerbase/ $(MKDIR_P) $(DESTDIR)$(gingerbasedir) $(INSTALL_DATA) API.json $(DESTDIR)$(gingerbasedir)/API.json - mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports + mkdir -p $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports
uninstall-local: @if test -f $(DESTDIR)/etc/systemd/system/wokd.service.d/gingerbase.conf; then \ $(RM) $(DESTDIR)/etc/systemd/system/wokd.service.d/gingerbase.conf; \ fi; \ $(RM) $(DESTDIR)$(gingerbasedir)/API.json - $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/kimchi/debugreports - $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/kimchi/objectstore_gingerbase + $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/gingerbase/debugreports
VERSION: @if test -d .git; then \ diff --git a/src/wok/plugins/gingerbase/config.py.in b/src/wok/plugins/gingerbase/config.py.in index 922c914..9d911da 100644 --- a/src/wok/plugins/gingerbase/config.py.in +++ b/src/wok/plugins/gingerbase/config.py.in @@ -27,12 +27,12 @@ gingerBaseLock = threading.Lock()
def get_debugreports_path(): - return os.path.join('/var/lib/kimchi', 'debugreports') + return os.path.join(PluginPaths('gingerbase').conf_dir, 'debugreports')
def get_object_store(): - return os.path.join('/var/lib/kimchi', - 'objectstore' + '_gingerbase') + return os.path.join(PluginPaths('gingerbase').state_dir, + 'objectstore_gingerbase')
As the directory is exclusive for gingerbase matters, we can name the file only as 'objectstore'
Done.
class GingerBasePaths(PluginPaths): diff --git a/src/wok/plugins/gingerbase/gingerbase.conf b/src/wok/plugins/gingerbase/gingerbase.conf index cbe3358..560e38b 100644 --- a/src/wok/plugins/gingerbase/gingerbase.conf +++ b/src/wok/plugins/gingerbase/gingerbase.conf @@ -20,7 +20,7 @@ tools.wokauth.on = True
[/data/debugreports] tools.staticdir.on = True -tools.staticdir.dir = '/var/lib/kimchi/debugreports' +tools.staticdir.dir = wok.config.PluginPaths('gingerbase').state_dir + '/debugreports' tools.nocache.on = False tools.wokauth.on = True tools.staticdir.content_types = {'xz': 'application/x-xz'} diff --git a/src/wok/plugins/gingerbase/gingerbase.py b/src/wok/plugins/gingerbase/gingerbase.py index 0d3709e..bca1503 100644 --- a/src/wok/plugins/gingerbase/gingerbase.py +++ b/src/wok/plugins/gingerbase/gingerbase.py @@ -29,6 +29,14 @@ from wok.root import WokRoot
class GingerBase(WokRoot): def __init__(self, wok_options): + make_dirs = [ + os.path.dirname(os.path.abspath(config.get_object_store())), + os.path.abspath(config.get_debugreports_path()) + ] + for directory in make_dirs: + if not os.path.isdir(directory): + os.makedirs(directory) + if hasattr(wok_options, "model"): self.model = wok_options.model elif wok_options.test: @@ -48,13 +56,5 @@ class GingerBase(WokRoot): self.domain = 'gingerbase' self.messages = messages
- make_dirs = [ - os.path.dirname(os.path.abspath(config.get_object_store())), - os.path.abspath(config.get_debugreports_path()) - ] - for directory in make_dirs: - if not os.path.isdir(directory): - os.makedirs(directory) - def get_custom_conf(self): return config.GingerBaseConfig()
From: chandrureddy <chandra@linux.vnet.ibm.com> Added files ChangeLog and CONTRIBUTE.md VERSION changed to 2.0.0 --- src/wok/plugins/gingerbase/CONTRIBUTE.md | 19 +++++++++++++ src/wok/plugins/gingerbase/ChangeLog | 31 ++++++++++++++++++++++ src/wok/plugins/gingerbase/Makefile.am | 3 +++ src/wok/plugins/gingerbase/VERSION | 2 +- .../gingerbase/contrib/gingerbase.spec.fedora.in | 26 +++++++----------- .../gingerbase/contrib/gingerbase.spec.suse.in | 30 ++++++++++----------- src/wok/plugins/gingerbase/contrib/make-deb.sh.in | 2 +- 7 files changed, 79 insertions(+), 34 deletions(-) create mode 100644 src/wok/plugins/gingerbase/CONTRIBUTE.md create mode 100644 src/wok/plugins/gingerbase/ChangeLog diff --git a/src/wok/plugins/gingerbase/CONTRIBUTE.md b/src/wok/plugins/gingerbase/CONTRIBUTE.md new file mode 100644 index 0000000..03b4e79 --- /dev/null +++ b/src/wok/plugins/gingerbase/CONTRIBUTE.md @@ -0,0 +1,19 @@ +How to Contribute +================= + +All development discussion happens on the mailing list. All development is done +using the `git` SCM. Patches should be sent using the `git send-email` command +to the ginger-dev-list@googlegroups.com mailing list. + +Please go through below wiki page which describe on how to contribute to the community. +[How to Contribute](https://github.com/kimchi-project/ginger/wiki/How-to-Contribute) + +Good examples of how to send patches are included in +[QEMU SubmitAPatch](http://wiki.qemu.org/Contribute/SubmitAPatch) and +[Linux SubmittingPatches](https://www.kernel.org/doc/Documentation/SubmittingPatches). + +All documentation and READMEs are written using +[Markdown](http://daringfireball.net/projects/markdown/). + +For a patch to be committed, it must receive at least one "Reviewed-by" on the +mailing list. diff --git a/src/wok/plugins/gingerbase/ChangeLog b/src/wok/plugins/gingerbase/ChangeLog new file mode 100644 index 0000000..70c2235 --- /dev/null +++ b/src/wok/plugins/gingerbase/ChangeLog @@ -0,0 +1,31 @@ +CHANGELOG +========= + +#### [Current] #### + * [94ce07b] Fix make check-local for Kimchi (Aline Manera) + * [794ed7c] Add .gitignore file to gingerbase directory (Aline Manera) + * [1f1679f] Add src/wok/plugins directory to the Wok PEP8 backlist (Aline Manera) + * [94a71b1] Remove Host Resource from Kimchi (Aline Manera) + * [89c9058] Keep /host/partitions on Kimchi (Aline Manera) + * [3c8c947] Move host authorization tests from Kimchi to Ginger Base (Aline Manera) + * [d165ab5] Remove repositories tests from Kimchi (Aline Manera) + * [cc7d7a3] Fix Ginger Base tests (Aline Manera) + * [9e62598] Get the right internal URI to Ginger Base plugin (Aline Manera) + * [d6ee86b] Fix PYTHONPATH to run tests for Ginger Base (Aline Manera) + * [379ccff] V7 Ginger Base : base plugin po files (chandrureddy) + * [cd4c415] V7 Ginger Base : base plugin ui make, images and config (chandrureddy) + * [2256442] V7 Ginger Base : base plugin ui/css files (chandrureddy) + * [c12612f] V7 Ginger Base : base plugin ui/js files (chandrureddy) + * [89fc8af] V7 Ginger Base : base plugin ui/pages files (chandrureddy) + * [074670a] V7 Ginger Base : base plugin ui/pages/help files (chandrureddy) + * [83bb860] V7 Ginger Base : base plugin tests files (chandrureddy) + * [3b10bb7] V7 Ginger Base : base plugin model files (chandrureddy) + * [3cc1ae1] V7 Ginger Base : control files (chandrureddy) + * [c37bfb7] V7 Ginger Base : base plugin m4 files (chandrureddy) + * [8e8adcc] V7 Ginger Base : base plugin build-aix and contrib (chandrureddy) + * [ca7d757] V7 Ginger Base : base plugin docs files (chandrureddy) + * [a9add5c] V7 Add License files to ginger base (chandrureddy) + * [5456005] V7 Ginger Base : base folder files part 3 (chandrureddy) + * [89de0af] V7 Ginger Base : base folder files part 2 (chandrureddy) + * [ae5e96c] V7 Ginger Base : base folder files part 1 (chandrureddy) + * [d8134dd] V7 Ginger Base : Taking off the host tab functionality (chandrureddy) diff --git a/src/wok/plugins/gingerbase/Makefile.am b/src/wok/plugins/gingerbase/Makefile.am index e7a89f6..1f6d703 100644 --- a/src/wok/plugins/gingerbase/Makefile.am +++ b/src/wok/plugins/gingerbase/Makefile.am @@ -31,6 +31,9 @@ gingerbasedir = $(pythondir)/wok/plugins/gingerbase confdir = $(sysconfdir)/wok/plugins.d dist_conf_DATA = gingerbase.conf +name=ginger-base +distdir=$(name)-$(PACKAGE_VERSION) + AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = --install -I m4 diff --git a/src/wok/plugins/gingerbase/VERSION b/src/wok/plugins/gingerbase/VERSION index bc80560..227cea2 100644 --- a/src/wok/plugins/gingerbase/VERSION +++ b/src/wok/plugins/gingerbase/VERSION @@ -1 +1 @@ -1.5.0 +2.0.0 diff --git a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in index a4ffb66..204de63 100644 --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in @@ -1,4 +1,4 @@ -Name: Ginger Base +Name: ginger-base Version: @PACKAGE_VERSION@ Release: @PACKAGE_RELEASE@%{?dist} Summary: Wok plugin for base host management @@ -12,6 +12,8 @@ Requires: python-psutil >= 0.6.0 Requires: sos BuildRequires: libxslt BuildRequires: python-lxml +BuildRequires: python-devel +BuildRequires: python-pip %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %global with_systemd 1 @@ -28,7 +30,7 @@ Ginger Base is an open source base host management plugin for Wok common tools for configuring and managing the Linux systems. %prep - +%setup %build %configure @@ -45,24 +47,16 @@ rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) -%{python_sitelib}/wok/plugins/gingerbase/*.py* -%{python_sitelib}/wok/plugins/gingerbase/control/*.py* -%{python_sitelib}/wok/plugins/gingerbase/model/*.py* -%{python_sitelib}/wok/plugins/gingerbase/API.json -%{python_sitelib}/wok/plugins/gingerbase/ -%{_datadir}/wok/plugins/gingerbase/doc/API.md -%{_datadir}/wok/plugins/gingerbase/doc/README.md -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md +%{python_sitelib}/wok/plugins/gingerbase +%{_datadir}/gingerbase/doc/API.md +%{_datadir}/gingerbase/doc/README.md +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png %{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml -%{_datadir}/wok/plugins/gingerbase/ui/ %{_datadir}/wok/plugins/gingerbase %{_sysconfdir}/wok/plugins.d/gingerbase.conf -%{_sysconfdir}/wok/ -%{_sharedstatedir}/wok/debugreports/ -%{_sharedstatedir}/wok/ +%{_sharedstatedir}/gingerbase/ %changelog -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1s +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 - First build diff --git a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in index ba92606..117f933 100644 --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in @@ -1,4 +1,4 @@ -Name: Ginger Base +Name: ginger-base Version: @PACKAGE_VERSION@ Release: @PACKAGE_RELEASE@%{?dist} Summary: Wok plugin for base host management @@ -11,6 +11,8 @@ Requires: wok Requires: python-psutil >= 0.6.0 BuildRequires: libxslt-tools BuildRequires: python-lxml +BuildRequires: python-devel +BuildRequires: python-pip %if 0%{?suse_version} == 1100 Requires: python-ordereddict @@ -28,6 +30,11 @@ common tools for configuring and managing the Linux systems. %prep %setup +%build +%configure +make + + %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install @@ -38,25 +45,16 @@ rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) -%{python_sitelib}/wok/plugins/gingerbase/*.py* -%{python_sitelib}/wok/plugins/gingerbase/control/*.py* -%{python_sitelib}/wok/plugins/gingerbase/model/*.py* -%{python_sitelib}/wok/plugins/gingerbase/API.json -%{python_sitelib}/wok/plugins/gingerbase/ -%{_datadir}/wok/plugins/gingerbase/doc/API.md -%{_datadir}/wok/plugins/gingerbase/doc/README.md -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md +%{python_sitelib}/wok/plugins/gingerbase +%{_datadir}/gingerbase/doc/API.md +%{_datadir}/gingerbase/doc/README.md +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png %{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml -%{_datadir}/wok/plugins/gingerbase/ui/ %{_datadir}/wok/plugins/gingerbase %{_sysconfdir}/wok/plugins.d/gingerbase.conf -%{_sysconfdir}/wok/ -%{_var}/lib/wok/debugreports/ -%{_var}/lib/wok/ - +%{_sharedstatedir}/gingerbase/ %changelog -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 - First build diff --git a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in index a4c92bf..cdb5b07 100644 --- a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in +++ b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in @@ -11,5 +11,5 @@ fi TMPDIR=`mktemp -d` make DESTDIR=$TMPDIR install-deb -dpkg-deb -b $TMPDIR gingerbase-${VERSION}-${RELEASE}.noarch.deb +dpkg-deb -b $TMPDIR ginger-base-${VERSION}-${RELEASE}.noarch.deb rm -rf $TMPDIR -- 2.1.0
On 30/10/2015 12:16, chandra@linux.vnet.ibm.com wrote:
From: chandrureddy <chandra@linux.vnet.ibm.com>
Added files ChangeLog and CONTRIBUTE.md VERSION changed to 2.0.0 --- src/wok/plugins/gingerbase/CONTRIBUTE.md | 19 +++++++++++++ src/wok/plugins/gingerbase/ChangeLog | 31 ++++++++++++++++++++++ src/wok/plugins/gingerbase/Makefile.am | 3 +++ src/wok/plugins/gingerbase/VERSION | 2 +- .../gingerbase/contrib/gingerbase.spec.fedora.in | 26 +++++++----------- .../gingerbase/contrib/gingerbase.spec.suse.in | 30 ++++++++++----------- src/wok/plugins/gingerbase/contrib/make-deb.sh.in | 2 +- 7 files changed, 79 insertions(+), 34 deletions(-) create mode 100644 src/wok/plugins/gingerbase/CONTRIBUTE.md create mode 100644 src/wok/plugins/gingerbase/ChangeLog
diff --git a/src/wok/plugins/gingerbase/CONTRIBUTE.md b/src/wok/plugins/gingerbase/CONTRIBUTE.md new file mode 100644 index 0000000..03b4e79 --- /dev/null +++ b/src/wok/plugins/gingerbase/CONTRIBUTE.md @@ -0,0 +1,19 @@ +How to Contribute +================= + +All development discussion happens on the mailing list. All development is done +using the `git` SCM. Patches should be sent using the `git send-email` command +to the ginger-dev-list@googlegroups.com mailing list. + +Please go through below wiki page which describe on how to contribute to the community. +[How to Contribute](https://github.com/kimchi-project/ginger/wiki/How-to-Contribute) + +Good examples of how to send patches are included in +[QEMU SubmitAPatch](http://wiki.qemu.org/Contribute/SubmitAPatch) and +[Linux SubmittingPatches](https://www.kernel.org/doc/Documentation/SubmittingPatches). + +All documentation and READMEs are written using +[Markdown](http://daringfireball.net/projects/markdown/). + +For a patch to be committed, it must receive at least one "Reviewed-by" on the +mailing list. diff --git a/src/wok/plugins/gingerbase/ChangeLog b/src/wok/plugins/gingerbase/ChangeLog new file mode 100644 index 0000000..70c2235 --- /dev/null +++ b/src/wok/plugins/gingerbase/ChangeLog @@ -0,0 +1,31 @@ +CHANGELOG +========= + +#### [Current] #### + * [94ce07b] Fix make check-local for Kimchi (Aline Manera) + * [794ed7c] Add .gitignore file to gingerbase directory (Aline Manera) + * [1f1679f] Add src/wok/plugins directory to the Wok PEP8 backlist (Aline Manera) + * [94a71b1] Remove Host Resource from Kimchi (Aline Manera) + * [89c9058] Keep /host/partitions on Kimchi (Aline Manera) + * [3c8c947] Move host authorization tests from Kimchi to Ginger Base (Aline Manera) + * [d165ab5] Remove repositories tests from Kimchi (Aline Manera) + * [cc7d7a3] Fix Ginger Base tests (Aline Manera) + * [9e62598] Get the right internal URI to Ginger Base plugin (Aline Manera) + * [d6ee86b] Fix PYTHONPATH to run tests for Ginger Base (Aline Manera) + * [379ccff] V7 Ginger Base : base plugin po files (chandrureddy) + * [cd4c415] V7 Ginger Base : base plugin ui make, images and config (chandrureddy) + * [2256442] V7 Ginger Base : base plugin ui/css files (chandrureddy) + * [c12612f] V7 Ginger Base : base plugin ui/js files (chandrureddy) + * [89fc8af] V7 Ginger Base : base plugin ui/pages files (chandrureddy) + * [074670a] V7 Ginger Base : base plugin ui/pages/help files (chandrureddy) + * [83bb860] V7 Ginger Base : base plugin tests files (chandrureddy) + * [3b10bb7] V7 Ginger Base : base plugin model files (chandrureddy) + * [3cc1ae1] V7 Ginger Base : control files (chandrureddy) + * [c37bfb7] V7 Ginger Base : base plugin m4 files (chandrureddy) + * [8e8adcc] V7 Ginger Base : base plugin build-aix and contrib (chandrureddy) + * [ca7d757] V7 Ginger Base : base plugin docs files (chandrureddy) + * [a9add5c] V7 Add License files to ginger base (chandrureddy) + * [5456005] V7 Ginger Base : base folder files part 3 (chandrureddy) + * [89de0af] V7 Ginger Base : base folder files part 2 (chandrureddy) + * [ae5e96c] V7 Ginger Base : base folder files part 1 (chandrureddy) + * [d8134dd] V7 Ginger Base : Taking off the host tab functionality (chandrureddy) diff --git a/src/wok/plugins/gingerbase/Makefile.am b/src/wok/plugins/gingerbase/Makefile.am index e7a89f6..1f6d703 100644 --- a/src/wok/plugins/gingerbase/Makefile.am +++ b/src/wok/plugins/gingerbase/Makefile.am @@ -31,6 +31,9 @@ gingerbasedir = $(pythondir)/wok/plugins/gingerbase confdir = $(sysconfdir)/wok/plugins.d dist_conf_DATA = gingerbase.conf
+name=ginger-base +distdir=$(name)-$(PACKAGE_VERSION) + AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = --install -I m4 diff --git a/src/wok/plugins/gingerbase/VERSION b/src/wok/plugins/gingerbase/VERSION index bc80560..227cea2 100644 --- a/src/wok/plugins/gingerbase/VERSION +++ b/src/wok/plugins/gingerbase/VERSION @@ -1 +1 @@ -1.5.0 +2.0.0 diff --git a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in index a4ffb66..204de63 100644 --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in @@ -1,4 +1,4 @@ -Name: Ginger Base +Name: ginger-base Version: @PACKAGE_VERSION@ Release: @PACKAGE_RELEASE@%{?dist} Summary: Wok plugin for base host management @@ -12,6 +12,8 @@ Requires: python-psutil >= 0.6.0 Requires: sos BuildRequires: libxslt BuildRequires: python-lxml +BuildRequires: python-devel +BuildRequires: python-pip
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %global with_systemd 1 @@ -28,7 +30,7 @@ Ginger Base is an open source base host management plugin for Wok common tools for configuring and managing the Linux systems.
%prep - +%setup
%build %configure @@ -45,24 +47,16 @@ rm -rf $RPM_BUILD_ROOT
%files %attr(-,root,root) -%{python_sitelib}/wok/plugins/gingerbase/*.py* -%{python_sitelib}/wok/plugins/gingerbase/control/*.py* -%{python_sitelib}/wok/plugins/gingerbase/model/*.py* -%{python_sitelib}/wok/plugins/gingerbase/API.json -%{python_sitelib}/wok/plugins/gingerbase/ -%{_datadir}/wok/plugins/gingerbase/doc/API.md -%{_datadir}/wok/plugins/gingerbase/doc/README.md -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md +%{python_sitelib}/wok/plugins/gingerbase
+%{_datadir}/gingerbase/doc/API.md +%{_datadir}/gingerbase/doc/README.md +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png
You can list only %{_datadir}/gingerbase/ so the directory will be also removed when uninstalling the package. Otherwise, only the files will be removed.
%{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml -%{_datadir}/wok/plugins/gingerbase/ui/
%{_datadir}/wok/plugins/gingerbase
You can remove this line as gingerbase will be its own directory and not associated with wok. The same comments apply to the SUSE spec.
%{_sysconfdir}/wok/plugins.d/gingerbase.conf -%{_sysconfdir}/wok/ -%{_sharedstatedir}/wok/debugreports/ -%{_sharedstatedir}/wok/ +%{_sharedstatedir}/gingerbase/
%changelog -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1s +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 - First build diff --git a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in index ba92606..117f933 100644 --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in @@ -1,4 +1,4 @@ -Name: Ginger Base +Name: ginger-base Version: @PACKAGE_VERSION@ Release: @PACKAGE_RELEASE@%{?dist} Summary: Wok plugin for base host management @@ -11,6 +11,8 @@ Requires: wok Requires: python-psutil >= 0.6.0 BuildRequires: libxslt-tools BuildRequires: python-lxml +BuildRequires: python-devel +BuildRequires: python-pip
%if 0%{?suse_version} == 1100 Requires: python-ordereddict @@ -28,6 +30,11 @@ common tools for configuring and managing the Linux systems. %prep %setup
+%build +%configure +make + + %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install @@ -38,25 +45,16 @@ rm -rf $RPM_BUILD_ROOT
%files %attr(-,root,root) -%{python_sitelib}/wok/plugins/gingerbase/*.py* -%{python_sitelib}/wok/plugins/gingerbase/control/*.py* -%{python_sitelib}/wok/plugins/gingerbase/model/*.py* -%{python_sitelib}/wok/plugins/gingerbase/API.json -%{python_sitelib}/wok/plugins/gingerbase/ -%{_datadir}/wok/plugins/gingerbase/doc/API.md -%{_datadir}/wok/plugins/gingerbase/doc/README.md -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md +%{python_sitelib}/wok/plugins/gingerbase +%{_datadir}/gingerbase/doc/API.md +%{_datadir}/gingerbase/doc/README.md +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png %{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml -%{_datadir}/wok/plugins/gingerbase/ui/ %{_datadir}/wok/plugins/gingerbase %{_sysconfdir}/wok/plugins.d/gingerbase.conf -%{_sysconfdir}/wok/ -%{_var}/lib/wok/debugreports/ -%{_var}/lib/wok/ - +%{_sharedstatedir}/gingerbase/
%changelog -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 - First build diff --git a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in index a4c92bf..cdb5b07 100644 --- a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in +++ b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in @@ -11,5 +11,5 @@ fi TMPDIR=`mktemp -d`
make DESTDIR=$TMPDIR install-deb -dpkg-deb -b $TMPDIR gingerbase-${VERSION}-${RELEASE}.noarch.deb +dpkg-deb -b $TMPDIR ginger-base-${VERSION}-${RELEASE}.noarch.deb rm -rf $TMPDIR
On 10/30/2015 10:57 PM, Aline Manera wrote:
On 30/10/2015 12:16, chandra@linux.vnet.ibm.com wrote:
From: chandrureddy <chandra@linux.vnet.ibm.com>
Added files ChangeLog and CONTRIBUTE.md VERSION changed to 2.0.0 --- src/wok/plugins/gingerbase/CONTRIBUTE.md | 19 +++++++++++++ src/wok/plugins/gingerbase/ChangeLog | 31 ++++++++++++++++++++++ src/wok/plugins/gingerbase/Makefile.am | 3 +++ src/wok/plugins/gingerbase/VERSION | 2 +- .../gingerbase/contrib/gingerbase.spec.fedora.in | 26 +++++++----------- .../gingerbase/contrib/gingerbase.spec.suse.in | 30 ++++++++++----------- src/wok/plugins/gingerbase/contrib/make-deb.sh.in | 2 +- 7 files changed, 79 insertions(+), 34 deletions(-) create mode 100644 src/wok/plugins/gingerbase/CONTRIBUTE.md create mode 100644 src/wok/plugins/gingerbase/ChangeLog
diff --git a/src/wok/plugins/gingerbase/CONTRIBUTE.md b/src/wok/plugins/gingerbase/CONTRIBUTE.md new file mode 100644 index 0000000..03b4e79 --- /dev/null +++ b/src/wok/plugins/gingerbase/CONTRIBUTE.md @@ -0,0 +1,19 @@ +How to Contribute +================= + +All development discussion happens on the mailing list. All development is done +using the `git` SCM. Patches should be sent using the `git send-email` command +to the ginger-dev-list@googlegroups.com mailing list. + +Please go through below wiki page which describe on how to contribute to the community. +[How to Contribute](https://github.com/kimchi-project/ginger/wiki/How-to-Contribute) + +Good examples of how to send patches are included in +[QEMU SubmitAPatch](http://wiki.qemu.org/Contribute/SubmitAPatch) and +[Linux SubmittingPatches](https://www.kernel.org/doc/Documentation/SubmittingPatches). + +All documentation and READMEs are written using +[Markdown](http://daringfireball.net/projects/markdown/). + +For a patch to be committed, it must receive at least one "Reviewed-by" on the +mailing list. diff --git a/src/wok/plugins/gingerbase/ChangeLog b/src/wok/plugins/gingerbase/ChangeLog new file mode 100644 index 0000000..70c2235 --- /dev/null +++ b/src/wok/plugins/gingerbase/ChangeLog @@ -0,0 +1,31 @@ +CHANGELOG +========= + +#### [Current] #### + * [94ce07b] Fix make check-local for Kimchi (Aline Manera) + * [794ed7c] Add .gitignore file to gingerbase directory (Aline Manera) + * [1f1679f] Add src/wok/plugins directory to the Wok PEP8 backlist (Aline Manera) + * [94a71b1] Remove Host Resource from Kimchi (Aline Manera) + * [89c9058] Keep /host/partitions on Kimchi (Aline Manera) + * [3c8c947] Move host authorization tests from Kimchi to Ginger Base (Aline Manera) + * [d165ab5] Remove repositories tests from Kimchi (Aline Manera) + * [cc7d7a3] Fix Ginger Base tests (Aline Manera) + * [9e62598] Get the right internal URI to Ginger Base plugin (Aline Manera) + * [d6ee86b] Fix PYTHONPATH to run tests for Ginger Base (Aline Manera) + * [379ccff] V7 Ginger Base : base plugin po files (chandrureddy) + * [cd4c415] V7 Ginger Base : base plugin ui make, images and config (chandrureddy) + * [2256442] V7 Ginger Base : base plugin ui/css files (chandrureddy) + * [c12612f] V7 Ginger Base : base plugin ui/js files (chandrureddy) + * [89fc8af] V7 Ginger Base : base plugin ui/pages files (chandrureddy) + * [074670a] V7 Ginger Base : base plugin ui/pages/help files (chandrureddy) + * [83bb860] V7 Ginger Base : base plugin tests files (chandrureddy) + * [3b10bb7] V7 Ginger Base : base plugin model files (chandrureddy) + * [3cc1ae1] V7 Ginger Base : control files (chandrureddy) + * [c37bfb7] V7 Ginger Base : base plugin m4 files (chandrureddy) + * [8e8adcc] V7 Ginger Base : base plugin build-aix and contrib (chandrureddy) + * [ca7d757] V7 Ginger Base : base plugin docs files (chandrureddy) + * [a9add5c] V7 Add License files to ginger base (chandrureddy) + * [5456005] V7 Ginger Base : base folder files part 3 (chandrureddy) + * [89de0af] V7 Ginger Base : base folder files part 2 (chandrureddy) + * [ae5e96c] V7 Ginger Base : base folder files part 1 (chandrureddy) + * [d8134dd] V7 Ginger Base : Taking off the host tab functionality (chandrureddy) diff --git a/src/wok/plugins/gingerbase/Makefile.am b/src/wok/plugins/gingerbase/Makefile.am index e7a89f6..1f6d703 100644 --- a/src/wok/plugins/gingerbase/Makefile.am +++ b/src/wok/plugins/gingerbase/Makefile.am @@ -31,6 +31,9 @@ gingerbasedir = $(pythondir)/wok/plugins/gingerbase confdir = $(sysconfdir)/wok/plugins.d dist_conf_DATA = gingerbase.conf
+name=ginger-base +distdir=$(name)-$(PACKAGE_VERSION) + AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = --install -I m4 diff --git a/src/wok/plugins/gingerbase/VERSION b/src/wok/plugins/gingerbase/VERSION index bc80560..227cea2 100644 --- a/src/wok/plugins/gingerbase/VERSION +++ b/src/wok/plugins/gingerbase/VERSION @@ -1 +1 @@ -1.5.0 +2.0.0 diff --git a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in index a4ffb66..204de63 100644 --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in @@ -1,4 +1,4 @@ -Name: Ginger Base +Name: ginger-base Version: @PACKAGE_VERSION@ Release: @PACKAGE_RELEASE@%{?dist} Summary: Wok plugin for base host management @@ -12,6 +12,8 @@ Requires: python-psutil >= 0.6.0 Requires: sos BuildRequires: libxslt BuildRequires: python-lxml +BuildRequires: python-devel +BuildRequires: python-pip
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %global with_systemd 1 @@ -28,7 +30,7 @@ Ginger Base is an open source base host management plugin for Wok common tools for configuring and managing the Linux systems.
%prep - +%setup
%build %configure @@ -45,24 +47,16 @@ rm -rf $RPM_BUILD_ROOT
%files %attr(-,root,root) -%{python_sitelib}/wok/plugins/gingerbase/*.py* -%{python_sitelib}/wok/plugins/gingerbase/control/*.py* -%{python_sitelib}/wok/plugins/gingerbase/model/*.py* -%{python_sitelib}/wok/plugins/gingerbase/API.json -%{python_sitelib}/wok/plugins/gingerbase/ -%{_datadir}/wok/plugins/gingerbase/doc/API.md -%{_datadir}/wok/plugins/gingerbase/doc/README.md -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md +%{python_sitelib}/wok/plugins/gingerbase
+%{_datadir}/gingerbase/doc/API.md +%{_datadir}/gingerbase/doc/README.md +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png
You can list only %{_datadir}/gingerbase/ so the directory will be also removed when uninstalling the package. Otherwise, only the files will be removed.
Done.
%{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml -%{_datadir}/wok/plugins/gingerbase/ui/
%{_datadir}/wok/plugins/gingerbase
You can remove this line as gingerbase will be its own directory and not associated with wok. we can not remove this line as this line is responsible for ui folder installation (ie./usr/share/wok/plugins/gingerbase/). so this line has a significance other wise I get the following error while building the rpm.
Error message with out above line. RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/wok/plugins/gingerbase/ui/config/tab-ext.xml /usr/share/wok/plugins/gingerbase/ui/css/theme-default.min.css /usr/share/wok/plugins/gingerbase/ui/images/icon-vm.png /usr/share/wok/plugins/gingerbase/ui/images/logo.ico /usr/share/wok/plugins/gingerbase/ui/images/theme-default/host-icon-sprite.png /usr/share/wok/plugins/gingerbase/ui/images/theme-default/kimchi-loading15x15.gif /usr/share/wok/plugins/gingerbase/ui/js/gingerbase.min.js /usr/share/wok/plugins/gingerbase/ui/pages/help/de_DE/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/en_US/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/es_ES/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/fr_FR/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/gingerbase.css /usr/share/wok/plugins/gingerbase/ui/pages/help/it_IT/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/ja_JP/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/ko_KR/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/pt_BR/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/ru_RU/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/zh_CN/host.html /usr/share/wok/plugins/gingerbase/ui/pages/help/zh_TW/host.html /usr/share/wok/plugins/gingerbase/ui/pages/host.html.tmpl /usr/share/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl /usr/share/wok/plugins/gingerbase/ui/pages/report-add.html.tmpl /usr/share/wok/plugins/gingerbase/ui/pages/report-rename.html.tmpl /usr/share/wok/plugins/gingerbase/ui/pages/repository-add.html.tmpl /usr/share/wok/plugins/gingerbase/ui/pages/repository-edit.html.tmpl Makefile:1061: recipe for target 'rpm' failed
The same comments apply to the SUSE spec.
%{_sysconfdir}/wok/plugins.d/gingerbase.conf -%{_sysconfdir}/wok/ -%{_sharedstatedir}/wok/debugreports/ -%{_sharedstatedir}/wok/ +%{_sharedstatedir}/gingerbase/
%changelog -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1s +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 - First build diff --git a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in index ba92606..117f933 100644 --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in @@ -1,4 +1,4 @@ -Name: Ginger Base +Name: ginger-base Version: @PACKAGE_VERSION@ Release: @PACKAGE_RELEASE@%{?dist} Summary: Wok plugin for base host management @@ -11,6 +11,8 @@ Requires: wok Requires: python-psutil >= 0.6.0 BuildRequires: libxslt-tools BuildRequires: python-lxml +BuildRequires: python-devel +BuildRequires: python-pip
%if 0%{?suse_version} == 1100 Requires: python-ordereddict @@ -28,6 +30,11 @@ common tools for configuring and managing the Linux systems. %prep %setup
+%build +%configure +make + + %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install @@ -38,25 +45,16 @@ rm -rf $RPM_BUILD_ROOT
%files %attr(-,root,root) -%{python_sitelib}/wok/plugins/gingerbase/*.py* -%{python_sitelib}/wok/plugins/gingerbase/control/*.py* -%{python_sitelib}/wok/plugins/gingerbase/model/*.py* -%{python_sitelib}/wok/plugins/gingerbase/API.json -%{python_sitelib}/wok/plugins/gingerbase/ -%{_datadir}/wok/plugins/gingerbase/doc/API.md -%{_datadir}/wok/plugins/gingerbase/doc/README.md -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md +%{python_sitelib}/wok/plugins/gingerbase +%{_datadir}/gingerbase/doc/API.md +%{_datadir}/gingerbase/doc/README.md +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png %{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml -%{_datadir}/wok/plugins/gingerbase/ui/ %{_datadir}/wok/plugins/gingerbase %{_sysconfdir}/wok/plugins.d/gingerbase.conf -%{_sysconfdir}/wok/ -%{_var}/lib/wok/debugreports/ -%{_var}/lib/wok/ - +%{_sharedstatedir}/gingerbase/
%changelog -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1 - First build diff --git a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in index a4c92bf..cdb5b07 100644 --- a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in +++ b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in @@ -11,5 +11,5 @@ fi TMPDIR=`mktemp -d`
make DESTDIR=$TMPDIR install-deb -dpkg-deb -b $TMPDIR gingerbase-${VERSION}-${RELEASE}.noarch.deb +dpkg-deb -b $TMPDIR ginger-base-${VERSION}-${RELEASE}.noarch.deb rm -rf $TMPDIR
participants (3)
-
Aline Manera -
Chandra Shehkhar Reddy Potula -
chandra＠linux.vnet.ibm.com