Merge pull request #694 from c-po/ddclient-build

ddclient: T5797: switch to Debian SALSA repository
This commit is contained in:
Viacheslav Hletenko 2024-07-12 23:25:38 +03:00 committed by GitHub
commit 824ffc86ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 57 deletions

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

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