From baa7875889c3b8317c8651711c04d4bec64390b7 Mon Sep 17 00:00:00 2001 From: Pan Xiuli Date: Fri, 28 Aug 2020 05:41:19 +0000 Subject: [PATCH 1/2] .travis.yaml: bump image to Ubuntu 20.04 focal Ubuntu 18.04 bionic is history Remove the ppa for gcc tools as the default gcc version now is GCC 9.3 Signed-off-by: Pan Xiuli --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7e6dfd17b2526..90329857fa72ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,17 +6,14 @@ # yaml merge-expand .travis.yml exp.yml && diff -b -u .travis.yml exp.yml language: c -dist: bionic +dist: focal git: depth: 20 before_install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq - - sudo apt-get install -y python-ply python-git libelf-dev codespell fakeroot gcc-9 g++-9 gcc-aarch64-linux-gnu - - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-9 - - sudo apt-get install -y xz-utils lftp + - sudo apt-get install -y python-ply libelf-dev codespell fakeroot gcc-aarch64-linux-gnu xz-utils lftp install: - git clone --depth 5 https://github.com/thesofproject/kconfig.git From baf3fa5814151dcc0a605ec9cfe9ca8265e569b8 Mon Sep 17 00:00:00 2001 From: Pan Xiuli Date: Fri, 28 Aug 2020 07:01:33 +0000 Subject: [PATCH 2/2] .travis.yaml: use CC=clang for clang build From Linux 5.8, we can use CC=clang for clang build. Remove the lkp scripts usage. Signed-off-by: Pan Xiuli --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90329857fa72ae..6ea00ce403dbeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,6 @@ install: - pushd kconfig - &short_log git --no-pager log --oneline --graph --decorate --max-count=5 - popd - - mkdir 0day - - wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O make.cross - - chmod +x make.cross - mkdir -p $PWD/bin - git clone --depth 1 --branch v0.6.2 git://git.kernel.org/pub/scm/devel/sparse/sparse.git - BINDIR=$PWD/bin make -C sparse install @@ -72,5 +69,5 @@ jobs: - name: "BUILD CLANG SOF Kernel x86_64" script: - bash kconfig/kconfig-sof-default.sh - - COMPILER_INSTALL_PATH=$PWD/0day COMPILER=clang ./make.cross ARCH=x86_64 olddefconfig - - COMPILER_INSTALL_PATH=$PWD/0day COMPILER=clang ./make.cross ARCH=x86_64 + - make CC=clang ARCH=x86_64 olddefconfig + - make CC=clang ARCH=x86_64