diff options
author | Christian Breunig <christian@breunig.cc> | 2023-02-22 17:55:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-22 17:55:04 +0100 |
commit | 94fc0bdc1af5a078639927ccad4489b10d85faab (patch) | |
tree | 9103a98891b21d1a83efc8d6fffee49933402541 | |
parent | a7464e0f397ef339f2c20dff2024d3887086281d (diff) | |
parent | f149e079525b66bccfdf3c84a0b105f3d82291a6 (diff) | |
download | vyos-build-94fc0bdc1af5a078639927ccad4489b10d85faab.tar.gz vyos-build-94fc0bdc1af5a078639927ccad4489b10d85faab.zip |
Merge pull request #313 from sarthurdev/bookworm
debian: T5003: Revert hostap removal - AES-256 not supported in Debian.
-rw-r--r-- | packages/hostap/.gitignore | 2 | ||||
-rw-r--r-- | packages/hostap/Jenkinsfile | 34 | ||||
-rwxr-xr-x | packages/hostap/build.sh | 30 |
3 files changed, 66 insertions, 0 deletions
diff --git a/packages/hostap/.gitignore b/packages/hostap/.gitignore new file mode 100644 index 00000000..d0133c0d --- /dev/null +++ b/packages/hostap/.gitignore @@ -0,0 +1,2 @@ +hostap/ +wpa/ diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile new file mode 100644 index 00000000..9fd8e9e3 --- /dev/null +++ b/packages/hostap/Jenkinsfile @@ -0,0 +1,34 @@ +// Copyright (C) 2022 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 +// it under the terms of the GNU General Public License version 2 or later as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +@NonCPS + +// Using a version specifier library, use 'current' branch. The underscore (_) +// is not a typo! You need this underscore if the line immediately after the +// @Library annotation is not an import statement! +@Library('vyos-build@current')_ + +def pkgList = [ + ['name': 'wpa', + 'scmCommit': 'debian/2%2.10-7', + 'scmUrl': 'https://salsa.debian.org/debian/wpa', + 'buildCmd': '/bin/true'], + ['name': 'hostap', + 'scmCommit': 'b704dc72ef824dfdd96674b90179b274d1d38105', + 'scmUrl': 'git://w1.fi/srv/git/hostap.git', + 'buildCmd': 'cd ..; ./build.sh'], +] + +// Start package build using library function from https://github.com/vyos/vyos-build +buildPackage('hostap', pkgList, null, true, "**/packages/hostap/*") diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh new file mode 100755 index 00000000..4e140d80 --- /dev/null +++ b/packages/hostap/build.sh @@ -0,0 +1,30 @@ +#!/bin/sh +CWD=$(pwd) +set -e + +SRC=hostap +SRC_DEB=wpa + +if [ ! -d ${SRC} ]; then + echo "${SRC} directory does not exists, please 'git clone'" + exit 1 +fi +if [ ! -d ${SRC_DEB} ]; then + echo "${SRC_DEB} directory does not exists, please 'git clone'" + exit 1 +fi + +echo "I: Copy Debian build instructions" +cp -a ${SRC_DEB}/debian ${SRC} +# Preserve Debian's default of allowing TLSv1.0 for compatibility +find ${SRC}/debian/patches -mindepth 1 ! -name allow-tlsv1.patch -delete +echo 'allow-tlsv1.patch' > ${SRC}/debian/patches/series + +# Build Debian package +cd ${SRC} +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 + +echo "I: Build Debian hostap Package" +dpkg-buildpackage -us -uc -tc -b -Ppkg.wpa.nogui |