diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e11f9f4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/osinfo-db-20170423.tar.xz diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata new file mode 100644 index 0000000..0b32918 --- /dev/null +++ b/.osinfo-db.metadata @@ -0,0 +1 @@ +e737d91ef8610cd844c760e1c9e43dfbacc6d73d SOURCES/osinfo-db-20170423.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/add-rhel7.4-data.patch b/SOURCES/add-rhel7.4-data.patch new file mode 100644 index 0000000..be8a841 --- /dev/null +++ b/SOURCES/add-rhel7.4-data.patch @@ -0,0 +1,157 @@ +From 312ea8ca6a4880782a73eb577f6926a1f8b1d9be Mon Sep 17 00:00:00 2001 +From: Felipe Borges <feborges@redhat.com> +Date: Mon, 26 Jun 2017 16:56:47 +0200 +Subject: [PATCH] rhel: Add RHEL 7.4 info + +--- + os/redhat.com/rhel-7.4.xml | 97 +++++++++++++++++++++++++++++++++++++++++ + os/redhat.com/rhl-7.4.xml | 32 ++++++++++++++ + 2 files changed, 129 insertions(+) + create mode 100644 os/redhat.com/rhel-7.4.xml + create mode 100644 os/redhat.com/rhl-7.4.xml + +diff --git a/os/redhat.com/rhel-7.4.xml b/os/redhat.com/rhel-7.4.xml +new file mode 100644 +index 0000000..da5077d +--- /dev/null ++++ b/os/redhat.com/rhel-7.4.xml +@@ -0,0 +1,97 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<libosinfo version="0.0.1"> ++ ++ <os id="http://redhat.com/rhel/7.4"> ++ <short-id>rhel7.4</short-id> ++ <name>Red Hat Enterprise Linux 7.4</name> ++ <version>7.4</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhel</distro> ++ <codename>Maipo</codename> ++ <upgrades id="http://redhat.com/rhel/7.3"/> ++ <derives-from id="http://redhat.com/rhel/7.3"/> ++ ++ ++ ++ <media arch="x86_64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>.*RHEL-7.4.*x86_64.*</volume-id> ++ </iso> ++ <kernel>isolinux/vmlinuz</kernel> ++ <initrd>isolinux/initrd.img</initrd> ++ </media> ++ ++ <media arch="aarch64"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.4.*aarch64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL-7.4.*ppc64$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="ppc64le"> ++ <iso> ++ <system-id>PPC</system-id> ++ <volume-id>RHEL-7.4.*ppc64le$</volume-id> ++ </iso> ++ </media> ++ ++ <media arch="s390x"> ++ <iso> ++ <system-id>LINUX</system-id> ++ <volume-id>RHEL-7.4.*s390x$</volume-id> ++ </iso> ++ </media> ++ ++ <resources arch="ppc64"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>2147483648</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>400000000</cpu> ++ <ram>2147483648</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <resources arch="all"> ++ <minimum> ++ <n-cpus>1</n-cpus> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ ++ <recommended> ++ <cpu>400000000</cpu> ++ <ram>1073741824</ram> ++ <storage>9663676416</storage> ++ </recommended> ++ </resources> ++ ++ <installer> ++ <script id='http://redhat.com/rhel/kickstart/jeos'/> ++ <script id='http://redhat.com/rhel/kickstart/desktop'/> ++ </installer> ++ </os> ++</libosinfo> +\ No newline at end of file +diff --git a/os/redhat.com/rhl-7.4.xml b/os/redhat.com/rhl-7.4.xml +new file mode 100644 +index 0000000..231c615 +--- /dev/null ++++ b/os/redhat.com/rhl-7.4.xml +@@ -0,0 +1,32 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<libosinfo version="0.0.1"> ++ ++ <os id="http://redhat.com/rhl/7.4"> ++ <short-id>rhl7.4</short-id> ++ <name>Red Hat Linux 7.3</name> ++ <name xml:lang="ca">Red Hat Linux 7.4</name> ++ <name xml:lang="de">Red Hat Linux 7.4</name> ++ <name xml:lang="es">Red Hat Linux 7.4</name> ++ <name xml:lang="fr">Red Hat Linux 7.4</name> ++ <name xml:lang="ja">Red Hat Linux 7.4</name> ++ <name xml:lang="pl">Red Hat Linux 7.4</name> ++ <name xml:lang="pt_BR">Red Hat Linux 7.4</name> ++ <name xml:lang="uk">Red Hat Linux 7.4</name> ++ <version>7.4</version> ++ <vendor>Red Hat, Inc</vendor> ++ <vendor xml:lang="ca">Red Hat, Inc</vendor> ++ <vendor xml:lang="de">Red Hat, Inc</vendor> ++ <vendor xml:lang="es">Red Hat, Inc</vendor> ++ <vendor xml:lang="fr">Red Hat, Inc</vendor> ++ <vendor xml:lang="ja">Red Hat, Inc</vendor> ++ <vendor xml:lang="pl">Red Hat, Inc</vendor> ++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor> ++ <vendor xml:lang="uk">Red Hat, Inc</vendor> ++ <family>linux</family> ++ <distro>rhl</distro> ++ <codename>Maipo</codename> ++ <upgrades id="http://redhat.com/rhl/7.3"/> ++ <derives-from id="http://redhat.com/rhl/7.3"/> ++ ++ </os> ++</libosinfo> +-- +2.13.0 + diff --git a/SOURCES/osinfo-db-20170423.tar.xz.asc b/SOURCES/osinfo-db-20170423.tar.xz.asc new file mode 100644 index 0000000..df43fc0 --- /dev/null +++ b/SOURCES/osinfo-db-20170423.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABCAAGBQJY/H1WAAoJEO6SbCvazBd72pQP/iMr451gPTYAbCuLwDDVtjeX +kpx/xI2df0XxYHwBKbmrvpt2AyFpq2wYLHwcYR4dVuPHTFn/xGcUuXzocvtf1PGl +oyKByldoAAL3nvp9lF7X1Zc2SoGKtdwY60hIcAQoOuzc2kWydV45O1N97C7I7q5F +mbiL79SwG7qMjfJMtFPaxhGumztWXFzEPKLTR6kMtD5N2QbBsPwtLw65QHoySkKj +orS9HCsKFmCtBz09Uceq/47Ca8aZzBFlYkG/nuo6SsGapy7m5NvccnekyNd9uRML +o4P+qi1C6n1XPrAJwmjmdv0agMNyJeje0taEc340z4Aftp4rJyrlUKoD8l9uMcJb +391T6NB+UafqnjIQiXjOsIXiOmNKLscfvPY36hUwYBLlQEBxhLjfpizjcYe1raIT +RWumlGWqQZEI140vsnzChYZ9pCJw/DGq4g52Jt2fYFkcg0S/bboxAoORHbNwAHnm +aF9rq4ogQuJG64t9b8WH8kk2OJGa1MI7OK1wjvvQSptNB0hui8iGQuTXGb/KOnAt +WNCiwTT7DDDKVcOcoDfSRXjZARPUUh9AlJRRgCjKrIYAkjzs9Slhhy5JgLRNTWnZ +6jCemB6KutnPqOWI4LT3n1X7xJtj5xbIdV/DKf75oMeRij2jG+a3SYdR6glAxmNH +hFri8u0d8Zgmcxj4wKQf +=GAUA +-----END PGP SIGNATURE----- diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec new file mode 100644 index 0000000..6a08d24 --- /dev/null +++ b/SPECS/osinfo-db.spec @@ -0,0 +1,95 @@ +# -*- rpm-spec -*- + +%define PatchedSource ../%{name}-%{version}-patched.tar.xz + +Summary: osinfo database files +Name: osinfo-db +Version: 20170423 +Release: 2%{?dist} +License: LGPLv2+ +Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz +Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc +URL: http://libosinfo.org/ +BuildRequires: intltool +BuildRequires: osinfo-db-tools +BuildArch: noarch +Requires: hwdata + +Patch0: add-rhel7.4-data.patch + +%description +The osinfo database provides information about operating systems and +hypervisor platforms to facilitate the automated configuration and +provisioning of new virtual machines + +%prep +%setup -q +%patch0 -p1 -b .add-rhel7.4-data + +# For us to be able to apply patches on top of a rebase, +# we: +# 1. unpack the sources +# 2. patch the sources +# 3. pack the sources in a tarball +# 4. feed the patched tarball to osinfo-db-import +%build +tar -cvJf %{PatchedSource} ../%{name}-%{version}/ + +%install +osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource} + +%files +%dir %{_datadir}/osinfo/ +%{_datadir}/osinfo/VERSION +%{_datadir}/osinfo/LICENSE +%{_datadir}/osinfo/datamap +%{_datadir}/osinfo/device +%{_datadir}/osinfo/os +%{_datadir}/osinfo/platform +%{_datadir}/osinfo/install-script +%{_datadir}/osinfo/schema + +%changelog +* Tue Jun 27 2017 Felipe Borges <feborges@redhat.com> - 20170423-2 +- Make this spec file patchable +- Add RHEL 7.4 data +- Resolves: rhbz#1462641 + +* Tue Jun 6 2017 Fabiano Fidêncio <fidencio@redhat.com> - 20170423-1 +- Update osinfo-db to a new release +- Resolves: rhbz#1456950, rhbz#1456947 + +* Wed May 31 2017 Felipe Borges <feborges@redhat.com> - 20170225-3 +- Fedora/RHEL passwords must be wrapped by a single quote +- Resolves: rhbz#1456950 + +* Wed May 31 2017 Felipe Borges <feborges@redhat.com> - 20170225-2 +- Add RHEL-6.9 and RHEL-7.3 info +- Resolves: rhbz#1456947 + +* Sat Feb 25 2017 Fabiano Fidêncio <fabiano@fidencio.org> - 20170225-1 +- Update to new release + +* Sat Feb 11 2017 Fabiano Fidêncio <fabiano@fidencio.org> - 20170211-1 +- Update to new release + +* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170121-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jan 21 2017 Fabiano Fidêncio <fabiano@fidencio.org> - 20170121-2 +- 20170121-1 used an incorrect tarball + +* Sat Jan 21 2017 Fabiano Fidêncio <fabiano@fidencio.org> - 20170121-1 +- Update to new release + +* Sat Jan 14 2017 Fabiano Fidêncio <fabiano@fidencio.org> - 20170114-1 +- Update to new release + +* Sat Jan 07 2017 Fabiano Fidêncio <fabiano@fidencio.org> - 20170107-1 +- Update to new release + +* Wed Oct 26 2016 Daniel P. Berrange <berrange@redhat.com> - 20161026-1 +- Update to new release + +* Fri Jul 29 2016 Daniel P. Berrange <berrange@redhat.com> - 20160728-1 +- Initial package after split from libosinfo (rhbz #1361596)