rel-eng/packages spacecmd/spacecmd.spec
by shardy
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 446668a8a602440ce93966e6c12b8a3525df7662
Author: Steven Hardy <shardy(a)redhat.com>
Date: Fri Apr 27 13:30:04 2012 +0100
Automatic commit of package [spacecmd] release [1.8.5-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index f4b3713..de0bd48 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.8.4-1 spacecmd/
+1.8.5-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 3fc967b..cb06433 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.8.4
+Version: 1.8.5
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -61,6 +61,12 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Fri Apr 27 2012 Steven Hardy <shardy(a)redhat.com> 1.8.5-1
+- spacecmd : enhancement add system_addconfigfile (shardy(a)redhat.com)
+- spacecmd : move file_needs_b64_enc into utils (shardy(a)redhat.com)
+- spacecmd : Fix usage for configchannel_addfile (shardy(a)redhat.com)
+- spacecmd : enhancement Add system_listconfigfiles (shardy(a)redhat.com)
+
* Sat Apr 14 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.4-1
- spacecmd: pretty-print JSON output
- spacecmd: cosmetics
12 years
4 commits - spacecmd/src
by shardy
spacecmd/src/lib/configchannel.py | 204 +++++++++++++++----------------
spacecmd/src/lib/system.py | 250 ++++++++++++++++++++++++++++++++++++++
spacecmd/src/lib/utils.py | 16 ++
3 files changed, 365 insertions(+), 105 deletions(-)
New commits:
commit 37dfdbd89c0af5d2583b181e6a00c57871c89716
Author: Steven Hardy <shardy(a)redhat.com>
Date: Wed Apr 25 11:41:00 2012 +0100
spacecmd : enhancement add system_addconfigfile
Adds system_addconfigfile which can add system-sandbox and locally-managed
config files
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index e8994ca..7410b95 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -376,91 +376,22 @@ def do_configchannel_delete(self, args):
####################
-def help_configchannel_addfile(self):
- print 'configchannel_addfile: Create a configuration file'
- print '''usage: configchannel_addfile [CHANNEL] [options]
-
-options:
- -c CHANNEL
- -p PATH
- -r REVISION
- -o OWNER [default: root]
- -g GROUP [default: root]
- -m MODE [defualt: 0644]
- -x SELINUX_CONTEXT
- -d path is a directory
- -s path is a symlink
- -b path is a binary (or other file which needs base64 encoding)
- -t SYMLINK_TARGET
- -f local path to file contents
-
- Note re binary/base64: Some text files, notably those containing trailing
- newlines, those containing ASCII escape characters (or other charaters not
- allowed in XML) need to be sent as binary (-b). Some effort is made to auto-
- detect files which require this, but you may need to explicitly specify.
-'''
-
-def complete_configchannel_addfile(self, text, line, beg, end):
- return tab_completer(self.do_configchannel_list('', True), text)
-
-def do_configchannel_addfile(self, args, update_path=''):
- options = [ Option('-c', '--channel', action='store'),
- Option('-p', '--path', action='store'),
- Option('-o', '--owner', action='store'),
- Option('-g', '--group', action='store'),
- Option('-m', '--mode', action='store'),
- Option('-x', '--selinux-ctx', action='store'),
- Option('-t', '--target-path', action='store'),
- Option('-f', '--file', action='store'),
- Option('-r', '--revision', action='store'),
- Option('-s', '--symlink', action='store_true'),
- Option('-b', '--binary', action='store_true'),
- Option('-d', '--directory', action='store_true') ]
-
- (args, options) = parse_arguments(args, options)
+def configfile_getinfo(self, args, options, file_info=None, interactive=False):
+ # Common code which is used in both configchannel_addfile and
+ # system_addconfigfile. Takes args/options from each call and
+ # returns the file_info dict needed to create the file in either
+ # the configchannel or sytem sandbox/local-override respectively
+ #
+ # file_info is the existing info from lookupFileInfo or None if
+ # no file for this path exists already
# initialize here instead of multiple times below
contents = ''
- if is_interactive(options):
- # the channel name can be passed in
- if len(args):
- options.channel = args[0]
- else:
- while True:
- print 'Configuration Channels'
- print '----------------------'
- print '\n'.join(sorted(self.do_configchannel_list('', True)))
- print
-
- options.channel = prompt_user('Select:', noblank = True)
-
- # ensure the user enters a valid configuration channel
- if options.channel in self.do_configchannel_list('', True):
- break
- else:
- print
- logging.warning('%s is not a valid channel' % \
- options.channel)
- print
-
- if update_path:
- options.path = update_path
- else:
- options.path = prompt_user('Path:', noblank = True)
-
- # check if this file already exists
- try:
- fileinfo = \
- self.client.configchannel.lookupFileInfo(self.session,
- options.channel,
- [ options.path ])
- except:
- fileinfo = None
-
+ if interactive:
# use existing values if available
- if fileinfo:
- for info in fileinfo:
+ if file_info:
+ for info in file_info:
if info.get('path') == options.path:
logging.debug('Found existing file in channel')
@@ -540,16 +471,6 @@ def do_configchannel_addfile(self, args, update_path=''):
contents = editor(template = template, delete = True)
else:
- # the channel name can be passed in without -c
- if len(args):
- options.channel = args[0]
-
- if not options.channel:
- logging.error("The channel name is required")
- return
-
- logging.debug("Using channel %s" % options.channel)
-
if not options.path:
logging.error('The path is required')
return
@@ -629,6 +550,94 @@ def do_configchannel_addfile(self, args, update_path=''):
print '--------'
print file_info['contents']
+ return file_info
+
+def help_configchannel_addfile(self):
+ print 'configchannel_addfile: Create a configuration file'
+ print '''usage: configchannel_addfile [CHANNEL] [options]
+
+options:
+ -c CHANNEL
+ -p PATH
+ -r REVISION
+ -o OWNER [default: root]
+ -g GROUP [default: root]
+ -m MODE [defualt: 0644]
+ -x SELINUX_CONTEXT
+ -d path is a directory
+ -s path is a symlink
+ -b path is a binary (or other file which needs base64 encoding)
+ -t SYMLINK_TARGET
+ -f local path to file contents
+
+ Note re binary/base64: Some text files, notably those containing trailing
+ newlines, those containing ASCII escape characters (or other charaters not
+ allowed in XML) need to be sent as binary (-b). Some effort is made to auto-
+ detect files which require this, but you may need to explicitly specify.
+'''
+
+def complete_configchannel_addfile(self, text, line, beg, end):
+ return tab_completer(self.do_configchannel_list('', True), text)
+
+def do_configchannel_addfile(self, args, update_path=''):
+ options = [ Option('-c', '--channel', action='store'),
+ Option('-p', '--path', action='store'),
+ Option('-o', '--owner', action='store'),
+ Option('-g', '--group', action='store'),
+ Option('-m', '--mode', action='store'),
+ Option('-x', '--selinux-ctx', action='store'),
+ Option('-t', '--target-path', action='store'),
+ Option('-f', '--file', action='store'),
+ Option('-r', '--revision', action='store'),
+ Option('-s', '--symlink', action='store_true'),
+ Option('-b', '--binary', action='store_true'),
+ Option('-d', '--directory', action='store_true') ]
+
+ (args, options) = parse_arguments(args, options)
+
+ file_info = None
+
+ interactive = is_interactive(options)
+ if interactive:
+ # the channel name can be passed in
+ if len(args):
+ options.channel = args[0]
+ else:
+ while True:
+ print 'Configuration Channels'
+ print '----------------------'
+ print '\n'.join(sorted(self.do_configchannel_list('', True)))
+ print
+
+ options.channel = prompt_user('Select:', noblank = True)
+
+ # ensure the user enters a valid configuration channel
+ if options.channel in self.do_configchannel_list('', True):
+ break
+ else:
+ print
+ logging.warning('%s is not a valid channel' % \
+ options.channel)
+ print
+
+ if update_path:
+ options.path = update_path
+ else:
+ options.path = prompt_user('Path:', noblank = True)
+
+ # check if this file already exists
+ try:
+ file_info = \
+ self.client.configchannel.lookupFileInfo(self.session,
+ options.channel,
+ [ options.path ])
+ except:
+ logging.debug("No existing file information found for %s" %\
+ options.path)
+ file_info = None
+
+ file_info = self.configfile_getinfo(args, options, file_info, interactive)
+
if self.user_confirm():
if options.symlink:
self.client.configchannel.createOrUpdateSymlink(self.session,
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index 7f14346..f8267b1 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -1117,6 +1117,143 @@ def do_system_listconfigfiles(self, args):
####################
+def help_system_addconfigfile(self):
+ print 'system_addconfigfile: Create a configuration file'
+ print 'Note this is only for system sandbox or locally-managed files'
+ print 'Centrally managed files should be created via configchannel_addfile'
+ print '''usage: system_addconfigfile [SYSTEM] [options]
+
+options:
+ -S/--sandbox : list only system-sandbox files
+ -L/--local : list only locally managed files
+ -p PATH
+ -r REVISION
+ -o OWNER [default: root]
+ -g GROUP [default: root]
+ -m MODE [defualt: 0644]
+ -x SELINUX_CONTEXT
+ -d path is a directory
+ -s path is a symlink
+ -b path is a binary (or other file which needs base64 encoding)
+ -t SYMLINK_TARGET
+ -f local path to file contents
+
+ Note re binary/base64: Some text files, notably those containing trailing
+ newlines, those containing ASCII escape characters (or other charaters not
+ allowed in XML) need to be sent as binary (-b). Some effort is made to auto-
+ detect files which require this, but you may need to explicitly specify.
+'''
+
+def complete_system_addconfigfile(self, text, line, beg, end):
+ return self.tab_complete_systems(text)
+
+def do_system_addconfigfile(self, args, update_path=''):
+ options = [ Option('-S', '--sandbox', action='store_true'),
+ Option('-L', '--local', action='store_true'),
+ Option('-p', '--path', action='store'),
+ Option('-o', '--owner', action='store'),
+ Option('-g', '--group', action='store'),
+ Option('-m', '--mode', action='store'),
+ Option('-x', '--selinux-ctx', action='store'),
+ Option('-t', '--target-path', action='store'),
+ Option('-f', '--file', action='store'),
+ Option('-r', '--revision', action='store'),
+ Option('-s', '--symlink', action='store_true'),
+ Option('-b', '--binary', action='store_true'),
+ Option('-d', '--directory', action='store_true') ]
+
+ (args, options) = parse_arguments(args, options)
+
+ file_info = None
+
+ # the system name can be passed in
+ if len(args):
+ options.system = args[0]
+
+ interactive = is_interactive(options)
+ if interactive:
+ if not options.system:
+ while True:
+ print 'Systems'
+ print '----------------------'
+ print '\n'.join(sorted(self.do_system_list('', True)))
+ print
+
+ options.system = prompt_user('Select:', noblank = True)
+
+ # ensure the user enters a valid system
+ if options.system in self.do_system_list('', True):
+ break
+ else:
+ print
+ logging.warning('%s is not a valid system' % \
+ options.system)
+ print
+
+ if update_path:
+ options.path = update_path
+ else:
+ options.path = prompt_user('Path:', noblank = True)
+
+ while not options.local and not options.sandbox:
+ answer = prompt_user('System-Sandbox or Locally-Managed? [S/L]:')
+ if re.match('L', answer, re.I):
+ options.local = True
+ localopt=1
+ elif re.match('S', answer, re.I):
+ options.sandbox = True
+ localopt=0
+
+ # Set the int variable (required by the API calls) for sandbox/local
+ localopt=0
+ if options.local:
+ logging.debug("Selected locally-managed")
+ localopt=1
+ elif options.sandbox:
+ logging.debug("Selected system-sandbox")
+ else:
+ logging.error("Must choose system-sandbox or locally-managed option")
+ self.help_system_addconfigfile()
+ return
+
+ if not options.system:
+ logging.error("Must provide system")
+ self.help_system_addconfigfile()
+ return
+
+ system_id = self.get_system_id(options.system)
+ logging.debug("Got ID %s for system %s" % (system_id, options.system))
+
+ # check if this file already exists
+ try:
+ file_info = self.client.system.config.lookupFileInfo(self.session,\
+ system_id, [ options.path ], localopt)
+ if file_info:
+ logging.debug("Found existing file_info %s" % file_info)
+ except:
+ logging.debug("No existing file information found for %s" %\
+ options.path)
+
+ file_info = self.configfile_getinfo(args, options, file_info, interactive)
+
+ if self.user_confirm():
+ if options.symlink:
+ self.client.system.config.createOrUpdateSymlink(self.session,
+ system_id, options.path, file_info, localopt)
+ else:
+# # compatibility for Satellite 5.3
+# if not self.check_api_version('10.11'):
+# del file_info['selinux_ctx']
+#
+# if file_info.has_key('revision'):
+# del file_info['revision']
+#
+ self.client.system.config.createOrUpdatePath(self.session,
+ system_id, options.path, options.directory, file_info,
+ localopt)
+
+####################
+
def help_system_addconfigchannels(self):
print 'system_addconfigchannels: Add config channels to a system'
print '''usage: system_addconfigchannels <SYSTEMS> <CHANNEL ...> [options]
commit 63cd27ce358e0a9e6298437741ac686f427cff3c
Author: Steven Hardy <shardy(a)redhat.com>
Date: Wed Apr 11 08:03:21 2012 +0100
spacecmd : move file_needs_b64_enc into utils
Move file_needs_b64_enc as it will be used in both congfigchannel.py and system.py
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index e0364c2..e8994ca 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -376,22 +376,6 @@ def do_configchannel_delete(self, args):
####################
-def file_needs_b64_enc(self, contents):
-
- # we try to catch files automatically which will not work
- # correctly via the API so that they get uploaded correctly
-
- # Files with trailing newlines, which the API strips from files
- # uploaded as text, to avoid this we upload them as base64 encoded
- if contents != contents.rstrip():
- logging.info("trailing newlines detected, uploading as binary")
- return True
-
- # TODO : Add other exceptions here, e.g those containing characters which
- # are valid ascii but not valid XML (e.g the escape character)
-
- return False
-
def help_configchannel_addfile(self):
print 'configchannel_addfile: Create a configuration file'
print '''usage: configchannel_addfile [CHANNEL] [options]
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 628d9f2..6292f5a 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -633,4 +633,20 @@ def json_read_from_file(filename):
print "could not open file %s for reading, check permissions?" % filename
return None
+def file_needs_b64_enc(self, contents):
+
+ # Used to check if files (config files primarily) need base64 encoding
+ # in order to work properly via the API
+
+ # Files with trailing newlines, which the API strips from files
+ # uploaded as text, to avoid this we upload them as base64 encoded
+ if contents != contents.rstrip():
+ logging.info("trailing newlines detected, uploading as binary")
+ return True
+
+ # TODO : Add other exceptions here, e.g those containing characters which
+ # are valid ascii but not valid XML (e.g the escape character)
+
+ return False
+
# vim:ts=4:expandtab:
commit 20f7f144807bb6eda5570a745d31d84c1576ab5e
Author: Steven Hardy <shardy(a)redhat.com>
Date: Tue Apr 10 08:17:07 2012 +0100
spacecmd : Fix usage for configchannel_addfile
Fix usage for configchannel_addfile, which contained some slightly inaccurate
information re binary/base64 mode.
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 5b4701b..e0364c2 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -410,9 +410,10 @@ options:
-t SYMLINK_TARGET
-f local path to file contents
- Note re binary/base64: Some text files, notably those containing blank lines
- and those containing ASCII escape characters (or other charaters not allowed
- or processed correctly as text via the XMLRPC API) need to be sent as binary
+ Note re binary/base64: Some text files, notably those containing trailing
+ newlines, those containing ASCII escape characters (or other charaters not
+ allowed in XML) need to be sent as binary (-b). Some effort is made to auto-
+ detect files which require this, but you may need to explicitly specify.
'''
def complete_configchannel_addfile(self, text, line, beg, end):
commit f1e2340000956be40446f7dc37e6d68ae4ab6963
Author: Steven Hardy <shardy(a)redhat.com>
Date: Mon Apr 9 22:02:58 2012 +0100
spacecmd : enhancement Add system_listconfigfiles
Adds new option which lists configfiles for a given system, including centrally
managed, system sandbox and locally managed files
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index 08c3deb..7f14346 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -1004,6 +1004,119 @@ def do_system_listconfigchannels(self, args):
####################
+def print_configfiles(self, quiet, filelist):
+
+ # Figure out correct indentation to allow pretty table output
+ max_path = max_length([f['path'] for f in filelist], min=10)
+ max_type = max_length(["file", "directory", "symlink"], min=10)
+ max_label = max_length([f['channel_label'] for f in filelist], min=15)
+
+ # print header when not in quiet mode
+ if not quiet:
+ print '%s %s %s' % (
+ 'path'.ljust(max_path),
+ 'type'.ljust(max_type),
+ 'label/type'.ljust(max_label))
+
+ print '%s %s %s' % (
+ '-' * max_path,
+ '-' * max_type,
+ '-' * max_label)
+
+ for f in filelist:
+ print '%s %s %s' % (f['path'].ljust(max_path),\
+ f['type'].ljust(max_type),\
+ f['channel_label'].ljust(max_label))
+
+def help_system_listconfigfiles(self):
+ print 'system_listconfigfiles: List the managed config files of a system'
+ print '''usage: system_listconfigfiles <SYSTEMS>'
+options:
+ -s/--sandbox : list only system-sandbox files
+ -l/--local : list only locally managed files
+ -c/--central : list only centrally managed files
+ -q/--quiet : quiet mode (omits the header)'''
+ print
+ print self.HELP_SYSTEM_OPTS
+
+def complete_system_listconfigfiles(self, text, line, beg, end):
+ return self.tab_complete_systems(text)
+
+def do_system_listconfigfiles(self, args):
+ options = [ Option('-s', '--sandbox', action='store_true'),
+ Option('-l', '--local', action='store_true'),
+ Option('-c', '--central', action='store_true'),
+ Option('-q', '--quiet', action='store_true') ]
+
+ (args, options) = parse_arguments(args, options)
+
+ if not options.sandbox and not options.local and not options.central:
+ logging.debug("No sandbox/local/central option specified, listing ALL")
+ options.sandbox = True
+ options.local = True
+ options.central = True
+
+ if not len(args):
+ self.help_system_listconfigfiles()
+ return
+
+ add_separator = False
+
+ # use the systems listed in the SSM
+ if re.match('ssm', args[0], re.I):
+ systems = self.ssm.keys()
+ else:
+ systems = self.expand_systems(args)
+
+ for system in sorted(systems):
+ system_id = self.get_system_id(system)
+ if not system_id: return
+
+ if add_separator: print self.SEPARATOR
+ add_separator = True
+
+ if len(systems) > 1:
+ print 'System: %s' % system
+
+ try:
+ # Pass 0 for system-sandbox files
+ # Pass 1 for locally managed or centrally managed
+ files = self.client.system.config.listFiles(self.session,\
+ system_id, 0)
+ files += self.client.system.config.listFiles(self.session,\
+ system_id, 1)
+ except:
+ logging.warning('%s does not support configuration channels' %\
+ system)
+ continue
+
+ # For system sandbox or locally managed files, there is no
+ # channel_label so we add a descriptive label for these files
+ toprint=[]
+ for f in files:
+ if f['channel_type']['label'] == 'server_import':
+ f['channel_label'] = "system_sandbox"
+ if options.sandbox:
+ toprint.append(f)
+
+ elif f['channel_type']['label'] == 'local_override':
+ f['channel_label'] = "locally_managed"
+ if options.local:
+ toprint.append(f)
+
+ elif f['channel_type']['label'] == 'normal':
+ if options.central:
+ toprint.append(f)
+
+ else:
+ logging.error("Error, unexpected channel type label %s" %\
+ f['channel_type']['label'])
+ return
+
+ self.print_configfiles(options.quiet, toprint)
+
+####################
+
def help_system_addconfigchannels(self):
print 'system_addconfigchannels: Add config channels to a system'
print '''usage: system_addconfigchannels <SYSTEMS> <CHANNEL ...> [options]
12 years
Changes to 'refs/tags/spacewalk-search-1.8.2-1'
by Jan Pazdziora
Tag 'spacewalk-search-1.8.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-27 11:46 +0000
Tagging package [spacewalk-search] version [1.8.2-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-branding-1.8.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-search] release [1.8.2-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years
Changes to 'refs/tags/spacewalk-branding-1.8.2-1'
by Jan Pazdziora
Tag 'spacewalk-branding-1.8.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-27 11:46 +0000
Tagging package [spacewalk-branding] version [1.8.2-1] in directory [branding/].
Changes since spacewalk-backend-1.8.22-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-branding] release [1.8.2-1].
---
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years
Changes to 'refs/tags/spacewalk-backend-1.8.22-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.22-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-27 11:45 +0000
Tagging package [spacewalk-backend] version [1.8.22-1] in directory [backend/].
Changes since spacewalk-schema-1.8.23-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.8.22-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years
3 commits - backend/spacewalk-backend.spec branding/spacewalk-branding.spec rel-eng/packages search-server/spacewalk-search
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-branding | 2 +-
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
6 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit ad41cc3de559870b32fddee6c9e0d4e785a0f466
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 27 13:46:17 2012 +0200
Automatic commit of package [spacewalk-search] release [1.8.2-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 0588806..f5b3955 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.8.1-1 search-server/spacewalk-search/
+1.8.2-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index a1c00d4..b4eaf08 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -124,6 +124,10 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Fri Apr 27 2012 Jan Pazdziora 1.8.2-1
+- 816299 - Updating default config files with additional options for heapdump
+ directory (sherr(a)redhat.com)
+
* Sat Mar 17 2012 Miroslav Suchý 1.8.1-1
- 521248 - correctly spell MHz (msuchy(a)redhat.com)
- Bumping package versions for 1.8. (jpazdziora(a)redhat.com)
commit a2cbf28245c266f457bbcd5229a25231f6b59f53
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 27 13:46:06 2012 +0200
Automatic commit of package [spacewalk-branding] release [1.8.2-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index f76ae47..e16d6cd 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Apr 27 2012 Jan Pazdziora 1.8.2-1
+- Missing icon for the systems that need reboot list (dmacvicar(a)suse.de)
+
* Thu Apr 19 2012 Jan Pazdziora 1.8.1-1
- Update the copyright year info on .pxt pages.
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index c922cb5..59de332 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.8.1-1 branding/
+1.8.2-1 branding/
commit ce74f4ab60dbf76bce148cd4da3fa79d51e42faf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 27 13:45:56 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.22-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8178ff4..17b69d3 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.21
+Version: 1.8.22
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -673,6 +673,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Apr 27 2012 Jan Pazdziora 1.8.22-1
+- 815964 - update monitoring probes in small batches to reduce the chance of a
+ deadlock (sherr(a)redhat.com)
+
* Tue Apr 24 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.21-1
- 807962 - raise SQLSchemaError alike oracle driver does
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index cb3c797..a08f0d9 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.21-1 backend/
+1.8.22-1 backend/
12 years
Changes to 'refs/tags/spacewalk-schema-1.8.23-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.8.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-27 10:22 +0000
Tagging package [spacewalk-schema] version [1.8.23-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.8.22-1:
Miroslav Suchý (4):
remove old comments
719609 - Add support for armv7l cpu and armv7 channels
719609 - add support for armv5 channels
Automatic commit of package [spacewalk-schema] release [1.8.23-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnChannelArch.sql | 41 +-------
schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql | 12 ++
schema/spacewalk/common/data/rhnCpuArch.sql | 2
schema/spacewalk/common/data/rhnPackageArch.sql | 6 +
schema/spacewalk/common/data/rhnServerArch.sql | 4
schema/spacewalk/common/data/rhnServerChannelArchCompat.sql | 47 +---------
schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql | 24 +++++
schema/spacewalk/spacewalk-schema.spec | 6 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql | 8 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql | 44 +++++++++
11 files changed, 118 insertions(+), 78 deletions(-)
---
12 years
rel-eng/packages schema/spacewalk
by Miroslav Suchý
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 586b29ccf2c749a22bb05169b036229f38851cd1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 27 12:22:58 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.23-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 56437dc..81ac407 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.22-1 schema/spacewalk/
+1.8.23-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 6490f60..8ceec68 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.22
+Version: 1.8.23
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Apr 27 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.23-1
+- 719609 - add support for armv5 channels
+- 719609 - Add support for armv7l cpu and armv7 channels
+
* Fri Apr 27 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.22-1
- 807283 - fixing postgresql schema and adding appropriate schema upgrade
scripts
12 years
3 commits - schema/spacewalk
by Miroslav Suchý
schema/spacewalk/common/data/rhnChannelArch.sql | 41 +-------
schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql | 12 ++
schema/spacewalk/common/data/rhnCpuArch.sql | 2
schema/spacewalk/common/data/rhnPackageArch.sql | 6 +
schema/spacewalk/common/data/rhnServerArch.sql | 4
schema/spacewalk/common/data/rhnServerChannelArchCompat.sql | 47 +---------
schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql | 24 +++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql | 8 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql | 44 +++++++++
9 files changed, 112 insertions(+), 76 deletions(-)
New commits:
commit 7e5f181c5c079d3eb6e5f3b21893ce145f782535
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 27 12:17:22 2012 +0200
719609 - add support for armv5 channels
diff --git a/schema/spacewalk/common/data/rhnChannelArch.sql b/schema/spacewalk/common/data/rhnChannelArch.sql
index dca439c..14839bc 100644
--- a/schema/spacewalk/common/data/rhnChannelArch.sql
+++ b/schema/spacewalk/common/data/rhnChannelArch.sql
@@ -74,6 +74,9 @@ insert into rhnChannelArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv7', 'ARMv7', lookup_arch_type('rpm'));
insert into rhnChannelArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv5', 'ARMv5', lookup_arch_type('rpm'));
+
+insert into rhnChannelArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-arm-deb', 'arm Debian', lookup_arch_type('deb'));
insert into rhnChannelArch (id, label, name, arch_type_id) values
diff --git a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
index 32e231b..ca6fa0e 100644
--- a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
@@ -77,6 +77,9 @@ insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv5tel'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-ia64-deb'), LOOKUP_PACKAGE_ARCH('all-deb'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
diff --git a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
index 4cbcf10..61262b6 100644
--- a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
@@ -79,6 +79,9 @@ insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv7'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv5'));
+
+insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('sparc-sun4m-solaris'), LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql
new file mode 100644
index 0000000..e5c4845
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql
@@ -0,0 +1,8 @@
+insert into rhnChannelArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv5', 'ARMv5', lookup_arch_type('rpm'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+
+insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+ (LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv5'));
commit fbb584e94ab6ad615f826d4c322a5de255002e87
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 27 09:59:23 2012 +0200
719609 - Add support for armv7l cpu and armv7 channels
diff --git a/schema/spacewalk/common/data/rhnChannelArch.sql b/schema/spacewalk/common/data/rhnChannelArch.sql
index 5b0bcf0..dca439c 100644
--- a/schema/spacewalk/common/data/rhnChannelArch.sql
+++ b/schema/spacewalk/common/data/rhnChannelArch.sql
@@ -71,6 +71,9 @@ insert into rhnChannelArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-powerpc-deb', 'PowerPC Debian', lookup_arch_type('deb'));
insert into rhnChannelArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv7', 'ARMv7', lookup_arch_type('rpm'));
+
+insert into rhnChannelArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-arm-deb', 'arm Debian', lookup_arch_type('deb'));
insert into rhnChannelArch (id, label, name, arch_type_id) values
diff --git a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
index f6f7611..32e231b 100644
--- a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
@@ -68,6 +68,15 @@ insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-ia64'), LOOKUP_PACKAGE_ARCH('src'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7hl'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7l'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-ia64-deb'), LOOKUP_PACKAGE_ARCH('all-deb'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
diff --git a/schema/spacewalk/common/data/rhnCpuArch.sql b/schema/spacewalk/common/data/rhnCpuArch.sql
index 18ccec3..aa8db2a 100644
--- a/schema/spacewalk/common/data/rhnCpuArch.sql
+++ b/schema/spacewalk/common/data/rhnCpuArch.sql
@@ -64,6 +64,8 @@ insert into rhnCpuArch (id, label, name) values
(sequence_nextval('rhn_cpu_arch_id_seq'), 'amd64', 'AMD64');
insert into rhnCpuArch (id, label, name) values
(sequence_nextval('rhn_cpu_arch_id_seq'), 'i86pc', 'i86pc');
+insert into rhnCpuArch (id, label, name) values
+(sequence_nextval('rhn_cpu_arch_id_seq'), 'armv7l', 'ARMv7l');
commit;
--
diff --git a/schema/spacewalk/common/data/rhnPackageArch.sql b/schema/spacewalk/common/data/rhnPackageArch.sql
index 1f449ea..0e6199f 100644
--- a/schema/spacewalk/common/data/rhnPackageArch.sql
+++ b/schema/spacewalk/common/data/rhnPackageArch.sql
@@ -72,6 +72,12 @@ insert into rhnPackageArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_package_arch_id_seq'), 'amd64', 'AMD64', lookup_arch_type('rpm'));
insert into rhnPackageArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_package_arch_id_seq'), 'i386-solaris', 'i386-solaris', lookup_arch_type('sysv-solaris'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_package_arch_id_seq'), 'armv7hl', 'ARMv7hl', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_package_arch_id_seq'), 'armv7l', 'ARMv7l', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_package_arch_id_seq'), 'armv5tel', 'ARMv5tel', lookup_arch_type('rpm'));
insert into rhnPackageArch (id, label, name, arch_type_id) values
( sequence_nextval('rhn_package_arch_id_seq'), 'nosrc', 'nosrc', lookup_arch_type('rpm') );
diff --git a/schema/spacewalk/common/data/rhnServerArch.sql b/schema/spacewalk/common/data/rhnServerArch.sql
index 27070ee..832c285 100644
--- a/schema/spacewalk/common/data/rhnServerArch.sql
+++ b/schema/spacewalk/common/data/rhnServerArch.sql
@@ -66,6 +66,10 @@ insert into rhnServerArch (id, label, name, arch_type_id) values
insert into rhnServerArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_server_arch_id_seq'), 'ppc-redhat-linux', 'ppc', lookup_arch_type('rpm'));
+
+insert into rhnServerArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_server_arch_id_seq'), 'armv7l-redhat-linux', 'armv7l', lookup_arch_type('rpm'));
+
insert into rhnServerArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_server_arch_id_seq'), 'powerpc-debian-linux', 'powerpc Debian', lookup_arch_type('deb'));
diff --git a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
index 5130813..4cbcf10 100644
--- a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
@@ -76,6 +76,9 @@ insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('ppc64pseries-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-ppc'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv7'));
+
+insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('sparc-sun4m-solaris'), LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
diff --git a/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql b/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
index 5dbd537..857ba70 100644
--- a/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
@@ -85,6 +85,10 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
lookup_sg_type('sw_mgr_entitled'));
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('sw_mgr_entitled'));
+
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
values (lookup_server_arch('s390-debian-linux'),
lookup_sg_type('sw_mgr_entitled'));
@@ -209,6 +213,10 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
lookup_sg_type('enterprise_entitled'));
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('enterprise_entitled'));
+
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
values (lookup_server_arch('s390-debian-linux'),
lookup_sg_type('enterprise_entitled'));
@@ -349,6 +357,10 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
lookup_sg_type('provisioning_entitled'));
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('provisioning_entitled'));
+
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
values (lookup_server_arch('s390-debian-linux'),
lookup_sg_type('provisioning_entitled'));
@@ -473,6 +485,10 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
lookup_sg_type('monitoring_entitled'));
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('monitoring_entitled'));
+
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
values (lookup_server_arch('s390-debian-linux'),
lookup_sg_type('monitoring_entitled'));
@@ -582,6 +598,10 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type)
values (lookup_server_arch('s390-redhat-linux'),
lookup_sg_type('virtualization_host'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('virtualization_host'));
+
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type)
values (lookup_server_arch('s390-debian-linux'),
lookup_sg_type('virtualization_host'));
@@ -626,6 +646,10 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type)
values (lookup_server_arch('i686-redhat-linux'),
lookup_sg_type('virtualization_host_platform'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('virtualization_host_platform'));
+
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type)
values (lookup_server_arch('athlon-redhat-linux'),
lookup_sg_type('virtualization_host_platform'));
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql
new file mode 100644
index 0000000..90528a3
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql
@@ -0,0 +1,44 @@
+insert into rhnChannelArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv7', 'ARMv7', lookup_arch_type('rpm'));
+
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_package_arch_id_seq'), 'armv7hl', 'ARMv7hl', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_package_arch_id_seq'), 'armv7l', 'ARMv7l', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_package_arch_id_seq'), 'armv5tel', 'ARMv5tel', lookup_arch_type('rpm'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7hl'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7l'));
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+
+insert into rhnServerArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_server_arch_id_seq'), 'armv7l-redhat-linux', 'armv7l', lookup_arch_type('rpm'));
+
+
+insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv7'));
+
+
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('sw_mgr_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('enterprise_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('provisioning_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('monitoring_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('virtualization_host'));
+
+insert into rhnCpuArch (id, label, name) values
+(sequence_nextval('rhn_cpu_arch_id_seq'), 'armv7l', 'ARMv7l');
commit 4b13792f3119f97f1240af94d7e7ca79b0d19914
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 27 09:47:33 2012 +0200
remove old comments
diff --git a/schema/spacewalk/common/data/rhnChannelArch.sql b/schema/spacewalk/common/data/rhnChannelArch.sql
index f43a041..5b0bcf0 100644
--- a/schema/spacewalk/common/data/rhnChannelArch.sql
+++ b/schema/spacewalk/common/data/rhnChannelArch.sql
@@ -84,38 +84,3 @@ insert into rhnChannelArch (id, label, name, arch_type_id) values
commit;
---
--- Revision 1.11 2004/02/19 17:40:28 misa
--- Solaris patches
---
--- Revision 1.10 2004/02/19 00:13:11 pjones
--- bugzilla: 116188 -- ia32e/amd64 support that might actually work.
---
--- Revision 1.9 2004/02/06 02:21:16 misa
--- Weird solaris arches added
---
--- Revision 1.8 2004/02/05 17:33:12 pjones
--- bugzilla: 115009 -- rhnArchType is new, and has changes to go with it
---
--- Revision 1.7 2003/10/06 14:38:07 cturner
--- make the Name column more representative of proper noun usage of arches
---
--- Revision 1.6 2003/06/09 18:16:04 misa
--- bugzilla: 86150 Added the ppc64iseries and ppc64pseries arches, plus the channel-ppc channel arch
---
--- Revision 1.5 2003/01/29 17:11:36 misa
--- bugzilla: 83022 Adding x86_64 as a supported arch
---
--- Revision 1.4 2002/11/13 22:59:59 misa
--- Added a sequence; added data
---
--- Revision 1.3 2002/11/13 00:22:11 misa
--- name -> label
--- the label becomes family_blah
---
--- Revision 1.2 2002/11/12 23:36:21 misa
--- Added rhnArchFamily and rhnArchFamilyMembers
---
--- Revision 1.1 2002/10/15 21:06:22 misa
--- Arch family
---
diff --git a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
index 25c5773..5130813 100644
--- a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
@@ -120,44 +120,3 @@ insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
commit;
---
--- Revision 1.10 2004/02/19 17:40:28 misa
--- Solaris patches
---
--- Revision 1.9 2004/02/19 00:13:11 pjones
--- bugzilla: 116188 -- ia32e/amd64 support that might actually work.
---
--- Revision 1.8 2004/02/18 23:41:04 pjones
--- bugzilla: 116188 -- ia32e
---
--- Revision 1.7 2004/02/06 02:21:16 misa
--- Weird solaris arches added
---
--- Revision 1.6 2003/06/09 18:16:04 misa
--- bugzilla: 86150 Added the ppc64iseries and ppc64pseries arches, plus the channel-ppc channel arch
---
--- Revision 1.5 2003/01/29 17:52:22 misa
--- bugzilla: 78615 Re-generated the arch compat tables from webdev
---
--- Revision 1.4 2003/01/29 17:11:36 misa
--- bugzilla: 83022 Adding x86_64 as a supported arch
---
--- Revision 1.3 2002/11/14 18:00:59 pjones
--- commits
---
--- Revision 1.2 2002/11/14 16:26:05 misa
--- Populating the table
---
--- Revision 1.1 2002/11/14 00:36:27 misa
--- Added data to rhnServerChannelArchCompat data
---
--- Revision 1.3 2002/11/13 00:22:11 misa
--- name -> label
--- the label becomes family_blah
---
--- Revision 1.2 2002/11/12 23:36:21 misa
--- Added rhnArchFamily and rhnArchFamilyMembers
---
--- Revision 1.1 2002/10/15 21:06:22 misa
--- Arch family
---
12 years
Changes to 'refs/tags/spacewalk-schema-1.8.22-1'
by Tomas Lestach
Tag 'spacewalk-schema-1.8.22-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-27 10:08 +0000
Tagging package [spacewalk-schema] version [1.8.22-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.8.56-1:
Tomas Lestach (2):
807283 - fixing postgresql schema and adding appropriate schema upgrade scripts
Automatic commit of package [spacewalk-schema] release [1.8.22-1].
root (1):
807283 - remove rhnContentSource row when delete row in oracle pkg
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/oracle/packages/rhn_org.pkb | 1
schema/spacewalk/postgres/packages/rhn_org.pkb | 3
schema/spacewalk/spacewalk-schema.spec | 8
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.oracle | 235 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.postgresql | 98 ++++
6 files changed, 344 insertions(+), 3 deletions(-)
---
12 years