From fbd4dfc00b45e48bdb2d185ef819868eb2398e2f Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Fri, 26 Feb 2016 12:59:30 -0300
Subject: Simplify logic for different kernels and use %%FLAVOR%% macro

---
 tools/templates/core_pkg/kernel/metadir/+DESC     | 2 +-
 tools/templates/core_pkg/kernel/metadir/+MANIFEST | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/templates/core_pkg/kernel/metadir')

diff --git a/tools/templates/core_pkg/kernel/metadir/+DESC b/tools/templates/core_pkg/kernel/metadir/+DESC
index 14c9552..3df8263 100644
--- a/tools/templates/core_pkg/kernel/metadir/+DESC
+++ b/tools/templates/core_pkg/kernel/metadir/+DESC
@@ -1,3 +1,3 @@
-%%PRODUCT_NAME%% kernel
+%%PRODUCT_NAME%% kernel%%FLAVOR_DESC%%
 
 WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/kernel/metadir/+MANIFEST b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
index 5c87a6a..91e6fa7 100644
--- a/tools/templates/core_pkg/kernel/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
@@ -1,8 +1,8 @@
-name: "%%PRODUCT_NAME%%-kernel-%%FLAVOR%%"
+name: "%%PRODUCT_NAME%%-kernel%%FLAVOR%%"
 version: "%%VERSION%%"
 origin: "security/%%PRODUCT_NAME%%-kernel"
 comment: <<EOD
-%%PRODUCT_NAME%% kernel
+%%PRODUCT_NAME%% kernel%%FLAVOR_DESC%%
 EOD
 maintainer: development@pfsense.org
 prefix: /
-- 
cgit v1.1