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

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 (file)
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 <dteselkin@mirantis.com>
+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,\r
+     "kernel_arch":"kernel-(.*).rpm",\r
+     "kernel_arch_regex":null,\r
+-    "supported_arches":["i386","x86_64","ppc","ppc64"],\r
++    "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"],\r
+     "supported_repo_breeds":["rsync", "rhn", "yum"],\r
+     "kernel_file":"vmlinuz(.*)",\r
+     "initrd_file":"initrd(.*)\\.img",\r
+@@ -161,6 +161,54 @@
+     "kernel_options_post":"",\r
+     "boot_files":[]\r
+    },\r
++   "fedora22": {\r
++    "signatures":["Packages"],\r
++    "version_file":"(fedora)-release-22-(.*)\\.noarch\\.rpm",\r
++    "version_file_regex":null,\r
++    "kernel_arch":"kernel-(.*)\\.rpm",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"],\r
++    "supported_repo_breeds":["rsync", "rhn", "yum"],\r
++    "kernel_file":"vmlinuz(.*)",\r
++    "initrd_file":"initrd(.*)\\.img",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_end.ks",\r
++    "kernel_options":"repo=$tree",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
++   "fedora23": {\r
++    "signatures":["Packages"],\r
++    "version_file":"(fedora)-release-23-(.*)\\.noarch\\.rpm",\r
++    "version_file_regex":null,\r
++    "kernel_arch":"kernel-(.*)\\.rpm",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"],\r
++    "supported_repo_breeds":["rsync", "rhn", "yum"],\r
++    "kernel_file":"vmlinuz(.*)",\r
++    "initrd_file":"initrd(.*)\\.img",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_end.ks",\r
++    "kernel_options":"repo=$tree",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
++   "fedora24": {\r
++    "signatures":["Packages"],\r
++    "version_file":"(fedora)-release-24-(.*)\\.noarch\\.rpm",\r
++    "version_file_regex":null,\r
++    "kernel_arch":"kernel-(.*)\\.rpm",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","x86_64","ppc","ppc64","ppc64le"],\r
++    "supported_repo_breeds":["rsync", "rhn", "yum"],\r
++    "kernel_file":"vmlinuz(.*)",\r
++    "initrd_file":"initrd(.*)\\.img",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_end.ks",\r
++    "kernel_options":"repo=$tree",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
+    "cloudlinux6": {\r
+     "signatures":["Packages"],\r
+     "version_file":"(cloudlinux)-release-(.*)\\.rpm",\r
+@@ -226,6 +274,22 @@
+     "kernel_options":"",\r
+     "kernel_options_post":"",\r
+     "boot_files":[]\r
++   },\r
++   "stretch": {\r
++    "signatures":["dists"],\r
++    "version_file":"Release",\r
++    "version_file_regex":"Codename: stretch",\r
++    "kernel_arch":"linux-headers-(.*)\\.deb",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":["apt"],\r
++    "kernel_file":"vmlinuz(.*)",\r
++    "initrd_file":"initrd(.*)\\.gz",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample.seed",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
+    }\r
+   },\r
+   "ubuntu": {\r
+@@ -356,6 +420,38 @@
+     "kernel_options":"",\r
+     "kernel_options_post":"",\r
+     "boot_files":[]\r
++   },\r
++   "wily": {\r
++    "signatures":["dists", ".disk"],\r
++    "version_file":"Release|mini-info",\r
++    "version_file_regex":"Codename: wily|Ubuntu 15.10",\r
++    "kernel_arch":"linux-headers-(.*)\\.deb",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":["apt"],\r
++    "kernel_file":"linux(.*)",\r
++    "initrd_file":"initrd(.*)\\.gz",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample.seed",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
++   "xenial": {\r
++    "signatures":["dists", ".disk"],\r
++    "version_file":"Release|mini-info",\r
++    "version_file_regex":"Codename: xenial|Ubuntu 16.04",\r
++    "kernel_arch":"linux-headers-(.*)\\.deb",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":["apt"],\r
++    "kernel_file":"linux(.*)",\r
++    "initrd_file":"initrd(.*)\\.gz",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample.seed",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
+    }\r
+   },\r
+   "suse": {\r
+@@ -471,6 +567,22 @@
+     "kernel_options_post":"",\r
+     "boot_files":[]\r
+    },\r
++   "opensuse13.2": {\r
++    "signatures":["suse"],\r
++    "version_file":"openSUSE-release-13.2-(.*).rpm",\r
++    "version_file_regex":null,\r
++    "kernel_arch":"kernel-(.*)\\.rpm",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","i586","x86_64"],\r
++    "supported_repo_breeds":["yum"],\r
++    "kernel_file":"(linux|vmlinuz(.*))",\r
++    "initrd_file":"initrd(.*)",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
+    "sles10": {\r
+     "signatures":["suse"],\r
+     "version_file":"sles-release-10-(.*).rpm",\r
+@@ -582,6 +694,22 @@
+     "kernel_options":"install=$tree",\r
+     "kernel_options_post":"",\r
+     "boot_files":[]\r
++   },\r
++   "sles12sp1": {\r
++    "signatures":["suse"],\r
++    "version_file":"(sles|SLES-for-VMware)-release-12.1-(.*).rpm",\r
++    "version_file_regex":null,\r
++    "kernel_arch":"kernel-(.*)\\.rpm",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","i586","x86_64","ppc64"],\r
++    "supported_repo_breeds":["yum"],\r
++    "kernel_file":"linux[64.gz]?",\r
++    "initrd_file":"initrd[64]?",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",\r
++    "kernel_options":"install=$tree",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
+    }\r
+   },\r
+   "vmware": {\r
+@@ -751,10 +879,90 @@
+     "kernel_options_post":"",\r
+     "boot_files":[]\r
+    },\r
++   "9.1": {\r
++    "signatures":["boot"],\r
++    "version_file":"device\\.hints",\r
++    "version_file_regex":"^.*FreeBSD: release/9.1(.*)/sys/(.*)/conf/GENERIC.hints.*$",\r
++    "kernel_arch":"device\\.hints",\r
++    "kernel_arch_regex":"^.*FreeBSD: release/9.1(.*)/sys/(.*)/conf/GENERIC.hints.*$",\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":[],\r
++    "kernel_file":"pxeboot(.*)",\r
++    "initrd_file":"mbr",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
++   "9.2": {\r
++    "signatures":["boot"],\r
++    "version_file":"device\\.hints",\r
++    "version_file_regex":"^.*FreeBSD: release/9.2(.*)/sys/(.*)/conf/GENERIC.hints.*$",\r
++    "kernel_arch":"device\\.hints",\r
++    "kernel_arch_regex":"^.*FreeBSD: release/9.2(.*)/sys/(.*)/conf/GENERIC.hints.*$",\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":[],\r
++    "kernel_file":"pxeboot(.*)",\r
++    "initrd_file":"mbr",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
++   "9.3": {\r
++    "signatures":["boot"],\r
++    "version_file":"device\\.hints",\r
++    "version_file_regex":"^.*FreeBSD: releng/9.3(.*)/sys/(.*)/conf/GENERIC.hints.*$",\r
++    "kernel_arch":"device\\.hints",\r
++    "kernel_arch_regex":"^.*FreeBSD: release/9.3(.*)/sys/(.*)/conf/GENERIC.hints.*$",\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":[],\r
++    "kernel_file":"pxeboot(.*)",\r
++    "initrd_file":"mbr",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
+    "10.0": {\r
+-    "signatures":["release"],\r
+-    "version_file":"10\\.0\\-RELEASE",\r
+-    "version_file_regex":null,\r
++    "signatures":["boot"],\r
++    "version_file":"freebsd-version",\r
++    "version_file_regex":"USERLAND_VERSION=\"10.0-RELEASE\"",\r
++    "kernel_arch":"device\\.hints",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":[],\r
++    "kernel_file":"base.txz",\r
++    "initrd_file":"base.txz",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
++   "10.1": {\r
++    "signatures":["boot"],\r
++    "version_file":"freebsd-version",\r
++    "version_file_regex":"USERLAND_VERSION=\"10.1-RELEASE\"",\r
++    "kernel_arch":"device\\.hints",\r
++    "kernel_arch_regex":null,\r
++    "supported_arches":["i386","amd64"],\r
++    "supported_repo_breeds":[],\r
++    "kernel_file":"base.txz",\r
++    "initrd_file":"base.txz",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":[]\r
++   },\r
++   "10.2": {\r
++    "signatures":["boot"],\r
++    "version_file":"freebsd-version",\r
++    "version_file_regex":"USERLAND_VERSION=\"10.2-RELEASE\"",\r
+     "kernel_arch":"device\\.hints",\r
+     "kernel_arch_regex":null,\r
+     "supported_arches":["i386","amd64"],\r
+@@ -800,6 +1008,22 @@
+     "kernel_options":"",\r
+     "kernel_options_post":"",\r
+     "boot_files":["install.img"]\r
++   },\r
++   "xenserver650": {\r
++    "signatures":["packages.xenserver"],\r
++    "version_file":"^XS-REPOSITORY$",\r
++    "version_file_regex":"^.*product=\"XenServer\" version=\"6\\.5\\.([0-9]+)\".*$",\r
++    "kernel_arch":"xen\\.gz",\r
++    "kernel_arch_regex":"^.*(x86_64).*$",\r
++    "supported_arches":["x86_64"],\r
++    "supported_repo_breeds":[],\r
++    "kernel_file":"mboot\\.c32",\r
++    "initrd_file":"xen\\.gz",\r
++    "isolinux_ok":false,\r
++    "default_kickstart":"",\r
++    "kernel_options":"",\r
++    "kernel_options_post":"",\r
++    "boot_files":["install.img"]\r
+    }\r
+   },\r
+   "unix": {\r
+-- 
+1.9.1
+

diff --git a/cobbler.spec b/cobbler.spec
index 63676e301a8304e6cccb6f314618c18b3f053e65..ef214d6c7d1ae7fb2e3b8de4e7ce33318ba0e3cf 100644 (file)
--- 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 <mos-linux-team@mirantis.com> - 2.6.9-1~mos11
+- Add patch to add signatures for Ubuntu 16.04
+
 * Thu May 19 2016 Ivan Suzdal <mos-linux-team@mirantis.com> - 2.6.9-1~mos10
 - Add patch to fix 'error 400' for cobbler-web (LP: #1583648)
 - Bump version