teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace nonfree=yes with repository=nonfree. 

This way it is possible to set up package specific repositories for
i.e. specific devices.
This commit is contained in:
Enno Boland 2014-11-01 13:10:22 +01:00
parent 95b7f907f4
commit 59cc3e0d45
26 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
## VARIABLES
unset -v pkgname version revision short_desc homepage license maintainer
unset -v only_for_archs distfiles checksum build_style nonfree nocross broken
unset -v only_for_archs distfiles checksum build_style repository nocross broken
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

8
common/hooks/do-pkg/00-gen-pkg.sh
View File

@ -135,8 +135,8 @@ hook() {
binpkg=${pkgver}.${arch}.xbps
if [ -n "$nonfree" ]; then
repo=$XBPS_REPOSITORY/nonfree
if [ -n "$repository" ]; then
repo=$XBPS_REPOSITORY/$repository
else
repo=$XBPS_REPOSITORY
fi
@ -170,8 +170,8 @@ hook() {
fi
if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then
source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
if [ -n "$nonfree" ]; then
repo=$XBPS_REPOSITORY/multilib/nonfree
if [ -n "$repository" ]; then
repo=$XBPS_REPOSITORY/multilib/$repository
else
repo=$XBPS_REPOSITORY/multilib
fi

6
common/hooks/post-install/06-strip-and-debug-pkgs.sh
View File

@ -6,7 +6,7 @@
make_debug() {
local dname= fname= dbgfile=
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && return 0
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0
dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g")
fname="$(basename $1)"
@ -25,7 +25,7 @@ make_debug() {
attach_debug() {
local dname= fname= dbgfile=
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && return 0
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0
dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g")
fname="$(basename $1)"
@ -41,7 +41,7 @@ attach_debug() {
create_debug_pkg() {
local _pkgname= _destdir=
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && return 0
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0
[ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0
_pkgname="${pkgname}-dbg-${version}"

8
common/hooks/post-pkg/00-register-pkg.sh
View File

@ -33,8 +33,8 @@ hook() {
if [ -z "$noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH}
fi
if [ -n "$nonfree" ]; then
pkgdir=$XBPS_REPOSITORY/nonfree
if [ -n "$repository" ]; then
pkgdir=$XBPS_REPOSITORY/$repository
else
pkgdir=$XBPS_REPOSITORY
fi
@ -58,8 +58,8 @@ hook() {
if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
return
fi
if [ -n "$nonfree" ]; then
pkgdir=$XBPS_REPOSITORY/multilib/nonfree
if [ -n "$repository" ]; then
pkgdir=$XBPS_REPOSITORY/multilib/$repository
else
pkgdir=$XBPS_REPOSITORY/multilib
fi

2
common/xbps-src/shutils/common.sh
View File

@ -320,7 +320,7 @@ setup_pkg() {
fi
# For nonfree/bootstrap pkgs there's no point in building -dbg pkgs, disable them.
if [ -z "$XBPS_DEBUG_PKGS" -o -n "$nonfree" -o -n "$bootstrap" ]; then
if [ -z "$XBPS_DEBUG_PKGS" -o -n "$repository" = "nonfree" -o -n "$bootstrap" ]; then
disable_debug=yes
fi
# If a package sets force_debug_pkgs, always build -dbg pkgs.

2
srcpkgs/adobe-flash-plugin/template
View File

@ -20,7 +20,7 @@ short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.adobe.com"
license="Adobe License (non free)"
nonfree="yes"
repository="nonfree"
depends="curl hicolor-icon-theme desktop-file-utils"
create_wrksrc=yes

2
srcpkgs/broadcom-wl-dkms/template
View File

@ -8,7 +8,7 @@ license="Proprietary Broadcom license"
homepage="http://broadcom.com"
only_for_archs="i686 x86_64"
nonfree=yes
repository="nonfree"
create_wrksrc=yes
short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module"

6
srcpkgs/catalyst/template
View File

@ -15,7 +15,7 @@ conflicts="nvidia>=0"
provides="libGL-${version}_${revision}"
replaces="libGL>=0"
short_desc="${_desc} - Libraries and Utilities"
nonfree=yes
repository="nonfree"
create_wrksrc=yes
update_pkgname="fglrx-installer"
@ -105,7 +105,7 @@ catalyst-dkms_package() {
triggers="dkms"
depends="dkms"
dkms_modules="fglrx ${version}_${revision}"
nonfree=yes
repository="nonfree"
pkg_install() {
local _fglrx=fglrx-${version}_${revision}
@ -132,7 +132,7 @@ catalyst-dkms_package() {
catalyst-opencl_package() {
short_desc="${_desc} - OpenCL implementation"
depends="libOpenCL"
nonfree=yes
repository="nonfree"
pkg_install() {
cd ${wrksrc}/arch/${_ARCHDIR}

2
srcpkgs/chromium-pepper-flash/template
View File

@ -10,7 +10,7 @@ maintainer="Enno Boland <eb@s01.de>"
homepage="http://www.google.com/chrome"
license="chrome"
lib32disabled=yes
nonfree=yes
repository="nonfree"
only_for_archs="i686 x86_64"
depends="chromium binutils"
create_wrksrc=yes

2
srcpkgs/doom3/template
View File

@ -13,7 +13,7 @@ checksum=2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4
# 32bit package for x86_64 built on x86 :-)
only_for_archs="i686"
nonfree="yes"
repository="nonfree"
nostrip="yes"
create_wrksrc=yes

2
srcpkgs/foomatic-db-nonfree/template
View File

@ -3,7 +3,7 @@ pkgname=foomatic-db-nonfree
version=20140930
revision=1
noarch=yes
nonfree=yes
repository="nonfree"
build_style=gnu-configure
short_desc="OpenPrinting printer support - nonfree database"
homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic"

2
srcpkgs/minecraft/template
View File

@ -2,7 +2,7 @@
pkgname=minecraft
version=0.5
revision=1
nonfree="yes"
repository="nonfree"
noarch="yes"
depends="wmname wget"
short_desc="Launcher for the famous Minecraft game"

6
srcpkgs/nvidia-stable/template
View File

@ -10,7 +10,7 @@ license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
only_for_archs="i686 x86_64"
nonfree=yes
repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<19 nvidia-stable-dkms-${version}_${revision} pkg-config"
@ -161,7 +161,7 @@ nvidia-stable-dkms_package() {
depends="dkms"
provides="nvidia-dkms-${version}_${revision}"
replaces="nvidia-dkms>=0"
nonfree=yes
repository="nonfree"
pkg_install() {
vmove usr/src
vmove usr/lib/modules-load.d
@ -174,7 +174,7 @@ nvidia-stable-opencl_package() {
provides="nvidia-opencl-${version}_${revision}"
replaces="nvidia-opencl>=0"
depends="libOpenCL"
nonfree=yes
repository="nonfree"
pkg_install() {
vmove "usr/lib/libnvidia-compiler*"
vmove "usr/lib/libnvidia-opencl*"

6
srcpkgs/nvidia/template
View File

@ -10,7 +10,7 @@ license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
only_for_archs="i686 x86_64"
nonfree=yes
repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<19 nvidia-dkms-${version}_${revision} pkg-config"
@ -159,7 +159,7 @@ nvidia-dkms_package() {
triggers="dkms"
dkms_modules="nvidia ${version}"
depends="dkms"
nonfree=yes
repository="nonfree"
pkg_install() {
vmove usr/src
vmove usr/lib/modules-load.d
@ -170,7 +170,7 @@ nvidia-dkms_package() {
nvidia-opencl_package() {
short_desc="${_desc} - OpenCL implementation"
depends="libOpenCL"
nonfree=yes
repository="nonfree"
pkg_install() {
vmove "usr/lib/libnvidia-compiler*"
vmove "usr/lib/libnvidia-opencl*"

6
srcpkgs/nvidia304/template
View File

@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
nonfree=yes
repository="nonfree"
create_wrksrc=yes
only_for_archs="i686 x86_64"
short_desc="${_desc} - Libraries and Utilities"
@ -151,7 +151,7 @@ nvidia304-dkms_package() {
dkms_modules="nvidia ${version}"
provides="nvidia-dkms-${version}_${revision}"
replaces="nvidia-dkms>=0"
nonfree=yes
repository="nonfree"
pkg_install() {
vmove usr/src
vmove usr/lib/modules-load.d
@ -164,7 +164,7 @@ nvidia304-opencl_package() {
provides="nvidia-opencl-${version}_${revision}"
replaces="nvidia-openctl>=0"
depends="libOpenCL"
nonfree=yes
repository="nonfree"
pkg_install() {
vmove "usr/lib/libnvidia-compiler*"
vmove "usr/lib/libnvidia-opencl*"

2
srcpkgs/oracle-jdk-arm/template
View File

@ -10,7 +10,7 @@ maintainer="Enno Boland <eb@s01.de>"
homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
license="oracle"
lib32disabled=yes
nonfree=yes
repository="nonfree"
only_for_archs="armv7l armv6l"
depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
hostmakedepends="wget"

2
srcpkgs/oracle-jdk/template
View File

@ -10,7 +10,7 @@ maintainer="Enno Boland <eb@s01.de>"
homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
license="oracle"
lib32disabled=yes
nonfree=yes
repository="nonfree"
only_for_archs="i686 x86_64"
depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
hostmakedepends="wget"

2
srcpkgs/oracle-jre/template
View File

@ -9,7 +9,7 @@ maintainer="Enno Boland <eb@s01.de>"
homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
license="oracle"
lib32disabled=yes
nonfree=yes
repository="nonfree"
only_for_archs="i686 x86_64"
depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
hostmakedepends="wget"

2
srcpkgs/quake4/template
View File

@ -13,7 +13,7 @@ checksum=9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a
# 32bit package for x86_64 built on x86 :-)
only_for_archs="i686"
nonfree="yes"
repository="nonfree"
nostrip="yes"
create_wrksrc=yes

2
srcpkgs/sdlmame/template
View File

@ -15,7 +15,7 @@ checksum=2f0adeec277e15e93ba3abc653b2220182e51a1eeea344c97e05d5d050a10649
hostmakedepends="which unzip perl pkg-config python automoc4"
makedepends="SDL_ttf-devel fontconfig-devel libXinerama-devel qt-devel alsa-lib-devel"
depends="liberation-fonts-ttf"
nonfree=yes
repository="nonfree"
nocross=yes
do_extract() {

2
srcpkgs/skype/template
View File

@ -11,7 +11,7 @@ distfiles="http://download.skype.com/linux/${pkgname}-${version}.tar.bz2"
checksum=8c99dc3978a588fb13303df7c8134379fb55b8dd460efefbc79ae594269b892d
only_for_archs="i686"
nonfree="yes"
repository="nonfree"
nostrip="yes"
makedepends="qt>=4.8.4_4 hicolor-icon-theme>=0"

2
srcpkgs/steam/template
View File

@ -7,7 +7,7 @@ version=1.0.0.49
revision=1
wrksrc=steam
depends="curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils liberation-fonts-ttf"
nonfree="yes"
repository="nonfree"
short_desc="Digital distribution client bootstrap package - Valve's steam client"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary license"

2
srcpkgs/sublime-text3/template
View File

@ -15,7 +15,7 @@ homepage="http://www.sublimetext.com/3dev"
license="Propietary"
short_desc="Sophisticated text editor for code, markup and prose"
nonfree="yes"
repository="nonfree"
only_for_archs="i686 x86_64"
wrksrc="sublime_text_3"

2
srcpkgs/unrar/template
View File

@ -3,7 +3,7 @@ pkgname=unrar
version=5.2.2
revision=1
wrksrc=unrar
nonfree=yes
repository="nonfree"
homepage="http://www.rarlab.com/rar"
update_pkgname=unrarsrc
update_site="http://www.rarlab.com/rar_add.htm"

2
srcpkgs/wineasio/template
View File

@ -2,7 +2,7 @@
pkgname=wineasio
version=0.9.2
revision=5
nonfree=yes
repository="nonfree"
only_for_archs=i686
wrksrc=${pkgname}
homepage="http://sourceforge.net/projects/wineasio"

2
srcpkgs/xvba-video/template
View File

@ -9,7 +9,7 @@ maintainer="John Galt <johngaltfirstrun@gmail.com>"
license="Proprietary AMD license"
homepage="http://www.amd.com"
only_for_archs="i686 x86_64"
nonfree=yes
repository="nonfree"
distfiles="https://launchpad.net/ubuntu/+archive/primary/+files/xvba-video_0.7.8.orig.tar.gz"
checksum=e4bea33edaf73b1c164f76295ac77fc1fb9f4c4a8269fc756937f00454bfd50f