From 6bcb173cf73446c11e4184652a6c3b6a1ded4fca Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 2 Aug 2022 11:04:49 +0200
Subject: hostap: T4584: add custom package build
(cherry picked from commit e008ba7de3428e3d7d1bd00d656da3946bf006c7)
---
packages/.gitignore | 6 ++++++
packages/hostap/.gitignore | 2 ++
packages/hostap/Jenkinsfile | 34 ++++++++++++++++++++++++++++++++++
packages/hostap/build.sh | 24 ++++++++++++++++++++++++
4 files changed, 66 insertions(+)
create mode 100644 packages/.gitignore
create mode 100644 packages/hostap/.gitignore
create mode 100644 packages/hostap/Jenkinsfile
create mode 100755 packages/hostap/build.sh
(limited to 'packages')
diff --git a/packages/.gitignore b/packages/.gitignore
new file mode 100644
index 00000000..b630fc5a
--- /dev/null
+++ b/packages/.gitignore
@@ -0,0 +1,6 @@
+*.udeb
+*.deb
+*.dsc
+*.buildinfo
+*.changes
+*.git
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..4930803f
--- /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@equuleus')_
+
+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, "**/packages/hostap/*")
diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh
new file mode 100755
index 00000000..a951148c
--- /dev/null
+++ b/packages/hostap/build.sh
@@ -0,0 +1,24 @@
+#!/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}
+rm -rf ${SRC}/debian/patches
+
+# Build Debian package
+cd ${SRC}
+echo "I: Build Debian hostap Package"
+dpkg-buildpackage -us -uc -tc -b -Ppkg.wpa.nogui -d
--
cgit v1.2.3
From 39958cb82fe454fa745221a16a4ccabbfd33498c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 15 Aug 2022 17:45:13 +0200
Subject: hostap: T4584: add git version to Debian package
(cherry picked from commit 8443b98f54c9c8e2a936301b9dbcdcd96c4d543e)
---
packages/hostap/build.sh | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'packages')
diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh
index a951148c..90b3358c 100755
--- a/packages/hostap/build.sh
+++ b/packages/hostap/build.sh
@@ -20,5 +20,9 @@ rm -rf ${SRC}/debian/patches
# 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 -d
--
cgit v1.2.3