From fbd4dfc00b45e48bdb2d185ef819868eb2398e2f Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 26 Feb 2016 12:59:30 -0300 Subject: Simplify logic for different kernels and use %%FLAVOR%% macro --- tools/builder_common.sh | 6 +++--- .../core_pkg/default-config-vmware/metadir/+DESC | 3 --- .../core_pkg/default-config-vmware/metadir/+INSTALL | 19 ------------------- .../core_pkg/default-config-vmware/metadir/+MANIFEST | 15 --------------- .../core_pkg/default-config-vmware/pkg-plist | 1 - tools/templates/core_pkg/default-config/metadir/+DESC | 2 +- .../core_pkg/default-config/metadir/+MANIFEST | 6 +++--- tools/templates/core_pkg/kernel-debug/metadir/+DESC | 2 +- .../templates/core_pkg/kernel-debug/metadir/+MANIFEST | 6 +++--- tools/templates/core_pkg/kernel/metadir/+DESC | 2 +- tools/templates/core_pkg/kernel/metadir/+MANIFEST | 4 ++-- 11 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 tools/templates/core_pkg/default-config-vmware/metadir/+DESC delete mode 100644 tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL delete mode 100644 tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST delete mode 100644 tools/templates/core_pkg/default-config-vmware/pkg-plist (limited to 'tools') 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: <