[Pdbg] [PATCH 1/2] Move build.sh to utils directory

Amitay Isaacs amitay at ozlabs.org
Mon Aug 13 17:21:05 AEST 2018


On Mon, 2018-08-13 at 16:06 +0930, Joel Stanley wrote:
> Update travis config to point to the new location.
> 
> Add a symlink so other CI still works, we will remove this once it
> has
> been moved over.
> 
> Signed-off-by: Joel Stanley <joel at jms.id.au>

Can we also add "make check" to build.sh?

For build.sh, can we just assume it's going to be run on x86_64
platform?  That should avoid the need for --host=x86_64-linux-gnu. 
Also, simplifies adding "make check" to build.sh (we don't have to
worry about where to run "make check").


> ---
>  .build.sh                   | 59 +--------------------------------
> ----
>  .travis.yml                 |  2 +-
>  .build.sh => utils/build.sh |  0
>  3 files changed, 2 insertions(+), 59 deletions(-)
>  mode change 100755 => 120000 .build.sh
>  copy .build.sh => utils/build.sh (100%)
> 
> diff --git a/.build.sh b/.build.sh
> deleted file mode 100755
> index 59fc6c3a524b..000000000000
> --- a/.build.sh
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -#!/bin/bash
> -
> -set -e
> -
> -CONTAINER=pdbg-build
> -
> -Dockerfile=$(cat << EOF
> -FROM ubuntu:18.04
> -RUN apt-get update && apt-get install --no-install-recommends -yy \
> -	make \
> -	gcc-arm-linux-gnueabi \
> -	libc-dev-armel-cross \
> -	gcc-powerpc64le-linux-gnu \
> -	libc-dev-ppc64el-cross \
> -	autoconf \
> -	automake \
> -	libtool \
> -	git \
> -	device-tree-compiler
> -RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID}
> -g ${GROUPS} ${USER}
> -USER ${USER}
> -ENV HOME ${HOME}
> -RUN /bin/bash
> -EOF
> -)
> -
> -docker pull ubuntu:18.04
> -docker build -t ${CONTAINER} - <<< "${Dockerfile}"
> -
> -RUN="docker run --rm=true --user=${USER} -w ${PWD} -v
> ${HOME}:${HOME} -t ${CONTAINER}"
> -
> -${RUN} ./bootstrap.sh
> -
> -# Out-of-tree build, arm
> -# TODO: clean up when the build fails
> -SRCDIR=$PWD
> -TEMPDIR=`mktemp -d ${HOME}/pdbgobjXXXXXX`
> -RUN_TMP="docker run --rm=true --user=${USER} -w ${TEMPDIR} -v
> ${HOME}:${HOME} -t ${CONTAINER}"
> -${RUN_TMP} ${SRCDIR}/configure --host=arm-linux-gnueabi
> -${RUN_TMP} make
> -rm -rf ${TEMPDIR}
> -
> -# In-tree build, arm
> -${RUN} ./configure --host=arm-linux-gnueabi
> -${RUN} make
> -${RUN} make clean
> -
> -# In-tree build, powerpc64le
> -${RUN} ./configure --host=powerpc64le-linux-gnu
> -${RUN} make
> -${RUN} make clean
> -
> -# In-tree build, amd64
> -# TODO: work out how to install a amd64 compiler if we are building
> on a eg.
> -# ppc machine in a way that still works when we're on amd64
> -${RUN} ./configure --host=x86-64-linux-gnu
> -${RUN} make
> -${RUN} make clean
> diff --git a/.build.sh b/.build.sh
> new file mode 120000
> index 000000000000..d96834636319
> --- /dev/null
> +++ b/.build.sh
> @@ -0,0 +1 @@
> +utils/build.sh
> \ No newline at end of file
> diff --git a/.travis.yml b/.travis.yml
> index e6efef64657d..9e1a86bc3140 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -2,4 +2,4 @@ services:
>      - docker
>  
>  script:
> -    - ./.build.sh
> +    - ./utils/build.sh
> diff --git a/.build.sh b/utils/build.sh
> similarity index 100%
> copy from .build.sh
> copy to utils/build.sh
> -- 
> 2.17.1
> 

Amitay.
-- 

Life doesn't come with an instruction book - that's why we have fathers.



More information about the Pdbg mailing list