vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

ddclient: T5797: switch to Debian SALSA repository

Browse Source 
Commit 368b89ef05 ("ddclient: T5797: Upgrade to ddclient 3.11.2") bumped the
ddclient version by using the build system from Debian SALSA repo and the
upstream ddclient source code.

Debian now provides the same version from the SALSA repos.
This commit is contained in:
Christian Breunig 2024-07-12 20:53:19 +02:00
parent 8ec205dd21
commit 7f7030d928
2 changed files with 4 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/ddclient/Jenkinsfile vendored
View File

@ -1,4 +1,4 @@
// Copyright (C) 2023 VyOS maintainers and contributors
// Copyright (C) 2023-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
@ -20,14 +20,10 @@
@Library('vyos-build@current')_
def pkgList = [
['name': 'ddclient-debian',
'scmCommit': 'debian/3.10.0-3',
['name': 'ddclient',
'scmCommit': '93bd643',
'scmUrl': 'https://salsa.debian.org/debian/ddclient',
'buildCmd': '/bin/true'],
['name': 'ddclient-github',
'scmCommit': 'v3.11.2',
'scmUrl': 'https://github.com/ddclient/ddclient',
'buildCmd': 'cd ..; ./build.sh'],
'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; dpkg-buildpackage -uc -us -tc -b'],
]
// Start package build using library function from https://github.com/vyos/vyos-build

49
packages/ddclient/build.sh
View File

@ -1,49 +0,0 @@
#!/bin/bash
CWD=$(pwd)
set -e
SRC_DEBIAN=ddclient-debian
SRC_GITHUB=ddclient-github
if [ ! -d ${SRC_DEBIAN} ]; then
echo "${SRC_DEBIAN} directory does not exists, please 'git clone'"
exit 1
fi
if [ ! -d ${SRC_GITHUB} ]; then
echo "${SRC_GITHUB} directory does not exists, please 'git clone'"
exit 1
fi
echo "I: Copy Debian build instructions"
cp -a ${SRC_DEBIAN}/debian ${SRC_GITHUB}
# Preserve some of the Debian's default patches
cat > ${SRC_GITHUB}/debian/patches/series << EOF
maxinterval.diff
news.diff
EOF
# Remove vestigial documentation
sed -i '/README\.ssl/d' ${SRC_GITHUB}/debian/docs
PATCH_DIR=${CWD}/patches
if [ -d ${PATCH_DIR} ]; then
for patch in $(ls ${PATCH_DIR})
do
echo "I: Apply patch: ${patch} to main repository"
cp ${PATCH_DIR}/${patch} ${SRC_GITHUB}/debian/patches/
echo ${patch} >> ${SRC_GITHUB}/debian/patches/series
done
fi
cd ${SRC_GITHUB}
echo "I: Ensure Debian build dependencies are met"
sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"
echo "I: Bump Debian Package version"
version="$(git describe --tags)"
dch -v "${version:1}+vyos0" "Patchset for miscellaneous fixes"
dch -a "Forward port to upstream version ${version:1}"
echo "I: Build Debian Package"
dpkg-buildpackage -uc -us -tc -b