diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-01 16:22:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-01 16:22:22 +0200 |
| commit | 3d771a33d390915bc048fd057270972ef62f2082 (patch) | |
| tree | f60d0cfa984305a79689dd10aff960c2cbd9237f | |
| parent | a77d6def29792aa1c2b8752f228933b98ecd3e96 (diff) | |
| parent | 840a9918a5d212ebbbe0919b4da9ebd730123c89 (diff) | |
| download | vyos-build-3d771a33d390915bc048fd057270972ef62f2082.tar.gz vyos-build-3d771a33d390915bc048fd057270972ef62f2082.zip | |
Merge pull request #548 from vyos/mergify/bp/sagitta/pr-547
dropbear: T6195: package upgrade 2022.83-1+deb12u1 (backport #547)
| -rw-r--r-- | packages/dropbear/Jenkinsfile | 4 | ||||
| -rwxr-xr-x | packages/dropbear/build.sh | 4 | ||||
| -rw-r--r-- | vars/buildPackage.groovy | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/packages/dropbear/Jenkinsfile b/packages/dropbear/Jenkinsfile index 1b7947cf..2a449082 100644 --- a/packages/dropbear/Jenkinsfile +++ b/packages/dropbear/Jenkinsfile @@ -1,4 +1,4 @@ -// Copyright (C) 2022-2023 VyOS maintainers and contributors +// Copyright (C) 2022-2024 VyOS maintainers and contributors // // This program is free software; you can redistribute it and/or modify // in order to easy exprort images built to "external" world @@ -21,7 +21,7 @@ def pkgList = [ ['name': 'dropbear', - 'scmCommit': 'debian/2022.83-1', + 'scmCommit': 'debian/2022.83-1+deb12u1', 'scmUrl': 'https://salsa.debian.org/debian/dropbear.git', 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build.sh'], ] diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index 0934f4f7..9376fa7a 100755 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -19,5 +19,9 @@ if [ -d $PATCH_DIR ]; then fi cd ${SRC} + +echo "I: Installing build dependencies" +sudo apt-get install -y libpam0g-dev + echo "I: Build Debian Package" dpkg-buildpackage -uc -us -tc -b diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy index f000043f..89f9a7d4 100644 --- a/vars/buildPackage.groovy +++ b/vars/buildPackage.groovy @@ -194,6 +194,13 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} removesrc ${RELEASE} ${PACKAGE}'\"") } } + files = findFiles(glob: '**/*-build-deps_*.deb') + if (files) { + echo "Remove Debian build dependency files from the workspace..." + files.each { FILE -> + sh(script: "rm -f ${FILE}") + } + } files = findFiles(glob: '**/*.deb') if (files) { |