From 10983687a317200e57cf65875be55555b0e9120b Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Wed, 30 Mar 2016 08:03:50 -0300 Subject: Add ESF license to all core pkgs --- tools/builder_common.sh | 20 ++++++++++++++++++++ .../core_pkg/base-nanobsd/metadir/+MANIFEST | 2 +- tools/templates/core_pkg/base/metadir/+MANIFEST | 2 +- .../core_pkg/default-config-serial/metadir/+MANIFEST | 2 +- .../core_pkg/default-config/metadir/+MANIFEST | 2 +- .../core_pkg/kernel-debug/metadir/+MANIFEST | 2 +- tools/templates/core_pkg/kernel/metadir/+MANIFEST | 2 +- tools/templates/core_pkg/rc/metadir/+MANIFEST | 2 +- .../templates/core_pkg/repo-devel/metadir/+MANIFEST | 2 +- tools/templates/core_pkg/repo/metadir/+MANIFEST | 2 +- 10 files changed, 29 insertions(+), 9 deletions(-) diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 33ceb10..f6d5904 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -152,6 +152,26 @@ core_pkg_create() { rm -f ${_plist}.tmp ${plist}.exclude fi + # Add license information + local _portname=$(sed '/^name: /!d; s,^[^"]*",,; s,",,' ${_metadir}/+MANIFEST) + local _licenses_dir="/usr/local/share/licenses/${_portname}-${_version}" + mkdir -p ${_root}${_licenses_dir} + cp ${BUILDER_ROOT}/license.txt ${_root}${_licenses_dir}/ESF + echo "This package has a single license: ESF (Electric Sheep Fencing License)." \ + > ${_root}${_licenses_dir}/LICENSE + cat <${_root}${_licenses_dir}/catalog.mk +_LICENSE=ESF +_LICENSE_NAME=Electric Sheep Fencing License +_LICENSE_PERMS=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +_LICENSE_GROUPS= +_LICENSE_DISTFILES= +EOF + cat <>${_plist} +${_licenses_dir}/catalog.mk +${_licenses_dir}/LICENSE +${_licenses_dir}/ESF +EOF + mkdir -p ${CORE_PKG_REAL_PATH}/All if ! pkg create -o ${CORE_PKG_REAL_PATH}/All -p ${_plist} -r ${_root} -m ${_metadir}; then echo ">>> ERROR: Error building package ${_template} ${_flavor}" diff --git a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST index b1a31a7..f4a209b 100644 --- a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST +++ b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/base/metadir/+MANIFEST b/tools/templates/core_pkg/base/metadir/+MANIFEST index 0f5ed85..ae0ba60 100644 --- a/tools/templates/core_pkg/base/metadir/+MANIFEST +++ b/tools/templates/core_pkg/base/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST index 471ed8b..aca3abd 100644 --- a/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST +++ b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/default-config/metadir/+MANIFEST b/tools/templates/core_pkg/default-config/metadir/+MANIFEST index 8528dec..8809948 100644 --- a/tools/templates/core_pkg/default-config/metadir/+MANIFEST +++ b/tools/templates/core_pkg/default-config/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST index 53bec29..6830977 100644 --- a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST +++ b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/kernel/metadir/+MANIFEST b/tools/templates/core_pkg/kernel/metadir/+MANIFEST index 91e6fa7..2961d9a 100644 --- a/tools/templates/core_pkg/kernel/metadir/+MANIFEST +++ b/tools/templates/core_pkg/kernel/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/rc/metadir/+MANIFEST b/tools/templates/core_pkg/rc/metadir/+MANIFEST index 3099d1f..4c8595d 100644 --- a/tools/templates/core_pkg/rc/metadir/+MANIFEST +++ b/tools/templates/core_pkg/rc/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST b/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST index 745383a..4f9de45 100644 --- a/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST +++ b/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/repo/metadir/+MANIFEST b/tools/templates/core_pkg/repo/metadir/+MANIFEST index 9487b7b..944c084 100644 --- a/tools/templates/core_pkg/repo/metadir/+MANIFEST +++ b/tools/templates/core_pkg/repo/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } -- cgit v1.1