Merge pull request #427 from LebedevRI/debian

Misci Deb PPA changes
This commit is contained in:
koverstreet 2025-09-25 22:34:35 -05:00 committed by GitHub
commit 8194e2762c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 8 deletions

View File

@ -144,8 +144,9 @@ jobs:
#\$host_arch = '${{ inputs.arch }}';
\$chroot_mode = 'unshare';
\$unshare_tmpdir_template = '/tmp/tmp.sbuild.XXXXXXXXXX';
EOT
tee -a ~/.sbuildrc > /dev/null <<EOT
\$run_lintian = 1;
\$run_piuparts = 0;
\$run_autopkgtest = 0;
push @{\$unshare_mmdebstrap_extra_args}, "*", [
'--variant=apt'
];
@ -162,13 +163,22 @@ jobs:
else
exit 1
fi
if [ "${{ inputs.dist-name }}" = "debian" ];
then
KEYRING="/usr/share/keyrings/debian-keyring.gpg"
elif [ "${{ inputs.dist-name }}" = "ubuntu" ];
then
KEYRING="/usr/share/keyrings/ubuntu-archive-keyring.gpg"
else
exit 1
fi
echo "MIRROR=$(echo ${MIRROR})" >> $GITHUB_ENV
if [ "${{ inputs.dist-name }}" = "debian" ];
then
tee -a ~/.sbuildrc > /dev/null <<EOT
push @{\$unshare_mmdebstrap_extra_args}, "*", [
'$MIRROR',
'--keyring=/usr/share/keyrings/debian-keyring.gpg',
'--keyring=$KEYRING',
'--components=main'
];
EOT
@ -187,7 +197,7 @@ jobs:
tee -a ~/.sbuildrc > /dev/null <<EOT
push @{\$unshare_mmdebstrap_extra_args}, "*", [
'$MIRROR',
'--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg',
'--keyring=$KEYRING',
'--components=main,universe'
];
\$extra_repositories = [
@ -279,15 +289,15 @@ jobs:
- name: Build Qemu image for autopkgtest
timeout-minutes: 2
id: qemu-image
if: inputs.dist-name == 'debian' && inputs.arch == 'amd64'
if: inputs.dist-name == 'debian' && inputs.dist-version != 'trixie' && inputs.arch == 'amd64'
run: |
set -xe
IMAGE="/tmp/autopkgtest-qemu-image.qcow2"
echo "IMAGE=$(echo ${IMAGE})" >> $GITHUB_ENV
mmdebstrap-autopkgtest-build-qemu --boot=efi --mirror "${{ env.MIRROR }}" "${{ inputs.dist-version }}" "$IMAGE"
- name: Run autopkgtest
timeout-minutes: 60
timeout-minutes: 10
if: steps.qemu-image.conclusion != 'skipped'
run: |
set -xe
autopkgtest --no-built-binaries --apt-upgrade "$GITHUB_WORKSPACE/deb-src"/*.dsc "${{ env.BUILD_DIR }}"/*.changes -- autopkgtest-virt-qemu --boot=efi "${{ env.IMAGE }}"
autopkgtest --no-built-binaries --apt-upgrade "$GITHUB_WORKSPACE/deb-src"/*.dsc "${{ env.BUILD_DIR }}"/*.changes -- autopkgtest-virt-qemu --qemu-options="-smp $(nproc --all)" --boot=efi "${{ env.IMAGE }}"

View File

@ -43,6 +43,7 @@ jobs:
dist:
- { name: debian, version: unstable }
- { name: debian, version: forky } # Debian 14
- { name: debian, version: trixie } # Debian 13
- { name: ubuntu, version: questing } # Ubuntu 25.10 (Questing Quokka) Beta
- { name: ubuntu, version: plucky } # Ubuntu 25.04 (Plucky Puffin)
uses: ./.github/workflows/deb-buildd.yml

3
debian/control vendored
View File

@ -52,8 +52,9 @@ Architecture: linux-any
Section: kernel
Depends: ${misc:Depends},
initramfs-tools | linux-initramfs-tool,
linux-headers-generic (>= 6.16) |
linux-headers-amd64 (>= 6.16) [amd64] | linux-headers-cloud-amd64 (>= 6.16) [amd64] | linux-headers-rt-amd64 (>= 6.16) [amd64] |
linux-headers-arm64 (>= 6.16) [arm64] | linux-headers-cloud-arm64 (>= 6.16) [arm64] | linux-headers-rt-arm64 (>= 6.16) [arm64],
linux-headers-arm64 (>= 6.16) [arm64] | linux-headers-cloud-arm64 (>= 6.16) [arm64] | linux-headers-rt-arm64 (>= 6.16) [arm64]
Pre-Depends: bcachefs-tools (= ${binary:Version}),
Provides: bcachefs-kernel
Description: bcachefs kernel module DKMS source