diff options
author | Renato Botelho <renato@netgate.com> | 2016-02-26 12:59:30 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-02-26 12:59:30 -0300 |
commit | fbd4dfc00b45e48bdb2d185ef819868eb2398e2f (patch) | |
tree | 08d6dc34d6f1ad9a8b6ed829c2de123db59a9440 /tools | |
parent | 168c162a00a3985e553b44fbd8eeab938b3740e3 (diff) | |
download | pfsense-fbd4dfc00b45e48bdb2d185ef819868eb2398e2f.zip pfsense-fbd4dfc00b45e48bdb2d185ef819868eb2398e2f.tar.gz |
Simplify logic for different kernels and use %%FLAVOR%% macro
Diffstat (limited to 'tools')
11 files changed, 14 insertions, 52 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 7948ec9..508fb48 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -138,7 +138,8 @@ core_pkg_create() { -i '' \ -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME},g" \ -e "s,%%PRODUCT_URL%%,${PRODUCT_URL},g" \ - -e "s,%%FLAVOR%%,${_flavor},g" \ + -e "s,%%FLAVOR%%,-${_flavor},g" \ + -e "s,%%FLAVOR_DESC%%, (${_flavor}),g" \ -e "s,%%VERSION%%,${_version},g" \ ${_metadir}/* \ ${_plist} \ @@ -1059,7 +1060,6 @@ clone_to_staging_area() { local _exclude_files="${CORE_PKG_TMP}/base_exclude_files" sed \ -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME},g" \ - -e "s,%%FLAVOR%%,${_flavor},g" \ -e "s,%%VERSION%%,${_version},g" \ ${BUILDER_TOOLS}/templates/core_pkg/base/exclude_files \ > ${_exclude_files} @@ -1122,7 +1122,7 @@ clone_to_staging_area() { # Change default interface names to match vmware driver xml ed -P -L -u "${XML_ROOTOBJ}/interfaces/wan/if" -v "vmx0" ${DEFAULTCONF} xml ed -P -L -u "${XML_ROOTOBJ}/interfaces/lan/if" -v "vmx1" ${DEFAULTCONF} - core_pkg_create default-config-vmware "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} + core_pkg_create default-config "vmware" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} # Restore default values to be used by serial package xml ed -P -L -u "${XML_ROOTOBJ}/interfaces/wan/if" -v "${_old_wan_if}" ${DEFAULTCONF} 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: / |