From f322dd5d548d02bffa6c80279924f7571441eb52 Mon Sep 17 00:00:00 2001 From: Dmitry Teselkin Date: Tue, 14 Jun 2016 18:01:32 +0300 Subject: [PATCH] Signatures for Ubuntu 16.04 and Fedora 24 Update distro_signatures.json from [0] [0] https://raw.githubusercontent.com/cobbler/cobbler.github.io/master/signatures/2.6.x/latest.json blueprint: mos-xenial Change-Id: I6f7c334a3daae0da2b912411360f3caf8fd1eddd --- ...tures-for-Ubuntu-16.04-and-Fedora-24.patch | 306 ++++++++++++++++++ cobbler.spec | 8 +- 2 files changed, 313 insertions(+), 1 deletion(-) create mode 100644 Mirantis-Signatures-for-Ubuntu-16.04-and-Fedora-24.patch diff --git a/Mirantis-Signatures-for-Ubuntu-16.04-and-Fedora-24.patch b/Mirantis-Signatures-for-Ubuntu-16.04-and-Fedora-24.patch new file mode 100644 index 0000000..56a6fe7 --- /dev/null +++ b/Mirantis-Signatures-for-Ubuntu-16.04-and-Fedora-24.patch @@ -0,0 +1,306 @@ +From 1e027d460320d9edae1642f00faa44cdf4fbdf58 Mon Sep 17 00:00:00 2001 +From: Dmitry Teselkin +Date: Tue, 14 Jun 2016 17:56:19 +0300 +Subject: [PATCH] Signatures for Ubuntu 16.04 and Fedora 24 + +Change-Id: I951a3f773b295f357b0a744064c0d11138aea9eb +--- + config/distro_signatures.json | 232 +++++++++++++++++++++++++++- + 1 file changed, 228 insertions(+), 4 deletions(-) + +diff --git a/config/distro_signatures.json b/config/distro_signatures.json +index f571614..5f5cb10 100644 +--- a/config/distro_signatures.json ++++ b/config/distro_signatures.json +@@ -55,7 +55,7 @@ + "version_file_regex":null, + "kernel_arch":"kernel-(.*).rpm", + "kernel_arch_regex":null, +- "supported_arches":["i386","x86_64","ppc","ppc64"], ++ "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"], + "supported_repo_breeds":["rsync", "rhn", "yum"], + "kernel_file":"vmlinuz(.*)", + "initrd_file":"initrd(.*)\\.img", +@@ -161,6 +161,54 @@ + "kernel_options_post":"", + "boot_files":[] + }, ++ "fedora22": { ++ "signatures":["Packages"], ++ "version_file":"(fedora)-release-22-(.*)\\.noarch\\.rpm", ++ "version_file_regex":null, ++ "kernel_arch":"kernel-(.*)\\.rpm", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"], ++ "supported_repo_breeds":["rsync", "rhn", "yum"], ++ "kernel_file":"vmlinuz(.*)", ++ "initrd_file":"initrd(.*)\\.img", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_end.ks", ++ "kernel_options":"repo=$tree", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, ++ "fedora23": { ++ "signatures":["Packages"], ++ "version_file":"(fedora)-release-23-(.*)\\.noarch\\.rpm", ++ "version_file_regex":null, ++ "kernel_arch":"kernel-(.*)\\.rpm", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"], ++ "supported_repo_breeds":["rsync", "rhn", "yum"], ++ "kernel_file":"vmlinuz(.*)", ++ "initrd_file":"initrd(.*)\\.img", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_end.ks", ++ "kernel_options":"repo=$tree", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, ++ "fedora24": { ++ "signatures":["Packages"], ++ "version_file":"(fedora)-release-24-(.*)\\.noarch\\.rpm", ++ "version_file_regex":null, ++ "kernel_arch":"kernel-(.*)\\.rpm", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"], ++ "supported_repo_breeds":["rsync", "rhn", "yum"], ++ "kernel_file":"vmlinuz(.*)", ++ "initrd_file":"initrd(.*)\\.img", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_end.ks", ++ "kernel_options":"repo=$tree", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, + "cloudlinux6": { + "signatures":["Packages"], + "version_file":"(cloudlinux)-release-(.*)\\.rpm", +@@ -226,6 +274,22 @@ + "kernel_options":"", + "kernel_options_post":"", + "boot_files":[] ++ }, ++ "stretch": { ++ "signatures":["dists"], ++ "version_file":"Release", ++ "version_file_regex":"Codename: stretch", ++ "kernel_arch":"linux-headers-(.*)\\.deb", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":["apt"], ++ "kernel_file":"vmlinuz(.*)", ++ "initrd_file":"initrd(.*)\\.gz", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample.seed", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] + } + }, + "ubuntu": { +@@ -356,6 +420,38 @@ + "kernel_options":"", + "kernel_options_post":"", + "boot_files":[] ++ }, ++ "wily": { ++ "signatures":["dists", ".disk"], ++ "version_file":"Release|mini-info", ++ "version_file_regex":"Codename: wily|Ubuntu 15.10", ++ "kernel_arch":"linux-headers-(.*)\\.deb", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":["apt"], ++ "kernel_file":"linux(.*)", ++ "initrd_file":"initrd(.*)\\.gz", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample.seed", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, ++ "xenial": { ++ "signatures":["dists", ".disk"], ++ "version_file":"Release|mini-info", ++ "version_file_regex":"Codename: xenial|Ubuntu 16.04", ++ "kernel_arch":"linux-headers-(.*)\\.deb", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":["apt"], ++ "kernel_file":"linux(.*)", ++ "initrd_file":"initrd(.*)\\.gz", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample.seed", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] + } + }, + "suse": { +@@ -471,6 +567,22 @@ + "kernel_options_post":"", + "boot_files":[] + }, ++ "opensuse13.2": { ++ "signatures":["suse"], ++ "version_file":"openSUSE-release-13.2-(.*).rpm", ++ "version_file_regex":null, ++ "kernel_arch":"kernel-(.*)\\.rpm", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","i586","x86_64"], ++ "supported_repo_breeds":["yum"], ++ "kernel_file":"(linux|vmlinuz(.*))", ++ "initrd_file":"initrd(.*)", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, + "sles10": { + "signatures":["suse"], + "version_file":"sles-release-10-(.*).rpm", +@@ -582,6 +694,22 @@ + "kernel_options":"install=$tree", + "kernel_options_post":"", + "boot_files":[] ++ }, ++ "sles12sp1": { ++ "signatures":["suse"], ++ "version_file":"(sles|SLES-for-VMware)-release-12.1-(.*).rpm", ++ "version_file_regex":null, ++ "kernel_arch":"kernel-(.*)\\.rpm", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","i586","x86_64","ppc64"], ++ "supported_repo_breeds":["yum"], ++ "kernel_file":"linux[64.gz]?", ++ "initrd_file":"initrd[64]?", ++ "isolinux_ok":false, ++ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml", ++ "kernel_options":"install=$tree", ++ "kernel_options_post":"", ++ "boot_files":[] + } + }, + "vmware": { +@@ -751,10 +879,90 @@ + "kernel_options_post":"", + "boot_files":[] + }, ++ "9.1": { ++ "signatures":["boot"], ++ "version_file":"device\\.hints", ++ "version_file_regex":"^.*FreeBSD: release/9.1(.*)/sys/(.*)/conf/GENERIC.hints.*$", ++ "kernel_arch":"device\\.hints", ++ "kernel_arch_regex":"^.*FreeBSD: release/9.1(.*)/sys/(.*)/conf/GENERIC.hints.*$", ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":[], ++ "kernel_file":"pxeboot(.*)", ++ "initrd_file":"mbr", ++ "isolinux_ok":false, ++ "default_kickstart":"", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, ++ "9.2": { ++ "signatures":["boot"], ++ "version_file":"device\\.hints", ++ "version_file_regex":"^.*FreeBSD: release/9.2(.*)/sys/(.*)/conf/GENERIC.hints.*$", ++ "kernel_arch":"device\\.hints", ++ "kernel_arch_regex":"^.*FreeBSD: release/9.2(.*)/sys/(.*)/conf/GENERIC.hints.*$", ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":[], ++ "kernel_file":"pxeboot(.*)", ++ "initrd_file":"mbr", ++ "isolinux_ok":false, ++ "default_kickstart":"", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, ++ "9.3": { ++ "signatures":["boot"], ++ "version_file":"device\\.hints", ++ "version_file_regex":"^.*FreeBSD: releng/9.3(.*)/sys/(.*)/conf/GENERIC.hints.*$", ++ "kernel_arch":"device\\.hints", ++ "kernel_arch_regex":"^.*FreeBSD: release/9.3(.*)/sys/(.*)/conf/GENERIC.hints.*$", ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":[], ++ "kernel_file":"pxeboot(.*)", ++ "initrd_file":"mbr", ++ "isolinux_ok":false, ++ "default_kickstart":"", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, + "10.0": { +- "signatures":["release"], +- "version_file":"10\\.0\\-RELEASE", +- "version_file_regex":null, ++ "signatures":["boot"], ++ "version_file":"freebsd-version", ++ "version_file_regex":"USERLAND_VERSION=\"10.0-RELEASE\"", ++ "kernel_arch":"device\\.hints", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":[], ++ "kernel_file":"base.txz", ++ "initrd_file":"base.txz", ++ "isolinux_ok":false, ++ "default_kickstart":"", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, ++ "10.1": { ++ "signatures":["boot"], ++ "version_file":"freebsd-version", ++ "version_file_regex":"USERLAND_VERSION=\"10.1-RELEASE\"", ++ "kernel_arch":"device\\.hints", ++ "kernel_arch_regex":null, ++ "supported_arches":["i386","amd64"], ++ "supported_repo_breeds":[], ++ "kernel_file":"base.txz", ++ "initrd_file":"base.txz", ++ "isolinux_ok":false, ++ "default_kickstart":"", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":[] ++ }, ++ "10.2": { ++ "signatures":["boot"], ++ "version_file":"freebsd-version", ++ "version_file_regex":"USERLAND_VERSION=\"10.2-RELEASE\"", + "kernel_arch":"device\\.hints", + "kernel_arch_regex":null, + "supported_arches":["i386","amd64"], +@@ -800,6 +1008,22 @@ + "kernel_options":"", + "kernel_options_post":"", + "boot_files":["install.img"] ++ }, ++ "xenserver650": { ++ "signatures":["packages.xenserver"], ++ "version_file":"^XS-REPOSITORY$", ++ "version_file_regex":"^.*product=\"XenServer\" version=\"6\\.5\\.([0-9]+)\".*$", ++ "kernel_arch":"xen\\.gz", ++ "kernel_arch_regex":"^.*(x86_64).*$", ++ "supported_arches":["x86_64"], ++ "supported_repo_breeds":[], ++ "kernel_file":"mboot\\.c32", ++ "initrd_file":"xen\\.gz", ++ "isolinux_ok":false, ++ "default_kickstart":"", ++ "kernel_options":"", ++ "kernel_options_post":"", ++ "boot_files":["install.img"] + } + }, + "unix": { +-- +1.9.1 + diff --git a/cobbler.spec b/cobbler.spec index 63676e3..ef214d6 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -16,7 +16,7 @@ Name: cobbler License: GPLv2+ AutoReq: no Version: 2.6.9 -Release: 1%{?dist}~mos10 +Release: 1%{?dist}~mos11 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424 Patch0: cobbler-virtinstall.patch @@ -28,6 +28,8 @@ Patch1: cobbler-centos.patch Patch2: cobbler-django17.patch # Add ALLOWED_HOSTS into djando settings Patch3: Mirantis-Add-ALLOWED_HOSTS-for-settings.patch +# Add signatures for Ubuntu 16.04 and Fedora 24 +Patch4: Mirantis-Signatures-for-Ubuntu-16.04-and-Fedora-24.patch Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -93,6 +95,7 @@ other applications. %if 0%{?fedora} >= 22 || 0%{?rhel} >= 6 %patch2 -p1 -b .django17 %patch3 -p1 +%patch4 -p1 %endif %build @@ -288,6 +291,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/ %changelog +* Tue Jun 13 2016 Dmitry Teselkkin - 2.6.9-1~mos11 +- Add patch to add signatures for Ubuntu 16.04 + * Thu May 19 2016 Ivan Suzdal - 2.6.9-1~mos10 - Add patch to fix 'error 400' for cobbler-web (LP: #1583648) - Bump version -- 2.32.3