From 096aac3603c4af28985bb19802736c8e38e74a57 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 21 Mar 2016 16:49:56 +0100 Subject: [PATCH 1/2] xbps-src: add consistency check `xbps-src consistency-check` iterates over all templates and looks for potentially broken dependencies. --- common/xbps-src/shutils/consistency_check.sh | 79 ++++++++++++++++++++ xbps-src | 6 ++ 2 files changed, 85 insertions(+) create mode 100644 common/xbps-src/shutils/consistency_check.sh diff --git a/common/xbps-src/shutils/consistency_check.sh b/common/xbps-src/shutils/consistency_check.sh new file mode 100644 index 00000000000..0dbb194e46b --- /dev/null +++ b/common/xbps-src/shutils/consistency_check.sh @@ -0,0 +1,79 @@ +# vim: set ts=4 sw=4 et: + +consistency_check_existing () { + while IFS=" " read -r dep origname deplabel; do + [ -f "$XBPS_SRCPKGDIR/$dep/template" ] && continue + case "$deplabel" in + makedepends|hostmakedepends) + msg_warn "unsatisfied $deplabel in $origname: $dep does not exist\n"; + ;; + *) printf "%s %s %s\n" "$dep" "$origname" "$deplabel" ;; + esac + done +} + +consistency_convert_pkgname () { + local origname= pkgname version= revision= + while IFS=" " read -r dep origname deplabel; do + case "$deplabel" in + makedepends|hostmakedepends) + printf "%s %s %s\n" "$dep" "$origname" "$deplabel" + continue + ;; + esac + case "$dep" in + *\<*|*\>*|*=*) + printf "%s %s %s\n" "$dep" "$origname" "$deplabel" + continue + ;; + esac + if pkgname=$(xbps-uhelper getpkgname "$dep" 2> /dev/null) && \ + version=$(xbps-uhelper getpkgversion "$dep" 2> /dev/null) && \ + revision=$(xbps-uhelper getpkgrevision "$dep" 2> /dev/null); then + printf "%s %s %s\n" "${pkgname}>=${version}_${revision}" "$origname" "$deplabel" + else + printf "%s %s %s\n" "$dep>=0" "$origname" "$deplabel" + fi + done +} + +consistency_check_smart () { + local pkgname= depdef= dep= + while IFS=" " read -r depdef origname deplabel; do + case "$deplabel" in + makedepends|hostmakedepends) + printf "%s %s %s\n" "$depdef" "$origname" "$deplabel" + continue + ;; + esac + + dep=$(xbps-uhelper getpkgdepname "$depdef") + + if [ ! -f "$XBPS_SRCPKGDIR/$dep/template" ]; then + msg_warn "unsatisfied $deplabel in $origname: $dep does not exist\n"; + continue + fi + ( + XBPS_TARGET_PKG=$dep + read_pkg + xbps-uhelper pkgmatch "$depdef" "${pkgname}-${version}_${revision}" && continue + msg_red "unsatisfied $deplabel in $origname: $dep is $version, but required is $depdef\n"; + ) + done +} + +consistency_check() { + local pkg= pkgname= + for pkg in "$XBPS_SRCPKGDIR"/*/template; do + XBPS_TARGET_PKG=$(basename $(dirname $pkg)) + ( + read_pkg + [ "$depends" ] && printf "%s $pkgname depends\n" $depends + [ "$conflicts" ] && printf "%s $pkgname conflicts\n" $conflicts + [ -L "$XBPS_SRCPKGDIR/$XBPS_TARGET_PKG" ] && continue + [ "$makedepends" ] && printf "%s $pkgname makedepends\n" $makedepends + [ "$hostmakedepends" ] && printf "%s $pkgname hostmakedepends\n" $hostmakedepends + ) + done | grep -v "^virtual?" | sed "s/^[^ ]*?//" | consistency_check_existing | \ + consistency_convert_pkgname | consistency_check_smart +} diff --git a/xbps-src b/xbps-src index 4747076800c..3e38212c8fb 100755 --- a/xbps-src +++ b/xbps-src @@ -30,6 +30,9 @@ bootstrap-update build Build package source (fetch + extract + configure + build). +consistency-check + Runs a consistency check on all packages + chroot Enter to the chroot in . @@ -677,6 +680,9 @@ case "$XBPS_TARGET" in remove_pkg $XBPS_CROSS_BUILD fi ;; + consistency-check) + consistency_check + ;; remove-autodeps) if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then chroot_handler remove-autodeps From ff13ab493bf111f1bdd881f1be12ebb4fe583632 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 21 Mar 2016 21:20:10 +0100 Subject: [PATCH 2/2] common/travis: add consistency check on travis runs --- .travis.yml | 4 +++- common/travis/bootstrap.sh | 2 +- common/travis/build.sh | 2 +- common/travis/consistency_check.sh | 7 +++++++ common/travis/show_files.sh | 2 +- common/travis/xlint.sh | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) create mode 100755 common/travis/consistency_check.sh diff --git a/.travis.yml b/.travis.yml index 1c64988cc56..2dd29bca46d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ env: - PATH=$PATH:$HOME/bin matrix: - - XLINT=1 + - ACTION=xlint + - ACTION=consistency-check - ARCH=x86_64 BOOTSTRAP=x86_64 - ARCH=i686 BOOTSTRAP=i686 - ARCH=armv6hf BOOTSTRAP=x86_64 @@ -24,6 +25,7 @@ before_script: - common/travis/fetch_upstream.sh - common/travis/changed_templates.sh - common/travis/xlint.sh + - common/travis/consistency_check.sh - common/travis/bootstrap.sh $BOOTSTRAP script: diff --git a/common/travis/bootstrap.sh b/common/travis/bootstrap.sh index 755f70c2720..351af8beb0a 100755 --- a/common/travis/bootstrap.sh +++ b/common/travis/bootstrap.sh @@ -2,6 +2,6 @@ # # bootstrap.sh -[ "$XLINT" ] && exit 0 +[ "$ACTION" ] && exit 0 ./xbps-src -H $HOME/hostdir binary-bootstrap $1 diff --git a/common/travis/build.sh b/common/travis/build.sh index 782e2facd7e..9b3d6db9c0a 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -2,7 +2,7 @@ # # build.sh -[ "$XLINT" ] && exit 0 +[ "$ACTION" ] && exit 0 if [ "$1" != "$2" ]; then arch="-a $2" diff --git a/common/travis/consistency_check.sh b/common/travis/consistency_check.sh new file mode 100755 index 00000000000..17483c8aee8 --- /dev/null +++ b/common/travis/consistency_check.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# +# consistency_check.sh + +[ "$ACTION" = "consistency-check" ] || exit 0 + +./xbps-src consistency-check diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh index 89f0c2104c1..2c30d266333 100755 --- a/common/travis/show_files.sh +++ b/common/travis/show_files.sh @@ -2,7 +2,7 @@ # # show_files.sh -[ "$XLINT" ] && exit 0 +[ "$ACTION" ] && exit 0 if [ "$1" != "$2" ]; then arch="-a $2" diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh index 2d5a71b71be..b99d95d98b8 100755 --- a/common/travis/xlint.sh +++ b/common/travis/xlint.sh @@ -2,6 +2,6 @@ # # xlint.sh -[ "$XLINT" ] || exit 0 +[ "$ACTION" = "xlint" ] || exit 0 awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates | xargs xlint