Merge lp:~albaguirre/mir/remove-abi-compliance-checker into lp:mir

[Alberto Aguirre]

Remove abi-compliance-checker

Remove unused abi-compliance-checker related code

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4283
https://mir-jenkins.ubuntu.com/job/mir-ci/3722/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5107
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5345
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5332
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5332
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5332
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5151/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5151/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5151/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5151/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5151/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5151/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5151/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5151
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5151/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3722/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Sure

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-09-07 05:58:13 +0000
+++ CMakeLists.txt	2017-10-11 16:02:41 +0000
@@ -313,7 +313,6 @@
 endif ()
 
 enable_coverage_report(mirserver)
-include (cmake/ABICheck.cmake)
 
 add_custom_target(ptest
     COMMAND "${CMAKE_SOURCE_DIR}/tools/run_ctests.sh" "--cost-file" "${CMAKE_BINARY_DIR}/ptest_ctest_cost_data.txt" "sh ${CMAKE_BINARY_DIR}/discover_all_tests.sh" "--" "$$ARGS"
 
=== removed file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	2017-05-08 03:04:26 +0000
+++ cmake/ABICheck.cmake	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-
-find_program(ABI_COMPLIANCE_CHECKER abi-compliance-checker)
-if (NOT ABI_COMPLIANCE_CHECKER)
-  message(WARNING "no ABI checks possible: abi-compliance-checker was not found")
-  return()
-endif()
-
-set(ENABLE_ABI_CHECK_TEST $ENV{MIR_ENABLE_ABI_CHECK_TEST})
-execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE ABI_CHECK_TARGET_MACH OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-set(ABI_DUMPS_DIR "${CMAKE_BINARY_DIR}/abi_dumps/${ABI_CHECK_TARGET_MACH}")
-
-# Given a list of key value pairs such as "key1 value1 key2 value2...keyN valueN"
-# extract the value corresponding to the given key
-function(get_value_for_key a_list key value)
-  list(FIND a_list ${key} idx)
-  if (idx GREATER -1)
-    math(EXPR idx "${idx} + 1")
-    list(GET a_list ${idx} tmp_value)
-    set(${value} "${tmp_value}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-# Makes a one-entry per line list of all include paths used
-# to compile the given library target
-function(get_includes libname output)
-  get_property(lib_includes TARGET ${libname} PROPERTY INCLUDE_DIRECTORIES)
-  list(REMOVE_DUPLICATES lib_includes)
-  string(REPLACE ";" "\n    " tmp_out "${lib_includes}")
-  set(${output} "${tmp_out}" PARENT_SCOPE)
-endfunction()
-
-# Creates the XML descriptor file that describes the given library target
-# suitable for abi-compliance-checker
-function(make_lib_descriptor name)
-  set(libname "mir${name}")
-
-  # Optional argument LIBRARY_HEADER - use the given header to describe
-  # the binary library instead of assuming its described by include/<name>
-  get_value_for_key("${ARGN}" "LIBRARY_HEADER" library_header)
-  if ("${library_header}" STREQUAL "")
-    set(LIB_DESC_HEADERS "${CMAKE_SOURCE_DIR}/include/${name}\n    ${private_headers}")
-  else()
-    set(LIB_DESC_HEADERS ${library_header})
-  endif()
-
-  # FIXME: Property "LOCATION" is now deprecated
-  if (NOT ${CMAKE_MAJOR_VERSION} LESS 3)
-    cmake_policy(SET CMP0026 OLD)
-  endif()
-  get_property(LIB_DESC_LIBS TARGET ${libname} PROPERTY LOCATION)
-    
-  get_includes(${libname} LIB_DESC_INCLUDE_PATHS)
-  set(LIB_DESC_GCC_OPTS "${CMAKE_CXX_FLAGS}")
-
-  # Optional EXCLUDE_HEADERS - a list 
-  # while attempting an abi dump
-  get_value_for_key("${ARGN}" "EXCLUDE_HEADERS" LIB_DESC_SKIP_HEADERS)
-
-  configure_file(${CMAKE_SOURCE_DIR}/tools/lib_descriptor.xml.skel ${libname}_desc.xml)
-endfunction()
-
-#These headers are not part of the libmirplatform ABI
-set(mirplatform-exclude-headers "${CMAKE_SOURCE_DIR}/include/platform/mir/input")
-
-make_lib_descriptor(core)
-make_lib_descriptor(client)
-make_lib_descriptor(server)
-make_lib_descriptor(common)
-make_lib_descriptor(cookie)
-make_lib_descriptor(platform EXCLUDE_HEADERS ${mirplatform-exclude-headers})
-if(MIR_BUILD_PLATFORM_MESA_KMS)
-make_lib_descriptor(clientplatformmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
-make_lib_descriptor(platformgraphicsmesakms LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
-endif()
-make_lib_descriptor(platforminputevdev LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/input/)
-
-
-macro(_define_abi_dump_for libname)
-  set(ABI_DUMP_NAME ${ABI_DUMPS_DIR}/${libname}_next.abi.tar.gz)
-
-  add_custom_command(OUTPUT ${ABI_DUMP_NAME}
-    COMMAND abi-compliance-checker -gcc-path ${CMAKE_CXX_COMPILER} -l ${libname} -v1 next -dump-path ${ABI_DUMP_NAME} -dump-abi ${libname}_desc.xml
-    DEPENDS ${libname}
-  )
-  add_custom_target(abi-dump-${libname} DEPENDS ${ABI_DUMP_NAME})
-endmacro(_define_abi_dump_for)
-
-macro(_define_abi_check_for libname) 
-  add_custom_target(abi-check-${libname} 
-    COMMAND /bin/bash -c '${CMAKE_SOURCE_DIR}/tools/abi_check.sh ${libname} ${ABI_DUMPS_DIR} ${CMAKE_SOURCE_DIR}'
-    DEPENDS abi-dump-${libname}
-  )
-endmacro(_define_abi_check_for)
-
-set(the_libs mircore mirserver mirclient mircommon mirplatform mircookie mirplatforminputevdev)
-if(MIR_BUILD_PLATFORM_MESA_KMS)
-  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
-endif()
-
-foreach(libname ${the_libs})
-  _define_abi_dump_for(${libname})
-  _define_abi_check_for(${libname})
-  list(APPEND abi-dump-list abi-dump-${libname})
-  list(APPEND abi-check-list abi-check-${libname})
-endforeach(libname)
-
-add_custom_target(abi-dump DEPENDS ${abi-dump-list})
-add_custom_target(abi-check DEPENDS ${abi-check-list})
-
-if (MIR_ENABLE_TESTS AND ENABLE_ABI_CHECK_TEST)
-  add_test(abi-compliance-check make abi-check)
-endif()
 
=== modified file 'debian/control'
--- debian/control	2017-10-11 16:02:41 +0000
+++ debian/control	2017-10-11 16:02:41 +0000
@@ -35,7 +35,6 @@
                valgrind [amd64 i386 armhf arm64],
                libglib2.0-dev,
                libfreetype6-dev,
-               abi-compliance-checker,
                libevdev-dev,
                libinput-dev (>= 0.21),
                uuid-dev,
 
=== removed file 'doc/abi_compatibility_tools.md'
--- doc/abi_compatibility_tools.md	2017-05-08 03:04:26 +0000
+++ doc/abi_compatibility_tools.md	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Tracking ABI compatibility {#abi_compatibility_tools}
-================================
-
-A few make targets exist to help us track ABI compatibility across
-different Mir versions and ensure we increase the ABI version properly.
-These targets invoke the abi-compliance-checker tool for the actual ABI check.
-
-The targets are:
-
-* **make abi-check**
-
-  Compiles all the public libraries in the current tree and checks their ABI against the latest released archive version
-
-* **make abi-check-\<library>**
-
-  Compiles only the specified library in the current tree and checks its ABI against the latest released archive version
-
-  - *library* can be any of the public library targets such as mirclient, mirserver, mirplatform, mircommon, etc.
-
-Sample usage
-------------
-
-    $ bzr branch lp:mir && cd mir
-    $ debian/rules override_dh_auto_configure
-    $ cd <build-dir>
-    $ make abi-check
 
=== removed file 'tools/abi_check.sh'
--- tools/abi_check.sh	2017-05-08 03:04:26 +0000
+++ tools/abi_check.sh	1970-01-01 00:00:00 +0000
@@ -1,315 +0,0 @@
-#!/bin/bash
-
-set -e
-
-declare -A abi_var_for=(\
-    ["mircore"]="MIRCORE_ABI" \
-    ["mirclient"]="MIRCLIENT_ABI" \
-    ["mircommon"]="MIRCOMMON_ABI" \
-    ["mirplatform"]="MIRPLATFORM_ABI" \
-    ["mirserver"]="MIRSERVER_ABI" \
-    ["mircookie"]="MIRCOOKIE_ABI" \
-    ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
-    ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
-    ["mirplatforminputevdev"]="MIR_SERVER_INPUT_PLATFORM_ABI" )
-
-declare -A libtype=(\
-    ["mirclientplatformmesa"]="plugin-client" \
-    ["mirplatformgraphicsmesakms"]="plugin" \
-    ["mirplatforminputevdev"]="plugin" )
-
-declare -A package_name=(\
-    ["mirclientplatformmesa"]="mir-client-platform-mesa" \
-    ["mirplatformgraphicsmesakms"]="mir-platform-graphics-mesa-kms" \
-    ["mirplatforminputevdev"]="mir-platform-input-evdev" )
-
-declare -A libsoname=(\
-    ["mirclientplatformmesa"]="mir/client-platform/mesa" \
-    ["mirplatformgraphicsmesakms"]="mir/server-platform/graphics-mesa-kms" \
-    ["mirplatforminputevdev"]="mir/server-platform/input-evdev" )
-
-declare -A headers_for=(\
-    ["mirclientplatformmesa"]="src/include/client/mir/client_platform_factory.h" \
-    ["mirplatformgraphicsmesakms"]="mirplatform/mir/graphics/platform.h" \
-    ["mirplatforminputevdev"]="mirplatform/mir/input" )
-
-declare -A exclusions_for=(\
-    ["mirplatform"]="mir/input" \
-    ["mirserver"]="mir/input/input_device_hub.h" )
-
-function print_help_and_exit()
-{
-    local prog=$(basename $0)
-
-    local all_libs=${!abi_var_for[@]}
-    local all_libs=${all_libs// /|}
-    echo "Usage: $prog <libname> <abi_dump_dir> <source_dir>"
-    echo "Runs a full ABI check on the given library."
-    echo ""
-    echo "    libname=[${all_libs}]"
-    exit 0
-}
-
-function get_abi_number()
-{
-    local abi_var=${1}
-    local search_dir=${2}
-    grep -hR --include=CMakeLists.txt "set($abi_var [[:digit:]]\+)" ${search_dir}/src | grep -o '[[:digit:]]\+'
-}
-
-function is_plugin()
-{
-    local name=${1}
-    if [[ ${libtype[${name}]} == "plugin"* ]];
-    then
-        return 0
-    else
-        return 1
-    fi
-}
-
-function package_abi_for()
-{
-    local name=${1}
-    local pkg_name=lib${name}
-
-    if is_plugin ${name};
-    then
-        pkg_name=${package_name[${name}]}
-    fi
-
-    apt-cache show ${pkg_name}* | grep Package: | grep -o '[[:digit:]]\+' | sort -n -r | head -n 1
-}
-
-function needs_abi_check()
-{
-    local name=${1}
-    local source_dir=${2}
-    local abi_var=${abi_var_for[${name}]}
-
-    local old_abi=$(package_abi_for ${name})
-    local new_abi=$(get_abi_number ${abi_var} ${source_dir})
-    if [ -z "${old_abi}" ];
-    then
-        echo "Failed to find old ${abi_var}" >&2
-        exit 1
-    fi
-
-    if [ -z "${new_abi}" ];
-    then
-        echo "Failed to find new ${abi_var}" >&2
-        exit 1
-    fi
-    echo "Detected ${abi_var}_new=${new_abi}"
-    echo "Detected ${abi_var}_old=${old_abi}"
-
-    if [ "${old_abi}" == "${new_abi}" ];
-    then
-        return 0
-    else
-        return 1
-    fi
-}
-
-function prepare_pkg_dir()
-{
-    local pkg_dir=${1}
-
-    # "partial" is required by apt-get
-    mkdir -p ${pkg_dir}/partial
-}
-
-function package_name_for()
-{
-    local name=${1}
-    local pkg_name=lib${name}
-
-    if is_plugin ${name};
-    then
-        pkg_name=${package_name[${name}]}
-    fi
-
-    local abi_number=$(package_abi_for ${name})
-    echo ${pkg_name}${abi_number}
-}
-
-function header_packages_for()
-{
-    local name=${1}
-    local pkg=lib${name}-dev
-
-    if is_plugin ${name};
-    then
-        # Some plugin headers are defined in this package
-        pkg="libmirplatform-dev"
-    fi
-
-    # Only interested in other mir dev package deps
-    local dev_deps=$(apt-cache depends ${pkg} | grep Depends: | grep -o "\<libmir.*-dev\>"|  tr '\n' ' ')
-
-    # Workaround missing dependency
-    if [ ${name} == "mirserver" ] || [ ${name} == "mirplatforminputevdev" ];
-    then
-        dev_deps="${dev_deps} libmirclient-dev"
-    fi
-
-    echo "${pkg} ${dev_deps}"
-}
-
-function soname_for()
-{
-    local name=${1}
-    local pkg_dir=${2}
-    local arch=$(gcc -dumpmachine)
-    local abi_number=$(package_abi_for ${name})
-    local so_name=lib${name}
-
-    if is_plugin ${name};
-    then
-        so_name=${libsoname[${name}]}
-    fi
-
-    echo ${pkg_dir}/usr/lib/${arch}/${so_name}.so.${abi_number}
-}
-
-function download_packages()
-{
-    local name=${1}
-    local pkg_dir=${2}
-    local pkg_name=$(package_name_for ${name})
-    local header_pkgs=$(header_packages_for ${name})
-
-    echo "Downloading: ${pkg_name} ${header_pkgs} for ${name}"
-    apt-get -d -o Dir::Cache=${pkg_dir} -o Debug::NoLocking=1 install --reinstall -y ${pkg_name} ${header_pkgs}
-}
-
-function download_mir_source_into()
-{
-    local pkg_dir=${1}
-    pushd ${pkg_dir} > /dev/null
-
-    apt-get source --download-only mir
-    mkdir -p mirsource
-
-    local src_pkg=$(apt-cache showsrc mir | grep -o "mir.*orig.tar.gz" | head -n 1)
-    tar xf ${src_pkg} -C mirsource --strip-components 1
-
-    popd > /dev/null
-}
-
-function unpack_debs()
-{
-    local pkg_dir=${1}
-
-    for deb in ${pkg_dir}/archives/* ;
-    do
-        if [ ! -d ${deb} ] ; then
-            echo "unpacking: ${deb}"
-            dpkg -x ${deb} ${pkg_dir}
-        fi
-    done
-}
-
-function make_lib_descriptor()
-{
-    local name=${1}
-    local pkg_dir=${2}
-    local descriptor_file=${3}
-
-    local abi_number=$(package_abi_for ${name})
-    local lib=$(soname_for ${name} ${pkg_dir})
-
-    local lib_includes=
-    for path in $(ls ${pkg_dir}/usr/include);
-    do
-        lib_includes=${lib_includes}${pkg_dir}/usr/include/${path}"\n"
-    done
-
-    local lib_headers=${pkg_dir}/usr/include/${name}
-    local lib_skip_headers=
-    for path in ${exclusions_for[${name}]};
-    do
-        lib_skip_headers=${lib_excludes}${pkg_dir}/usr/include/${name}/${path}"\n"
-    done
-
-    if [ "${libtype[${name}]}" == "plugin-client" ];
-    then
-        download_mir_source_into ${pkg_dir}
-        lib_headers=${pkg_dir}/mirsource/${headers_for[${name}]}
-    elif [ "${libtype[${name}]}" == "plugin" ];
-    then
-        lib_headers=${pkg_dir}/usr/include/${headers_for[${name}]}
-    fi
-
-    cp ${SOURCE_DIR}/tools/lib_descriptor.xml.skel ${descriptor_file}
-    sed -i 's@${LIB_DESC_LIBS}@'${lib}'@g' ${descriptor_file}
-    sed -i 's@${LIB_DESC_HEADERS}@'${lib_headers}'@g' ${descriptor_file}
-    sed -i 's@${LIB_DESC_INCLUDE_PATHS}@'${lib_includes}'@g' ${descriptor_file}
-    sed -i 's/${LIB_DESC_GCC_OPTS}/-std=c++14/g' ${descriptor_file}
-    sed -i 's@${LIB_DESC_SKIP_HEADERS}@'${lib_skip_headers}'@g' ${descriptor_file}
-    sed -i 's/${LIB_DESC_DEFINES}//g' ${descriptor_file}
-}
-
-function dump_abi_for_prev_release()
-{
-    local name=${1}
-    local abi_dump_dir=${2}
-    local abi_dump=${3}
-    local pkg_dir=${abi_dump_dir}/prev-release-pkgs
-
-    if [ ! -s "${abi_dump}" ];
-    then
-        echo "Generating ${abi_dump}"
-        prepare_pkg_dir ${pkg_dir}
-        download_packages ${name} ${pkg_dir}
-        unpack_debs ${pkg_dir}
-
-        local descriptor_file=${pkg_dir}/${name}_desc.xml
-        make_lib_descriptor ${name} ${pkg_dir} ${descriptor_file}
-
-        abi-compliance-checker -gcc-path g++ -l ${name} -v1 previous -dump-path ${abi_dump} -dump-abi ${descriptor_file}
-    fi
-
-    if [ ! -s "${abi_dump}" ];
-    then
-        echo "Error: failed to generate abi dump for ${name}"
-        exit 1;
-    fi
-}
-
-function run_abi_check()
-{
-    local name=${1}
-    local old_dump=${2}
-    local new_dump=${3}
-    local skip_symbols_file=${4}
-
-    if [ -f ${skip_symbols_file} ];
-    then
-        local skip_symbols_opt="-skip-symbols ${skip_symbols_file}"
-    fi
-
-    echo "Running abi-compliance-checker for ${name}"
-    abi-compliance-checker -l ${NAME} -old "${old_dump}" -new "${new_dump}" ${skip_symbols_opt}
-}
-
-if [ $# -ne 3 ];
-then
-    print_help_and_exit
-fi
-
-NAME=${1}
-ABI_DUMP_DIR=${2}
-SOURCE_DIR=${3}
-
-OLD_ABI_DUMP_FILE=${ABI_DUMP_DIR}/${NAME}_prev.abi.tar.gz
-NEW_ABI_DUMP_FILE=${ABI_DUMP_DIR}/${NAME}_next.abi.tar.gz
-SKIP_SYMBOLS_FILE=${SOURCE_DIR}/tools/abi-check-${NAME}-skip-symbols
-
-if needs_abi_check ${NAME} ${SOURCE_DIR};
-then
-    dump_abi_for_prev_release ${NAME} ${ABI_DUMP_DIR} ${OLD_ABI_DUMP_FILE}
-    run_abi_check ${NAME} ${OLD_ABI_DUMP_FILE} ${NEW_ABI_DUMP_FILE} ${SKIP_SYMBOLS_FILE}
-else
-    echo "No need for abi-compliance-checker, ABI has already been bumped for ${NAME}"
-fi
 
=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh	2017-05-08 03:04:26 +0000
+++ tools/setup-partial-armhf-chroot.sh	2017-10-11 16:02:41 +0000
@@ -10,9 +10,9 @@
 usage() {
     echo "Usage: ${name} [options] mychroot-dir"
     echo "options:"
-    echo "	-a arch	Select architecture, i.e. armhf, arm64, ppc... Default is armhf"
-    echo "	-d dist	Select distribution, i.e. vivid, wily. Default is vivid"
-    echo "	-r rep	Select an additional repository for bootstrap. Default is none"
+    echo "  -a arch Select architecture, i.e. armhf, arm64, ppc... Default is armhf"
+    echo "  -d dist Select distribution, i.e. vivid, wily. Default is vivid"
+    echo "  -r rep  Select an additional repository for bootstrap. Default is none"
     echo
     echo "please supply at least a directory to create partial chroot in. (eg, ./setup-partial-armhf-chroot.sh mychroot-dir)"
 }
@@ -39,7 +39,7 @@
             sources="$sources source$sourceid"
             ;;
         :)
-            echo "Option -$OPTARG requires an argument" 
+            echo "Option -$OPTARG requires an argument"
             usage
             exit 1
             ;;
@@ -48,7 +48,7 @@
             exit 0
             ;;
         \?)
-            echo "Invalid option: -$OPTARG" 
+            echo "Invalid option: -$OPTARG"
             usage
             exit 1
             ;;
@@ -66,7 +66,7 @@
 echo "creating phablet-compatible $arch partial chroot for mir compilation in directory ${directory}"
 
 if [ ! -d ${directory} ]; then
-    mkdir -p ${directory} 
+    mkdir -p ${directory}
 fi
 
 DEBCONTROL=$(pwd)/../debian/control
@@ -83,7 +83,7 @@
 # dpkg-checkbuilddeps returns non-zero when dependencies are not met and the list is sent to stderr
 builddeps=$(dpkg-checkbuilddeps -a ${arch} --admindir=. ${DEBCONTROL} 2>&1 )
 if [ $? -eq 0 ] ; then
-    exit 0 
+    exit 0
 fi
 echo "${builddeps}"
 
@@ -97,7 +97,6 @@
                                     -e 's/Unmet build dependencies://g' \
                                     -e 's/build-essential:native//g')
 builddeps=$(echo ${builddeps} | sed 's/([^)]*)//g')
-builddeps=$(echo ${builddeps} | sed -e 's/abi-compliance-checker//g')
 builddeps=$(echo ${builddeps} | sed -e 's/multistrap//g')
 
 case ${arch} in
@@ -143,7 +142,7 @@
 done
 
 # Fakeroot is required to stop the apt update command giving up
-fakeroot multistrap -f mstrap.conf 
+fakeroot multistrap -f mstrap.conf
 
 rm -f var/cache/apt/archives/lock
 
@@ -163,4 +162,4 @@
     ln -sf $(pwd)$(readlink ${broken_symlink}) ${broken_symlink}
 done
 
-popd > /dev/null 
+popd > /dev/null