tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

replace nonfree=yes with repository=nonfree.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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