diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-03-11 12:59:17 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-03-11 12:59:17 +0100 |
| commit | 633ba252a92957091da2941715e8edd0e53aa31e (patch) | |
| tree | b85717bbe2eb6cf302726e2316e9378f956e84e9 | |
| parent | 74173b1ba5e524100828983f99ad077cc1f54b57 (diff) | |
| download | vyos-build-633ba252a92957091da2941715e8edd0e53aa31e.tar.gz vyos-build-633ba252a92957091da2941715e8edd0e53aa31e.zip | |
hostap: T5076: move build dependency installation to build.sh
Fix for commit f163dea ("Docker: T5076: unbloat container - remove dependencies
for hostap") as in the hostap Git repo there are no Debian build files available,
they will later be copied in by build.sh from Debian SALSA wpa repository.
| -rw-r--r-- | packages/hostap/Jenkinsfile | 2 | ||||
| -rwxr-xr-x | packages/hostap/build.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile index e04f09e1..1aeb4521 100644 --- a/packages/hostap/Jenkinsfile +++ b/packages/hostap/Jenkinsfile @@ -27,7 +27,7 @@ def pkgList = [ ['name': 'hostap', 'scmCommit': '6b9c86466', 'scmUrl': 'git://w1.fi/srv/git/hostap.git', - 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build.sh'], + 'buildCmd': 'cd ..; ./build.sh'], ] // Start package build using library function from https://github.com/vyos/vyos-build diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh index 98b77d38..c66bda3d 100755 --- a/packages/hostap/build.sh +++ b/packages/hostap/build.sh @@ -22,6 +22,10 @@ echo 'allow-tlsv1.patch' > ${SRC}/debian/patches/series # Build Debian package cd ${SRC} + +echo "I: Ensure Debian build dependencies are met" +sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends" + echo "I: Create new Debian Package version" version="$(git describe --tags | tr _ .)" dch -v ${version:7} "New version to support AES-GCM-256 for MACsec" -b |