Changes to 'refs/tags/spacewalk-schema-1.8.37-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.8.37-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-05-23 07:22 +0000
Tagging package [spacewalk-schema] version [1.8.37-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.8.28-1:
Miroslav Suchý (2):
719609 - fix errors from previous ARM commits
Automatic commit of package [spacewalk-schema] release [1.8.37-1].
---
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(-)
---
11 years, 12 months
2 commits - rel-eng/packages schema/spacewalk
by Miroslav Suchý
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');
11 years, 12 months
Changes to 'refs/tags/spacewalk-backend-1.8.28-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-05-22 14:02 +0000
Tagging package [spacewalk-backend] version [1.8.28-1] in directory [backend/].
Changes since spacewalk-schema-1.8.36-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.8.28-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 12 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4241f57ef888611f3d7b9c62e23c094b4d6ad70f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 22 16:02:45 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.28-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4f1aa23..c54e05c 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.27
+Version: 1.8.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -655,6 +655,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue May 22 2012 Jan Pazdziora 1.8.28-1
+- decode unicode string on IDN machines
+- %%defattr is not needed since rpm 4.4
+
* Fri May 18 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.27-1
- 822620 - lookup packages only from correct org
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index c86b101..4235a16 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.27-1 backend/
+1.8.28-1 backend/
11 years, 12 months
Changes to 'refs/tags/spacewalk-schema-1.8.36-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.36-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-05-22 14:01 +0000
Tagging package [spacewalk-schema] version [1.8.36-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.8.35-1:
Jan Pazdziora (3):
No need to enforce unique (name_id, evr_id) on rhnVersionInfo.
Schema upgrade script for the rhn_versioninfo_nid_eid_uq drop.
Automatic commit of package [spacewalk-schema] release [1.8.36-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/rhnVersionInfo.sql | 6 +-----
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhn_versioninfo_nid_eid_uq-drop.sql | 3 +++
4 files changed, 9 insertions(+), 7 deletions(-)
---
11 years, 12 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 00e643341420434dae4947d0e76a46ddbcfcb14a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 22 16:01:41 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.36-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 008a086..02b68cb 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.35-1 schema/spacewalk/
+1.8.36-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 3d544c1..3b6355f 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.35
+Version: 1.8.36
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue May 22 2012 Jan Pazdziora 1.8.36-1
+- No need to enforce unique (name_id, evr_id) on rhnVersionInfo.
+
* Tue May 22 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.35-1
- 719609 - set priorities between server and package arch
- 719609 - allow upgrade from arm to noarch and vice versa
11 years, 12 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhn_versioninfo_nid_eid_uq-drop.sql | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 8af976dad4ca8fb0590cdd4b96bb5470e599914d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 22 15:58:08 2012 +0200
Schema upgrade script for the rhn_versioninfo_nid_eid_uq drop.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhn_versioninfo_nid_eid_uq-drop.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhn_versioninfo_nid_eid_uq-drop.sql
new file mode 100644
index 0000000..7d34fa7
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhn_versioninfo_nid_eid_uq-drop.sql
@@ -0,0 +1,3 @@
+
+drop index rhn_versioninfo_nid_eid_uq;
+
11 years, 12 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnVersionInfo.sql | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit ba62fa6d93cee444a80d1892a993af441bbe5310
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 22 15:58:08 2012 +0200
No need to enforce unique (name_id, evr_id) on rhnVersionInfo.
diff --git a/schema/spacewalk/common/tables/rhnVersionInfo.sql b/schema/spacewalk/common/tables/rhnVersionInfo.sql
index 96f1a10..280a8f0 100644
--- a/schema/spacewalk/common/tables/rhnVersionInfo.sql
+++ b/schema/spacewalk/common/tables/rhnVersionInfo.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008--2010 Red Hat, Inc.
+-- Copyright (c) 2008--2011 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -35,7 +35,3 @@ CREATE UNIQUE INDEX rhn_versioninfo_label_uq
ON rhnVersionInfo (label)
TABLESPACE [[64k_tbs]];
-CREATE UNIQUE INDEX rhn_versioninfo_nid_eid_uq
- ON rhnVersionInfo (name_id, evr_id)
- TABLESPACE [[64k_tbs]];
-
11 years, 12 months
Changes to 'refs/tags/spacewalk-schema-1.8.35-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.8.35-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-05-22 12:30 +0000
Tagging package [spacewalk-schema] version [1.8.35-1] in directory [schema/spacewalk/].
Changes since spacewalk-utils-1.8.15-1:
Miroslav Suchý (6):
decode unicode string on IDN machines
719609 - for arm create channel-armhfp and channel-arm
719609 - add support for server arch armv5tejl
719609 - allow upgrade from arm to noarch and vice versa
719609 - set priorities between server and package arch
Automatic commit of package [spacewalk-schema] release [1.8.35-1].
---
backend/common/rhnMail.py | 2
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnChannelArch.sql | 4 -
schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql | 14 ++--
schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql | 15 ++++
schema/spacewalk/common/data/rhnServerArch.sql | 3
schema/spacewalk/common/data/rhnServerChannelArchCompat.sql | 7 +-
schema/spacewalk/common/data/rhnServerPackageArchCompat.sql | 34 ++++++++++
schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql | 24 +++++++
schema/spacewalk/spacewalk-schema.spec | 8 ++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql | 12 +--
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql | 33 ++++++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/049-rhnPackageUpgradeArchCompat.sql | 15 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql | 32 +++++++++
14 files changed, 180 insertions(+), 25 deletions(-)
---
11 years, 12 months
5 commits - rel-eng/packages schema/spacewalk
by Miroslav Suchý
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnChannelArch.sql | 4 -
schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql | 14 ++--
schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql | 15 ++++
schema/spacewalk/common/data/rhnServerArch.sql | 3
schema/spacewalk/common/data/rhnServerChannelArchCompat.sql | 7 +-
schema/spacewalk/common/data/rhnServerPackageArchCompat.sql | 34 ++++++++++
schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql | 24 +++++++
schema/spacewalk/spacewalk-schema.spec | 8 ++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql | 12 +--
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql | 33 ++++++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/049-rhnPackageUpgradeArchCompat.sql | 15 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql | 32 +++++++++
13 files changed, 178 insertions(+), 25 deletions(-)
New commits:
commit 3a2effb84dfd8c528f0643b7215df89709cb3d5d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 22 14:30:28 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.35-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 935a008..008a086 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.34-1 schema/spacewalk/
+1.8.35-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index af922dc..3d544c1 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.34
+Version: 1.8.35
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue May 22 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.35-1
+- 719609 - set priorities between server and package arch
+- 719609 - allow upgrade from arm to noarch and vice versa
+- 719609 - add support for server arch armv5tejl
+- 719609 - for arm create channel-armhfp and channel-arm
+
* Mon May 21 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.34-1
- 822918 - fix various issues in PG variant of rhn_channel.convert_to_fve
- Disable rhn_srv_net_iface_mod_trig while updating rhnServerNetInterface, so
commit 4b620e3578d4307ded234cc2533f47c32954dad2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 22 14:25:02 2012 +0200
719609 - set priorities between server and package arch
diff --git a/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql b/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql
index 72b72f9..228688d 100644
--- a/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql
@@ -83,6 +83,40 @@ insert into rhnServerPackageArchCompat
insert into rhnServerPackageArchCompat
(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv7hnl'), 0);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv7hl'), 10);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv7l'), 20);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv6l'), 30);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv5tel'), 40);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
+
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv5tejl-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv5tel'), 0);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv5tejl-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
+
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
(LOOKUP_SERVER_ARCH('athlon-redhat-linux'), LOOKUP_PACKAGE_ARCH('athlon'), 0);
insert into rhnServerPackageArchCompat
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql
new file mode 100644
index 0000000..4f4b0b4
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql
@@ -0,0 +1,32 @@
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv7hnl'), 0);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv7hl'), 10);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv7l'), 20);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv6l'), 30);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv5tel'), 40);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv7-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
+
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv5tejl-redhat-linux'), LOOKUP_PACKAGE_ARCH('armv5tel'), 0);
+
+insert into rhnServerPackageArchCompat
+(server_arch_id, package_arch_id, preference) values
+(LOOKUP_SERVER_ARCH('armv5tejl-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
commit 2b188061205088792c99c233df907d789a617d9a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 22 14:02:16 2012 +0200
719609 - allow upgrade from arm to noarch and vice versa
diff --git a/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql
index 0adaf12..64e15ac 100644
--- a/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql
@@ -77,6 +77,21 @@ insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_i
insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64pseries'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64pseries'), LOOKUP_PACKAGE_ARCH('ppc64pseries'), current_timestamp, current_timestamp);
insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc64pseries'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv7l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7l'), LOOKUP_PACKAGE_ARCH('armv7l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7l'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv6l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6l'), LOOKUP_PACKAGE_ARCH('armv6l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6l'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv5tel'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv5tel'), LOOKUP_PACKAGE_ARCH('armv5tel'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv5tel'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv7hl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hl'), LOOKUP_PACKAGE_ARCH('armv7hl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hl'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv7hnl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hnl'), LOOKUP_PACKAGE_ARCH('armv7hnl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hnl'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), current_timestamp, current_timestamp);
insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris'), LOOKUP_PACKAGE_ARCH('sparc-solaris'), current_timestamp, current_timestamp);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/049-rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/049-rhnPackageUpgradeArchCompat.sql
new file mode 100644
index 0000000..00311db
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/049-rhnPackageUpgradeArchCompat.sql
@@ -0,0 +1,15 @@
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv7l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7l'), LOOKUP_PACKAGE_ARCH('armv7l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7l'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv6l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6l'), LOOKUP_PACKAGE_ARCH('armv6l'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6l'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv5tel'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv5tel'), LOOKUP_PACKAGE_ARCH('armv5tel'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv5tel'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv7hl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hl'), LOOKUP_PACKAGE_ARCH('armv7hl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hl'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv7hnl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hnl'), LOOKUP_PACKAGE_ARCH('armv7hnl'), current_timestamp, current_timestamp);
+insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7hnl'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);
commit 1aa128db621ec9cdc068e5c3e5d7edf04b4305e0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 22 13:55:36 2012 +0200
719609 - add support for server arch armv5tejl
diff --git a/schema/spacewalk/common/data/rhnServerArch.sql b/schema/spacewalk/common/data/rhnServerArch.sql
index 832c285..d9baefc 100644
--- a/schema/spacewalk/common/data/rhnServerArch.sql
+++ b/schema/spacewalk/common/data/rhnServerArch.sql
@@ -71,6 +71,9 @@ 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'), 'armv5tejl-redhat-linux', 'armv5tejl', 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'));
insert into rhnServerArch (id, label, name, arch_type_id) values
diff --git a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
index ccbcec8..5cb37bc 100644
--- a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
@@ -82,6 +82,9 @@ insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+(LOOKUP_SERVER_ARCH('armv5tejl-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm'));
+
+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 857ba70..8596ff5 100644
--- a/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
@@ -89,6 +89,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('armv5tejl-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'));
@@ -217,6 +221,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('armv5tejl-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'));
@@ -361,6 +369,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('armv5tejl-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'));
@@ -489,6 +501,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('armv5tejl-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'));
@@ -602,6 +618,10 @@ 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('armv5tejl-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'));
@@ -650,6 +670,10 @@ 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('armv5tejl-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/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 0a655fd..c4a1cb4 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
@@ -10,5 +10,26 @@ insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('noarch'));
+insert into rhnServerArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_server_arch_id_seq'), 'armv5tejl-redhat-linux', 'armv5tejl', lookup_arch_type('rpm'));
+
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm'));
+insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+ (LOOKUP_SERVER_ARCH('armv5tejl-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm'));
+
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv5tejl-redhat-linux'),
+ lookup_sg_type('sw_mgr_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv5tejl-redhat-linux'),
+ lookup_sg_type('enterprise_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv5tejl-redhat-linux'),
+ lookup_sg_type('provisioning_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv5tejl-redhat-linux'),
+ lookup_sg_type('monitoring_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv5tejl-redhat-linux'),
+ lookup_sg_type('virtualization_host'));
commit 793c737eb9f6d050e2ae8a356ae948108e5db2b1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 22 13:43:57 2012 +0200
719609 - for arm create channel-armhfp and channel-arm
follow https://bugzilla.redhat.com/show_bug.cgi?id=719609#c14
diff --git a/schema/spacewalk/common/data/rhnChannelArch.sql b/schema/spacewalk/common/data/rhnChannelArch.sql
index 14839bc..2f79fe0 100644
--- a/schema/spacewalk/common/data/rhnChannelArch.sql
+++ b/schema/spacewalk/common/data/rhnChannelArch.sql
@@ -71,10 +71,10 @@ 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'));
+(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-arm', 'ARM soft. FP', 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'));
+(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armhfp', 'ARM hard. FP', 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'));
diff --git a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
index 66066c6..def2986 100644
--- a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql
@@ -68,25 +68,25 @@ 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('noarch'));
+values (LOOKUP_CHANNEL_ARCH('channel-armhfp'), LOOKUP_PACKAGE_ARCH('armv7hl'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
-values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7hnl'));
+values (LOOKUP_CHANNEL_ARCH('channel-armhfp'), LOOKUP_PACKAGE_ARCH('armv7hnl'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
-values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7hl'));
+values (LOOKUP_CHANNEL_ARCH('channel-armhfp'), LOOKUP_PACKAGE_ARCH('noarch'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
-values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7l'));
+values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('noarch'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
-values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv5tel'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
-values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('noarch'));
+values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv6l'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
-values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv7l'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-ia64-deb'), LOOKUP_PACKAGE_ARCH('all-deb'));
diff --git a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
index 61262b6..ccbcec8 100644
--- a/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerChannelArchCompat.sql
@@ -76,10 +76,10 @@ 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'));
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armhfp'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
-(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv5'));
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('sparc-sun4m-solaris'), LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'));
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 e6a61c2..1bc3b30 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
@@ -1,5 +1,5 @@
insert into rhnChannelArch (id, label, name, arch_type_id) values
- (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv7', 'ARMv7', lookup_arch_type('rpm'));
+ (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armhfp', 'ARM hard. FP', lookup_arch_type('rpm'));
insert into rhnPackageArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_package_arch_id_seq'), 'armv7hnl', 'ARMv7hnl', lookup_arch_type('rpm'));
@@ -11,13 +11,9 @@ 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('armv7hnl'));
+ values (LOOKUP_CHANNEL_ARCH('channel-armhfp'), LOOKUP_PACKAGE_ARCH('armv7hnl'));
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'));
+ values (LOOKUP_CHANNEL_ARCH('channel-armhfp'), LOOKUP_PACKAGE_ARCH('armv7hl'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('noarch'));
@@ -26,7 +22,7 @@ insert into rhnServerArch (id, label, name, arch_type_id) values
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
-(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv7'));
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armhfp'));
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
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 fc2cd42..0a655fd 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
@@ -1,10 +1,14 @@
insert into rhnChannelArch (id, label, name, arch_type_id) values
- (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv5', 'ARMv5', lookup_arch_type('rpm'));
+ (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-arm', 'ARM soft. FP', lookup_arch_type('rpm'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
- values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+ values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv7l'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
- values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('noarch'));
+ values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv6l'));
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('noarch'));
insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
- (LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv5'));
+ (LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm'));
11 years, 12 months