rel-eng/packages/spacewalk-schema
| 2 +-
schema/spacewalk/common/data/rhnPackageArch.sql
| 2 ++
schema/spacewalk/spacewalk-schema.spec
| 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
| 4 ----
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
| 3 +++
5 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 630ad7eed8e94153dea7f226a580e4c44e976d4d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 23 09:22:41 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.37-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 02b68cb..f87de19 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.36-1 schema/spacewalk/
+1.8.37-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec
b/schema/spacewalk/spacewalk-schema.spec
index 3b6355f..d35318c 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.36
+Version: 1.8.37
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed May 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.37-1
+- 719609 - fix errors from previous ARM commits
+
* Tue May 22 2012 Jan Pazdziora 1.8.36-1
- No need to enforce unique (name_id, evr_id) on rhnVersionInfo.
commit dd0393cd730e1183e3c181248de7795144cdf07b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 23 09:22:23 2012 +0200
719609 - fix errors from previous ARM commits
diff --git a/schema/spacewalk/common/data/rhnPackageArch.sql
b/schema/spacewalk/common/data/rhnPackageArch.sql
index 2acc0bd..190fb35 100644
--- a/schema/spacewalk/common/data/rhnPackageArch.sql
+++ b/schema/spacewalk/common/data/rhnPackageArch.sql
@@ -79,6 +79,8 @@ insert into rhnPackageArch (id, label, name, arch_type_id) values
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'), 'armv6l', 'ARMv6l',
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
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
index 1bc3b30..bca7602 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
@@ -5,10 +5,6 @@ insert into rhnPackageArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_package_arch_id_seq'), 'armv7hnl',
'ARMv7hnl', 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-armhfp'),
LOOKUP_PACKAGE_ARCH('armv7hnl'));
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
index c4a1cb4..63ad54d 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
@@ -33,3 +33,6 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id,
server_group_type )
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
values (lookup_server_arch('armv5tejl-redhat-linux'),
lookup_sg_type('virtualization_host'));
+
+insert into rhnCpuArch (id, label, name) values
+(sequence_nextval('rhn_cpu_arch_id_seq'), 'armv5tejl',
'ARMv5tejl');