From e68ec05f2f9f43dc771d89d88fd714da05d6d988 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Mon, 17 Nov 2025 19:51:27 +0100
Subject: [PATCH] Backport "CI: Fix more issues introduced by the removal of
 the extract-source job"

This backports merge request kernel-team/linux!1675
---
 debian/changelog    |  3 +++
 debian/salsa-ci.yml | 56 +++++++++++++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 387e651368..cba4e1107f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ linux (6.16.12-1~bpo13+1) UNRELEASED; urgency=medium
 
   * Rebuild for trixie-backports
   * d/salsa-ci.yml: Adjust filenames to allow source package name suffix
+  * d/salsa-ci.yml: Fix cache configuration for build job
+  * d/salsa-ci.yml: Move orig tarball generation to a separate job again
+  * d/salsa-ci.yml: Restore lintian checking of source package
 
  -- Ben Hutchings <benh@debian.org>  Mon, 17 Nov 2025 19:44:43 +0100
 
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 25c835cbab..72a4019a2d 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -19,23 +19,55 @@ variables:
 
 # Add stages for signed packages
 stages:
+  - provisioning
   - build
   - publish
   - sign-code
   - build-signed
   - test
 
+orig:
+  stage: provisioning
+  image: $SALSA_CI_IMAGES_BASE
+  cache:
+    key: "orig-${RELEASE}"
+    paths:
+      - orig
+  extends:
+    - .artifacts-default-expire
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null
+  script:
+    # Move orig tarball cache
+    - |
+      if [ -d orig ]; then
+          mv orig/* ..
+          rmdir orig
+      fi
+
+    - apt-get update
+    - eatmydata apt-get install --no-install-recommends -y devscripts git
+    - USCAN_VCS_EXPORT_UNCOMPRESSED=yes origtargz -dt
+
+    # Move orig tarballs back to where GitLab wants them
+    - mkdir orig
+    - mv ../*.orig.tar.* orig
+
 # Our modified build jobs
 
 build:
   timeout: 3 hours
   cache:
-    key: "orig-${RELEASE}"
-    paths:
-      - orig
-    key: "build-${BUILD_ARCH}_${HOST_ARCH}"
-    paths:
-      - .ccache
+    - key: "orig-${RELEASE}"
+      paths:
+        - orig
+      policy: pull
+    - key: "build-${BUILD_ARCH}_${HOST_ARCH}"
+      paths:
+        - .ccache
+  needs:
+    - job: orig
   extends:
     - .build-definition
   rules:
@@ -55,15 +87,11 @@ build:
       fi
 
     # Install dependencies of gencontrol.py and debian/rules orig
-    # plus origtargz
     - apt-get update
     - |
       eatmydata apt-get install --no-install-recommends -y \
         debhelper \
-        devscripts \
-        git \
         kernel-wedge \
-        libio-string-perl \
         python3 \
         python3-dacite \
         python3-debian \
@@ -76,7 +104,6 @@ build:
     - upstream_version=$(echo $version | sed 's/-[^-]*$//')
 
     # Merge upstream source
-    - USCAN_VCS_EXPORT_UNCOMPRESSED=yes origtargz -dt
     - debian/rules orig
 
     # Fudge source version and distribution *before* gencontrol.py
@@ -97,12 +124,7 @@ build:
     # Put packed source in artifacts
     - dpkg-buildpackage -uc -us -S -sa -d
     - mkdir -p ${WORKING_DIR}
-    - cp ../${source}_${upstream_version}.orig.tar.xz ${WORKING_DIR}
-    - mv ../${source}_${version}.dsc ../${source}_${version}.debian.tar.xz ${WORKING_DIR}
-
-    # Move orig tarballs back to where GitLab wants them
-    - mkdir ${CI_PROJECT_DIR}/orig
-    - cp -v ${WORKING_DIR}/*.orig.tar.* ${CI_PROJECT_DIR}/orig
+    - mv ../${source}_${upstream_version}.orig.tar.xz ../${source}_${version}.dsc ../${source}_${version}.debian.tar.xz ../${source}_${version}_source.buildinfo ../${source}_${version}_source.changes ${WORKING_DIR}
 
     - chown -R 'salsa-ci:' ${WORKING_DIR} ${CCACHE_DIR}