From 006eb78f435646f1805765b54ca0af4aa72ce0bd Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 12 Sep 2024 11:45:10 -0500
Subject: [PATCH] scripts: resync all build scripts
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
.gitlab-ci.yml | 2 ++
scripts/git.sh | 18 +++++++-----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4d365373..f4f68b23a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ before_script:
- echo "Acquire::http::Proxy \"http://192.168.1.10:3142\";" > /etc/apt/apt.conf.d/00aptproxy
- apt-get update
- apt-get upgrade -yq
+ - apt-get dist-upgrade -yq
- cd /opt/linux-src/ ; git pull ; cd -
cache:
@@ -23,6 +24,7 @@ build:
- . version.sh && echo $BRANCH
- mkdir -p /root/.cache/ccache/ || true
- tar --use-compress-program=lz4 -xf ccache.tar.lz4 -C / || true
+ - ccache -M 2G
- ccache -z
- cp -v system.sh.gitlab system.sh
- ./build_deb.sh
diff --git a/scripts/git.sh b/scripts/git.sh
index 3642c7a5c..dcce29569 100755
--- a/scripts/git.sh
+++ b/scripts/git.sh
@@ -22,17 +22,6 @@
DIR=$PWD
-#For:
-#Kernel Git
-. "${DIR}/version.sh"
-
-if [ "${USE_LOCAL_GIT_MIRROR}" ] ; then
- #linux_repo="https://git.gfnd.rcn-ee.org/kernel.org/mirror-linux-stable.git"
- #linux_stable_repo="https://git.gfnd.rcn-ee.org/kernel.org/mirror-linux-stable.git"
- linux_repo="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-kernel.git"
- linux_stable_repo="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-kernel.git"
-fi
-
CORES=$(getconf _NPROCESSORS_ONLN)
debian_stable_git="2.20.1"
#git hard requirements:
@@ -270,6 +259,13 @@ git_shallow () {
. "${DIR}/version.sh"
. "${DIR}/system.sh"
+if [ "${USE_LOCAL_GIT_MIRROR}" ] ; then
+ #linux_repo="https://git.gfnd.rcn-ee.org/kernel.org/mirror-linux-stable.git"
+ #linux_stable_repo="https://git.gfnd.rcn-ee.org/kernel.org/mirror-linux-stable.git"
+ linux_repo="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-kernel.git"
+ linux_stable_repo="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-kernel.git"
+fi
+
git_bin=$(which git)
git_major=$(LC_ALL=C ${git_bin} --version | awk '{print $3}' | cut -d. -f1)
--
GitLab