mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logic for different kernels and use %%FLAVOR%% macro

Browse Source
This commit is contained in:
Renato Botelho 2016-02-26 12:59:30 -03:00
parent 168c162a00
commit fbd4dfc00b
11 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/builder_common.sh
View File

@ -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}

3
tools/templates/core_pkg/default-config-vmware/metadir/+DESC
View File

@ -1,3 +0,0 @@
%%PRODUCT_NAME%% default config (vmware)
WWW: %%PRODUCT_URL%%

19
tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL
View File

@ -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

15
tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST
View File

@ -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: { }

1
tools/templates/core_pkg/default-config-vmware/pkg-plist
View File

@ -1 +0,0 @@
/conf.default/config.xml

2
tools/templates/core_pkg/default-config/metadir/+DESC
View File

@ -1,3 +1,3 @@
%%PRODUCT_NAME%% default config
%%PRODUCT_NAME%% default config%%FLAVOR_DESC%%
WWW: %%PRODUCT_URL%%

6
tools/templates/core_pkg/default-config/metadir/+MANIFEST
View File

@ -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: /

2
tools/templates/core_pkg/kernel-debug/metadir/+DESC
View File

@ -1,3 +1,3 @@
%%PRODUCT_NAME%% kernel debug files
%%PRODUCT_NAME%% kernel debug files%%FLAVOR_DESC%%
WWW: %%PRODUCT_URL%%

6
tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST
View File

@ -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

2
tools/templates/core_pkg/kernel/metadir/+DESC
View File

@ -1,3 +1,3 @@
%%PRODUCT_NAME%% kernel
%%PRODUCT_NAME%% kernel%%FLAVOR_DESC%%
WWW: %%PRODUCT_URL%%

4
tools/templates/core_pkg/kernel/metadir/+MANIFEST
View File

@ -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: /