From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 19 Aug 2018 10:26:18 +0000 (+0000)
Subject: ci: install kernel headers after compiler dependencies
X-Git-Tag: v4.25~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b0d371b3f68a8747ca6f48a809d09e8d3d41122;p=strace

ci: install kernel headers after compiler dependencies

* ci/install-dependencies.sh: Install kernel headers after compiler
dependencies to avoid a needless attempt to install $common_packages.
---

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index f510772c..4e5445f5 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -49,10 +49,23 @@ clone_repo()
 		git clone --depth=1 ${branch:+--branch $branch} "$src" "$dst"
 }
 
+case "$CC" in
+	gcc-*)
+		retry_if_failed \
+			$sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+		apt_get_install $common_packages "$CC"-multilib
+		;;
+	clang*)
+		apt_get_install $common_packages "$CC"
+		;;
+	*)
+		apt_get_install $common_packages
+		;;
+esac
+
 case "$KHEADERS" in
 	*/*)
 		clone_repo https://github.com/"$KHEADERS" kernel ${KBRANCH-}
-		apt_get_install $common_packages
 		$sudo make -C kernel headers_install INSTALL_HDR_PATH=/opt/kernel
 		$sudo rm -rf kernel
 		KHEADERS_INC=/opt/kernel/include
@@ -63,20 +76,8 @@ case "$KHEADERS" in
 esac
 
 case "$CC" in
-	gcc)
-		apt_get_install $common_packages
-		;;
-	gcc-*)
-		retry_if_failed \
-			$sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-		apt_get_install $common_packages "$CC"-multilib
-		;;
-	clang*)
-		apt_get_install $common_packages "$CC"
-		;;
 	musl-gcc)
 		clone_repo strace/musl musl
-		apt_get_install $common_packages
 		cd musl
 			CC=gcc
 			build=