summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-03-10 21:38:49 +0100
committerChristian Breunig <christian@breunig.cc>2023-03-10 21:38:49 +0100
commitf163deaf360e1ea3216bc8d144902a239491a3df (patch)
tree8e0236d1b915a85271d2a236edd5492d416eeaac
parent1af87a77494b448ad9933e7f347c430c2136efe2 (diff)
downloadvyos-build-f163deaf360e1ea3216bc8d144902a239491a3df.tar.gz
vyos-build-f163deaf360e1ea3216bc8d144902a239491a3df.zip
Docker: T5076: unbloat container - remove dependencies for hostap
-rw-r--r--docker/Dockerfile14
-rw-r--r--packages/hostap/Jenkinsfile4
2 files changed, 2 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8fc7b25b..33b65942 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -484,20 +484,6 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
pkg-config; \
fi
-# Packages needed for hostapd (wpa_supplicant)
-RUN apt-get update && apt-get install -y \
- libdbus-1-dev \
- libssl-dev \
- libncurses5-dev \
- libpcsclite-dev \
- libnl-3-dev \
- libnl-genl-3-dev \
- libnl-route-3-dev \
- libreadline-dev \
- pkg-config \
- docbook-to-man \
- docbook-utils
-
# Packages needed for Accel-PPP
# XXX: please note that this must be installed after nftable dependencies - otherwise
# APT will remove liblua5.3-dev which breaks the Accel-PPP build
diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile
index d7dd063e..e04f09e1 100644
--- a/packages/hostap/Jenkinsfile
+++ b/packages/hostap/Jenkinsfile
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 VyOS maintainers and contributors
+// Copyright (C) 2022-2023 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
@@ -27,7 +27,7 @@ def pkgList = [
['name': 'hostap',
'scmCommit': '6b9c86466',
'scmUrl': 'git://w1.fi/srv/git/hostap.git',
- 'buildCmd': 'cd ..; ./build.sh'],
+ 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build.sh'],
]
// Start package build using library function from https://github.com/vyos/vyos-build