jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: make "repository" per srcpkg, i.e don't override it for subpkgs.

Browse source
This commit is contained in:
Juan RP 2014-11-07 11:35:53 +01:00
parent 8e92efc31c
commit 97a5e16fab
6 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/environment/setup-subpkg/subpkg.sh
View file

@ -3,7 +3,7 @@
## VARIABLES
unset -v noarch conf_files mutable_files preserve triggers
unset -v depends run_depends replaces provides conflicts tags repository
unset -v depends run_depends replaces provides conflicts tags
# hooks/post-install/03-strip-and-debug-pkgs
unset -v nostrip nostrip_files shlib_requires

2
common/environment/setup/sourcepkg.sh
View file

@ -8,7 +8,7 @@ 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
unset -v reverts subpackages makedepends hostmakedepends depends
unset -v build_options build_options_default bootstrap
unset -v build_options build_options_default bootstrap repository
unset -v CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF

2
srcpkgs/catalyst/template
View file

@ -105,7 +105,6 @@ catalyst-dkms_package() {
triggers="dkms"
depends="dkms"
dkms_modules="fglrx ${version}_${revision}"
repository="nonfree"
pkg_install() {
local _fglrx=fglrx-${version}_${revision}
@ -132,7 +131,6 @@ catalyst-dkms_package() {
catalyst-opencl_package() {
short_desc="${_desc} - OpenCL implementation"
depends="libOpenCL"
repository="nonfree"
pkg_install() {
cd ${wrksrc}/arch/${_ARCHDIR}

2
srcpkgs/nvidia-stable/template
View file

@ -161,7 +161,6 @@ nvidia-stable-dkms_package() {
depends="dkms"
provides="nvidia-dkms-${version}_${revision}"
replaces="nvidia-dkms>=0"
repository="nonfree"
pkg_install() {
vmove usr/src
vmove usr/lib/modules-load.d
@ -174,7 +173,6 @@ nvidia-stable-opencl_package() {
provides="nvidia-opencl-${version}_${revision}"
replaces="nvidia-opencl>=0"
depends="libOpenCL"
repository="nonfree"
pkg_install() {
vmove "usr/lib/libnvidia-compiler*"
vmove "usr/lib/libnvidia-opencl*"

2
srcpkgs/nvidia/template
View file

@ -159,7 +159,6 @@ nvidia-dkms_package() {
triggers="dkms"
dkms_modules="nvidia ${version}"
depends="dkms"
repository="nonfree"
pkg_install() {
vmove usr/src
vmove usr/lib/modules-load.d
@ -170,7 +169,6 @@ nvidia-dkms_package() {
nvidia-opencl_package() {
short_desc="${_desc} - OpenCL implementation"
depends="libOpenCL"
repository="nonfree"
pkg_install() {
vmove "usr/lib/libnvidia-compiler*"
vmove "usr/lib/libnvidia-opencl*"

2
srcpkgs/nvidia304/template
View file

@ -151,7 +151,6 @@ nvidia304-dkms_package() {
dkms_modules="nvidia ${version}"
provides="nvidia-dkms-${version}_${revision}"
replaces="nvidia-dkms>=0"
repository="nonfree"
pkg_install() {
vmove usr/src
vmove usr/lib/modules-load.d
@ -164,7 +163,6 @@ nvidia304-opencl_package() {
provides="nvidia-opencl-${version}_${revision}"
replaces="nvidia-openctl>=0"
depends="libOpenCL"
repository="nonfree"
pkg_install() {
vmove "usr/lib/libnvidia-compiler*"
vmove "usr/lib/libnvidia-opencl*"