summaryrefslogtreecommitdiffstats
path: root/tools/templates
diff options
context:
space:
mode:
Diffstat (limited to 'tools/templates')
-rw-r--r--tools/templates/core_pkg/default-config-vmware/metadir/+DESC3
-rw-r--r--tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL19
-rw-r--r--tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST15
-rw-r--r--tools/templates/core_pkg/default-config-vmware/pkg-plist1
-rw-r--r--tools/templates/core_pkg/default-config/metadir/+DESC2
-rw-r--r--tools/templates/core_pkg/default-config/metadir/+MANIFEST6
-rw-r--r--tools/templates/core_pkg/kernel-debug/metadir/+DESC2
-rw-r--r--tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST6
-rw-r--r--tools/templates/core_pkg/kernel/metadir/+DESC2
-rw-r--r--tools/templates/core_pkg/kernel/metadir/+MANIFEST4
10 files changed, 11 insertions, 49 deletions
diff --git a/tools/templates/core_pkg/default-config-vmware/metadir/+DESC b/tools/templates/core_pkg/default-config-vmware/metadir/+DESC
deleted file mode 100644
index d732511..0000000
--- a/tools/templates/core_pkg/default-config-vmware/metadir/+DESC
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PRODUCT_NAME%% default config (vmware)
-
-WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL b/tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL
deleted file mode 100644
index 56a4548..0000000
--- a/tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-if [ "${2}" != "POST-INSTALL" ]; then
- exit 0
-fi
-
-if [ ! -f /cf/conf/config.xml ]; then
- cp /conf.default/config.xml /cf/conf/config.xml
-fi
-
-if [ ! -L /conf ]; then
- ln -sf /cf/conf /conf
-fi
-
-if [ ! -d /cf/conf/backup ]; then
- mkdir /cf/conf/backup
-fi
-
-exit 0
diff --git a/tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST b/tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST
deleted file mode 100644
index cd1e098..0000000
--- a/tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST
+++ /dev/null
@@ -1,15 +0,0 @@
-name: "%%PRODUCT_NAME%%-default-config-vmware"
-version: "%%VERSION%%"
-origin: "security/%%PRODUCT_NAME%%-default-config"
-comment: <<EOD
-%%PRODUCT_NAME%% default config (vmware)
-EOD
-maintainer: development@pfsense.org
-prefix: /
-deps: {
-
-}
-categories [ security, ]
-licenselogic: single
-licenses: [ BSD2CLAUSE, ]
-options: { }
diff --git a/tools/templates/core_pkg/default-config-vmware/pkg-plist b/tools/templates/core_pkg/default-config-vmware/pkg-plist
deleted file mode 100644
index b6fe8df..0000000
--- a/tools/templates/core_pkg/default-config-vmware/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-/conf.default/config.xml
diff --git a/tools/templates/core_pkg/default-config/metadir/+DESC b/tools/templates/core_pkg/default-config/metadir/+DESC
index 692d63e..ddfb986 100644
--- a/tools/templates/core_pkg/default-config/metadir/+DESC
+++ b/tools/templates/core_pkg/default-config/metadir/+DESC
@@ -1,3 +1,3 @@
-%%PRODUCT_NAME%% default config
+%%PRODUCT_NAME%% default config%%FLAVOR_DESC%%
WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/default-config/metadir/+MANIFEST b/tools/templates/core_pkg/default-config/metadir/+MANIFEST
index d385eda..8528dec 100644
--- a/tools/templates/core_pkg/default-config/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/default-config/metadir/+MANIFEST
@@ -1,8 +1,8 @@
-name: "%%PRODUCT_NAME%%-default-config"
+name: "%%PRODUCT_NAME%%-default-config%%FLAVOR%%"
version: "%%VERSION%%"
-origin: "security/%%PRODUCT_NAME%%-default-config"
+origin: "security/%%PRODUCT_NAME%%-default-config%%FLAVOR%%"
comment: <<EOD
-%%PRODUCT_NAME%% default config
+%%PRODUCT_NAME%% default config%%FLAVOR_DESC%%
EOD
maintainer: development@pfsense.org
prefix: /
diff --git a/tools/templates/core_pkg/kernel-debug/metadir/+DESC b/tools/templates/core_pkg/kernel-debug/metadir/+DESC
index 00ac37d..86d4abf 100644
--- a/tools/templates/core_pkg/kernel-debug/metadir/+DESC
+++ b/tools/templates/core_pkg/kernel-debug/metadir/+DESC
@@ -1,3 +1,3 @@
-%%PRODUCT_NAME%% kernel debug files
+%%PRODUCT_NAME%% kernel debug files%%FLAVOR_DESC%%
WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST
index b2b7999..53bec29 100644
--- a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST
@@ -1,13 +1,13 @@
-name: "%%PRODUCT_NAME%%-kernel-debug-%%FLAVOR%%"
+name: "%%PRODUCT_NAME%%-kernel-debug%%FLAVOR%%"
version: "%%VERSION%%"
origin: "security/%%PRODUCT_NAME%%-kernel-debug"
comment: <<EOD
-%%PRODUCT_NAME%% kernel-debug
+%%PRODUCT_NAME%% kernel-debug%%FLAVOR_DESC%%
EOD
maintainer: development@pfsense.org
prefix: /
deps: {
-"%%PRODUCT_NAME%%-kernel-%%FLAVOR%%": {origin: "security/%%PRODUCT_NAME%%-kernel", version: "%%VERSION%%"}
+"%%PRODUCT_NAME%%-kernel%%FLAVOR%%": {origin: "security/%%PRODUCT_NAME%%-kernel", version: "%%VERSION%%"}
}
categories [ security, ]
licenselogic: single
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: /
OpenPOWER on IntegriCloud