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

Revert "xbps-src: require xbps>=0.54."

Browse Source 
This reverts commit 198acb8e39.

I'm reverting this until I fix the issue properly.
This commit is contained in:
Juan RP 2019-06-21 13:04:43 +02:00
parent cea4deb449
commit d778cbdc70
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/xbps-src/shutils/build_dependencies.sh
View File

@ -82,17 +82,15 @@ install_pkg_from_repos() {
$XBPS_INSTALL_CMD -Ayd "$pkg" >$tmplogf 2>&1 $XBPS_INSTALL_CMD -Ayd "$pkg" >$tmplogf 2>&1
fi fi
rval=$? rval=$?
if [ $rval -ne 0 ]; then if [ $rval -ne 0 -a $rval -ne 17 ]; then
# xbps-install can return: # xbps-install can return:
# #
# SUCCESS (0): package installed successfully. # SUCCESS (0): package installed successfully.
# ENOENT (2): package missing in repositories. # ENOENT (2): package missing in repositories.
# ENXIO (6): package depends on invalid dependencies. # ENXIO (6): package depends on invalid dependencies.
# ENOEXEC (8): unresolved shlibs in transaction. # EAGAIN (11): package conflicts.
# EAGAIN (11): conflicting packages in transaction. # EEXIST (17): package already installed.
# ENOMEM (12): out of memory. # ENODEV (19): package depends on missing dependencies.
# EEXIST (17): conflicting files in transaction.
# ENODEV (19): broken reverse dependencies in transaction.
# ENOTSUP (95): no repositories registered. # ENOTSUP (95): no repositories registered.
# #
[ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps [ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps
@ -100,6 +98,7 @@ install_pkg_from_repos() {
cat $tmplogf cat $tmplogf
msg_error "Please see above for the real error, exiting...\n" msg_error "Please see above for the real error, exiting...\n"
fi fi
[ $rval -eq 17 ] && rval=0
return $rval return $rval
} }

2
xbps-src
View File

@ -390,7 +390,7 @@ setup_distfiles_mirror() {
done done
} }
readonly XBPS_VERSION_REQ="0.54" readonly XBPS_VERSION_REQ="0.46"
readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}') readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}')
readonly XBPS_SRC_VERSION="113" readonly XBPS_SRC_VERSION="113"
export XBPS_MACHINE=$(xbps-uhelper arch) export XBPS_MACHINE=$(xbps-uhelper arch)