Merge pull request #515 from vyos/mergify/bp/sagitta/pr-514

T6078: package upgrade to v6.6 to match kernel for ethtool and iproute2 (backport #514)

4 files changed, 64 insertions, 0 deletions

diff --git a/packages/ethtool/.gitignore b/packages/ethtool/.gitignore
new file mode 100644
index 00000000..5967d5de
--- /dev/null
+++ b/packages/ethtool/.gitignore
@@ -0,0 +1 @@
+ethtool/
diff --git a/packages/ethtool/Jenkinsfile b/packages/ethtool/Jenkinsfile
new file mode 100644
index 00000000..bddd3b63
--- /dev/null
+++ b/packages/ethtool/Jenkinsfile
@@ -0,0 +1,31 @@
+// Copyright (C) 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
+// 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': 'ethtool',
+     'scmCommit': 'debian/1%6.6-1',
+     'scmUrl': 'https://salsa.debian.org/kernel-team/ethtool',
+     '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
+buildPackage('ethtool', pkgList, null, true, "**/packages/ethtool/**")
diff --git a/packages/iproute2/.gitignore b/packages/iproute2/.gitignore
new file mode 100644
index 00000000..02be8f3d
--- /dev/null
+++ b/packages/iproute2/.gitignore
@@ -0,0 +1 @@
+iproute2/
diff --git a/packages/iproute2/Jenkinsfile b/packages/iproute2/Jenkinsfile
new file mode 100644
index 00000000..c803a0b6
--- /dev/null
+++ b/packages/iproute2/Jenkinsfile
@@ -0,0 +1,31 @@
+// Copyright (C) 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
+// 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': 'iproute2',
+     'scmCommit': 'debian/6.6.0-1_bpo12+1',
+     'scmUrl': 'https://salsa.debian.org/kernel-team/iproute2',
+     '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
+buildPackage('iproute2', pkgList, null, true, "**/packages/iproute2/**")