Merge pull request #221 from hnez/no-direct-git-dependency

meta-lxatac-software: lxatac-image: move git dep to git{hub,lab}-runner
linux-automation · Jan 27, 2025 · 53d8ced · 53d8ced
2 parents 5e45cdd + 43ccb84
commit 53d8ced
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb b/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb
@@ -40,7 +40,6 @@ IMAGE_INSTALL:append = "\
     evtest \
     fb-test \
     fio \
-    git \
     github-act-runner \
     gitlab-runner \
     gstreamer1.0 \

diff --git a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc
@@ -14,7 +14,7 @@ inherit systemd
 
 GO_IMPORT = "github.com/ChristopherHX/github-act-runner"
 
-RDEPENDS:${PN}:append = "nodejs"
+RDEPENDS:${PN}:append = "git nodejs"
 RDEPENDS:github-act-runner-dev:append = "make bash"
 
 SYSTEMD_SERVICE:${PN} = "github-act-runner.service"

diff --git a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner_0.8.0.bb b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner_0.8.0.bb
diff --git a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner_0.9.0.bb b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner_0.9.0.bb
@@ -0,0 +1,3 @@
+require github-act-runner.inc
+
+SRCREV = "5e5a7b6cc4c674adcdc2e771ecc81d1d257fc674"
diff --git a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc
@@ -9,6 +9,7 @@ SRC_URI:append = " file://gitlab-runner.service "
 GO_IMPORT = "gitlab.com/gitlab-org/gitlab-runner"
 GO_INSTALL = "${GO_IMPORT}"
 
+RDEPENDS:${PN}:append = "git"
 RDEPENDS:gitlab-runner-dev = "bash"
 
 inherit go-mod

diff --git a/...ols/gitlab-runner/gitlab-runner_17.3.1.bb → ...ols/gitlab-runner/gitlab-runner_17.5.4.bb b/...ols/gitlab-runner/gitlab-runner_17.3.1.bb → ...ols/gitlab-runner/gitlab-runner_17.5.4.bb
@@ -1,4 +1,4 @@
 require gitlab-runner.inc
 
-SRC_URI = "git://gitlab.com/gitlab-org/gitlab-runner.git;branch=17-3-stable;protocol=https"
-SRCREV = "66269445606da32c52be605feba6d70fc1a8fb0d"
+SRC_URI = "git://gitlab.com/gitlab-org/gitlab-runner.git;branch=17-5-stable;protocol=https"
+SRCREV = "d8d88d9e25349cfb7eefdc9a55f49eab794bb27a"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		require github-act-runner.inc

		SRCREV = "5e5a7b6cc4c674adcdc2e771ecc81d1d257fc674"