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 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
| 44 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
| 8 +
4 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 4dcf2467f706b98784dcf156bda18154cf30a554
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 30 11:37:21 2012 +0200
Fix the order for the arm schema upgrade scripts.
Addressing
'SPACEWALK-SCHEMA-1.7-TO-SPACEWALK-SCHEMA-1.8/035-SUPPORT-FOR-ARMV5-CHANNEL.SQ
------------------------------------------------------------------------------
spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql
1 row created.
values (LOOKUP_CHANNEL_ARCH('channel-armv5'),
LOOKUP_PACKAGE_ARCH('armv5tel'))
*
ERROR at line 2:
ORA-20243: (package_arch_not_found) - Package architecture could not be found
ORA-06512: at "SPACEUSER0.RHN_EXCEPTION", line 31
ORA-06512: at "SPACEUSER0.LOOKUP_PACKAGE_ARCH", line 19
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
deleted file mode 100644
index e5c4845..0000000
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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'));
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
deleted file mode 100644
index 90528a3..0000000
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql
+++ /dev/null
@@ -1,44 +0,0 @@
-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');
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
new file mode 100644
index 0000000..90528a3
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-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');
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
new file mode 100644
index 0000000..e5c4845
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-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'));