Skip to content

Commit 0930b4e

Browse files
committed
ci: debos: Switch to local APT repository
Create a local APT repository during debos builds and use it to test mainline kernels, instead of local-debs. Signed-off-by: Loïc Minier <[email protected]>
1 parent 9a32db5 commit 0930b4e

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

.github/workflows/debos.yml

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,39 +57,43 @@ jobs:
5757
with:
5858
fetch-depth: 0
5959

60-
- name: Copy Linux deb and U-Boot for RB1 from fileserver space for downloads
61-
run: |
62-
set -ux
63-
dir="/fileserver-downloads/qcom-deb-images"
64-
if [ "${{ inputs.mainline_kernel }}" = true ]; then
65-
mkdir -v debos-recipes/local-debs
66-
# copy linux-image but not the -dbg e.g.
67-
# linux-image-6.15.0-..._6.15.0...-1_arm64.deb but not
68-
# linux-image-6.15.0-...-dbg_6.15.0...-1_arm64.deb
69-
find "${dir}/linux-deb-latest/" \
70-
-name linux-image\*.deb \
71-
-not -name linux-image\*-dbg_\*.deb \
72-
-exec cp -av '{}' debos-recipes/local-debs/ \;
73-
fi
74-
# copy U-Boot RB1 binary
75-
cp -av "${dir}/u-boot-rb1-latest/rb1-boot.img" .
60+
- name: Copy U-Boot for RB1 from fileserver space for downloads
61+
run: cp -av "/fileserver-downloads/qcom-deb-images/u-boot-rb1-latest/rb1-boot.img" .
7662

7763
# mtools is needed for the flash recipe
7864
- name: Install debos and dependencies of the recipes
7965
run: apt -y install debos mtools
8066

67+
- name: Setup local APT repo
68+
run: |
69+
set -ux -o pipefail
70+
71+
# needed for apt-ftparchive
72+
apt -y install --no-install-recommends apt-utils
73+
mkdir -v local-apt-repo
74+
75+
# optionally, copy mainline kernel debs
76+
if [ "${{ inputs.mainline_kernel }}" = true ]; then
77+
mkdir -v local-apt-repo/linux-deb-latest
78+
# get mainline kernel from the fileserver space for downloads
79+
cp -av /fileserver-downloads/qcom-deb-images/linux-deb-latest/*.deb \
80+
local-apt-repo/linux-deb-latest
81+
fi
82+
83+
(
84+
cd local-apt-repo
85+
apt-ftparchive packages . >Packages
86+
apt-ftparchive release . >Release
87+
)
88+
8189
- name: Build rootfs with debos
8290
run: |
8391
set -ux
84-
localdebs=""
85-
if [ -d debos-recipes/local-debs ]; then
86-
localdebs="-t localdebs:local-debs/"
87-
fi
8892
debos \
8993
-t overlays:'${{ inputs.overlays }}' \
9094
-t experimentalkernel:true \
9195
-t xfcedesktop:true \
92-
${localdebs} \
96+
-t aptlocalrepo:${PWD}/local-apt-repo \
9397
-t kernelpackage:'${{ inputs.kernelpackage }}' \
9498
--print-recipe \
9599
debos-recipes/qualcomm-linux-debian-rootfs.yaml

.github/workflows/linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
uses: ./.github/workflows/debos.yml
101101
with:
102102
mainline_kernel: true
103+
kernelpackage: linux-image-6.17.0-rc3
103104

104105
test-mainline-linux:
105106
uses: ./.github/workflows/test.yml

0 commit comments

Comments
 (0)