rel-eng/packages/spacewalk-schema | 2 - schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql | 3 + schema/spacewalk/common/data/rhnPackageArch.sql | 2 + schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql | 3 + schema/spacewalk/spacewalk-schema.spec | 6 ++- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql | 17 ++++++++++ 6 files changed, 31 insertions(+), 2 deletions(-)

New commits: commit d3934f6561c829add6ac0109d2e49da4a12b62bb Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 11:29:00 2013 +0100

Automatic commit of package [spacewalk-schema] release [2.1.30-1].

diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 03b9653..fe3ae16 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.29-1 schema/spacewalk/ +2.1.30-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index f594dcb..55bfa29 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server

-Version: 2.1.29 +Version: 2.1.30 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz

@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql*

%changelog +* Mon Dec 02 2013 Michael Mraka michael.mraka@redhat.com 2.1.30-1 +- 1034742 - schema upgrade for armv6hl arch +- 1034742 - support for new Raspberry Pi arch (armv6hl) + * Fri Nov 29 2013 Michael Mraka michael.mraka@redhat.com 2.1.29-1 - 1034742 - support for new Raspberry Pi arch (armv6hl)

commit f68c8cd7dc286a9062783580379b051092a7aa52 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 11:27:48 2013 +0100

1034742 - schema upgrade for armv6hl arch

tables missed in commit 18d44b300cf14ca32d689cbc74a4113fb2f75ec8

diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql index e1fa8ef..4f11cf2 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql @@ -1,9 +1,26 @@ insert into rhnCpuArch (id, label, name) values (sequence_nextval('rhn_cpu_arch_id_seq'), 'armv6hl', 'ARMv6hl');

+ +insert into rhnPackageArch (id, label, name, arch_type_id) values +(sequence_nextval('rhn_package_arch_id_seq'), 'armv6hl', 'ARMv6hl', lookup_arch_type('rpm')); + + insert into rhnServerArch (id, label, name, arch_type_id) values (sequence_nextval('rhn_server_arch_id_seq'), 'armv6hl-redhat-linux', 'armv6hl', lookup_arch_type('rpm'));

+ +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv6hl'), current_timestamp, current_timestamp); + +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), LOOKUP_PACKAGE_ARCH('armv6hl'), current_timestamp, current_timestamp); + +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp); + + +insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) +values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv6hl')); + + insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values (LOOKUP_SERVER_ARCH('armv6hl-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm'));

commit 90a63199001136dd5a8abdd03803a6cd33c89c33 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 11:20:13 2013 +0100

1034742 - support for new Raspberry Pi arch (armv6hl)

more lookup tables missed in commit f00b51cb858aab62a1d32b2435a118aeb4a43079

diff --git a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql index 8e5817c..684cd64 100644 --- a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql +++ b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql @@ -83,6 +83,9 @@ 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('armv6hl')); + +insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv6l'));

insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) diff --git a/schema/spacewalk/common/data/rhnPackageArch.sql b/schema/spacewalk/common/data/rhnPackageArch.sql index 16dfc3a..d36fc1c 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'), 'armv6hl', 'ARMv6hl', 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')); diff --git a/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql index d9c87f9..9da33a8 100644 --- a/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql +++ b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql @@ -80,6 +80,9 @@ 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('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('armv6hl'), current_timestamp, current_timestamp); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), LOOKUP_PACKAGE_ARCH('armv6hl'), current_timestamp, current_timestamp); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), 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);