From 8b30d9d657be7ab6e437a35a301c7323376becc2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 9 Jun 2014 12:07:44 +0200 Subject: [PATCH] xbps-src: make "nonfree" shared by the main pkg and its subpkgs. --- common/environment/setup-subpkg/subpkg.sh | 2 +- common/environment/setup/sourcepkg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh index bc22068aca6..8cdcc621f51 100644 --- a/common/environment/setup-subpkg/subpkg.sh +++ b/common/environment/setup-subpkg/subpkg.sh @@ -2,7 +2,7 @@ # a package template and can also be used in subpkgs. ## VARIABLES -unset -v noarch nonfree conf_files mutable_files preserve triggers +unset -v noarch conf_files mutable_files preserve triggers unset -v depends run_depends replaces provides conflicts tags # hooks/post-install/03-strip-and-debug-pkgs diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index 1e1377f50e8..af7abf42fcc 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -3,7 +3,7 @@ ## VARIABLES unset -v pkgname version revision short_desc homepage license maintainer -unset -v only_for_archs distfiles checksum build_style +unset -v only_for_archs distfiles checksum build_style nonfree unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc unset -v make_cmd make_build_args make_install_args make_build_target make_install_target python_versions unset -v patch_args disable_parallel_build keep_libtool_archives