diff options
Diffstat (limited to 'packages')
26 files changed, 666 insertions, 424 deletions
diff --git a/packages/ethtool/.gitignore b/packages/ethtool/.gitignore deleted file mode 100644 index 5967d5de..00000000 --- a/packages/ethtool/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ethtool/ diff --git a/packages/ethtool/Jenkinsfile b/packages/ethtool/Jenkinsfile deleted file mode 100644 index fd503780..00000000 --- a/packages/ethtool/Jenkinsfile +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (C) 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 -// 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.1-1', - 'scmUrl': 'https://salsa.debian.org/kernel-team/ethtool.git', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('dropbear', pkgList, null, true, "**/packages/dropbear/*") diff --git a/packages/fastnetmon/.gitignore b/packages/fastnetmon/.gitignore deleted file mode 100644 index 6831db67..00000000 --- a/packages/fastnetmon/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -fastnetmon/ -fastnetmon-debian-salsa/ diff --git a/packages/fastnetmon/Jenkinsfile b/packages/fastnetmon/Jenkinsfile deleted file mode 100644 index 710b58ff..00000000 --- a/packages/fastnetmon/Jenkinsfile +++ /dev/null @@ -1,34 +0,0 @@ -// 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': 'fastnetmon-debian-salsa', - 'scmCommit': 'debian/1.2.2-1', - 'scmUrl': 'https://salsa.debian.org/debian/fastnetmon.git', - 'buildCmd': '/bin/true'], - ['name': 'fastnetmon', - 'scmCommit': 'v1.2.2', - 'scmUrl': 'https://github.com/pavel-odintsov/fastnetmon.git', - 'buildCmd': 'cd ..; ./build.sh'], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('fastnetmon', pkgList, null, false, "**/packages/fastnetmon/*") diff --git a/packages/fastnetmon/build.sh b/packages/fastnetmon/build.sh deleted file mode 100755 index 1230e650..00000000 --- a/packages/fastnetmon/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -CWD=$(pwd) -set -e - -SRC=fastnetmon -if [ ! -d ${SRC} ]; then - echo "Source directory does not exists, please 'git clone'" - exit 1 -fi - -tar -czf fastnetmon_$(head -n 1 fastnetmon-debian-salsa/debian/changelog|awk '{print $2}'|sed 's/[()]//g' | sed -E 's/(\-[0-9]+)?$//').orig.tar.gz fastnetmon - -cd ${SRC} -rm -rf debian && cp -a ../fastnetmon-debian-salsa/debian/ . - -dpkg-buildpackage -uc -us -tc -b -d diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index d74244d6..4dd3eb20 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -24,7 +24,7 @@ def pkgList = [ ['name': 'libyang', 'scmCommit': 'v2.0.164', 'scmUrl': 'https://github.com/CESNET/libyang.git', - 'buildCmd': 'apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} +'], + 'buildCmd': 'pipx run apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} +'], ['name': 'rtrlib', 'scmCommit': 'v0.8.0', 'scmUrl': 'https://github.com/rtrlib/rtrlib.git', diff --git a/packages/frr/patches/0001-tools-Add-missing-daemons.patch b/packages/frr/patches/0001-tools-Add-missing-daemons.patch new file mode 100644 index 00000000..0dd7d1c6 --- /dev/null +++ b/packages/frr/patches/0001-tools-Add-missing-daemons.patch @@ -0,0 +1,37 @@ +From bad924dd359670b92cfb44e4657ba047a0ffec10 Mon Sep 17 00:00:00 2001 +From: Yuxiang Zhu <vfreex@gmail.com> +Date: Tue, 10 Jan 2023 03:18:05 +0800 +Subject: [PATCH 1/2] tools: Add missing daemons + +Got `ERROR: Daemon babeld is not a valid option for 'show running-config'` when using `frr-reload.py --reload --daemon babeld`. + +Adds `babeld` and `nhrpd` as valid daemons. + +Signed-off-by: Yuxiang Zhu <vfreex@gmail.com> +--- + tools/frr-reload.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/frr-reload.py b/tools/frr-reload.py +index bf402e1be..dfbc9b800 100755 +--- a/tools/frr-reload.py ++++ b/tools/frr-reload.py +@@ -1914,6 +1914,7 @@ if __name__ == "__main__": + "bgpd", + "fabricd", + "isisd", ++ "babeld", + "ospf6d", + "ospfd", + "pbrd", +@@ -1925,6 +1926,7 @@ if __name__ == "__main__": + "staticd", + "vrrpd", + "ldpd", ++ "nhrpd", + "pathd", + "bfdd", + "eigrpd", +-- +2.37.1 (Apple Git-137.1) + diff --git a/packages/frr/patches/0002-babeld-Add-missing-no-commands.patch b/packages/frr/patches/0002-babeld-Add-missing-no-commands.patch new file mode 100644 index 00000000..af7226ed --- /dev/null +++ b/packages/frr/patches/0002-babeld-Add-missing-no-commands.patch @@ -0,0 +1,526 @@ +From 7d3ab29ab035996038c1cbee1f26627a8313e220 Mon Sep 17 00:00:00 2001 +From: Yuxiang Zhu <vfreex@gmail.com> +Date: Sat, 14 Jan 2023 20:02:41 +0800 +Subject: [PATCH 2/2] babeld: Add missing `no` commands + +Some babeld commands doesn't have the corresponding negative commands +defined, so those commands doesn't work with frr-reload.py. + +This PR adds those missing commands. + +Signed-off-by: Yuxiang Zhu <vfreex@gmail.com> +--- + babeld/.gitignore | 1 + + babeld/babel_interface.c | 209 ++++++++++++++------------------------- + babeld/babeld.c | 38 ++++--- + babeld/subdir.am | 4 + + 4 files changed, 98 insertions(+), 154 deletions(-) + +diff --git a/babeld/.gitignore b/babeld/.gitignore +index 71ef6786c..abb4d9321 100644 +--- a/babeld/.gitignore ++++ b/babeld/.gitignore +@@ -5,3 +5,4 @@ + !Makefile + !subdir.am + !.gitignore ++*_clippy.c +diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c +index 00fb58e57..cc5089801 100644 +--- a/babeld/babel_interface.c ++++ b/babeld/babel_interface.c +@@ -42,6 +42,10 @@ THE SOFTWARE. + #include "xroute.h" + #include "babel_errors.h" + ++#ifndef VTYSH_EXTRACT_PL ++#include "babeld/babel_interface_clippy.c" ++#endif ++ + DEFINE_MTYPE_STATIC(BABELD, BABEL_IF, "Babel Interface"); + + #define IS_ENABLE(ifp) (babel_enable_if_lookup(ifp->name) >= 0) +@@ -307,9 +311,10 @@ babel_set_wired_internal(babel_interface_nfo *babel_ifp, int wired) + } + + /* [Interface Command] Tell the interface is wire. */ +-DEFUN (babel_set_wired, ++DEFPY (babel_set_wired, + babel_set_wired_cmd, +- "babel wired", ++ "[no] babel wired", ++ NO_STR + "Babel interface commands\n" + "Enable wired optimizations\n") + { +@@ -319,14 +324,15 @@ DEFUN (babel_set_wired, + babel_ifp = babel_get_if_nfo(ifp); + + assert (babel_ifp != NULL); +- babel_set_wired_internal(babel_ifp, 1); ++ babel_set_wired_internal(babel_ifp, no ? 0 : 1); + return CMD_SUCCESS; + } + + /* [Interface Command] Tell the interface is wireless (default). */ +-DEFUN (babel_set_wireless, ++DEFPY (babel_set_wireless, + babel_set_wireless_cmd, +- "babel wireless", ++ "[no] babel wireless", ++ NO_STR + "Babel interface commands\n" + "Disable wired optimizations (assume wireless)\n") + { +@@ -336,34 +342,17 @@ DEFUN (babel_set_wireless, + babel_ifp = babel_get_if_nfo(ifp); + + assert (babel_ifp != NULL); +- babel_set_wired_internal(babel_ifp, 0); ++ babel_set_wired_internal(babel_ifp, no ? 1 : 0); + return CMD_SUCCESS; + } + + /* [Interface Command] Enable split horizon. */ +-DEFUN (babel_split_horizon, ++DEFPY (babel_split_horizon, + babel_split_horizon_cmd, +- "babel split-horizon", +- "Babel interface commands\n" +- "Enable split horizon processing\n") +-{ +- VTY_DECLVAR_CONTEXT(interface, ifp); +- babel_interface_nfo *babel_ifp; +- +- babel_ifp = babel_get_if_nfo(ifp); +- +- assert (babel_ifp != NULL); +- babel_ifp->flags |= BABEL_IF_SPLIT_HORIZON; +- return CMD_SUCCESS; +-} +- +-/* [Interface Command] Disable split horizon (default). */ +-DEFUN (no_babel_split_horizon, +- no_babel_split_horizon_cmd, +- "no babel split-horizon", ++ "[no] babel split-horizon", + NO_STR + "Babel interface commands\n" +- "Disable split horizon processing\n") ++ "Enable split horizon processing\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +@@ -371,213 +360,180 @@ DEFUN (no_babel_split_horizon, + babel_ifp = babel_get_if_nfo(ifp); + + assert (babel_ifp != NULL); +- babel_ifp->flags &= ~BABEL_IF_SPLIT_HORIZON; ++ if (!no) ++ SET_FLAG(babel_ifp->flags, BABEL_IF_SPLIT_HORIZON); ++ else ++ UNSET_FLAG(babel_ifp->flags, BABEL_IF_SPLIT_HORIZON); + return CMD_SUCCESS; + } + + /* [Interface Command]. */ +-DEFUN (babel_set_hello_interval, ++DEFPY (babel_set_hello_interval, + babel_set_hello_interval_cmd, +- "babel hello-interval (20-655340)", ++ "[no] babel hello-interval (20-655340)", ++ NO_STR + "Babel interface commands\n" + "Time between scheduled hellos\n" + "Milliseconds\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +- int interval; +- +- interval = strtoul(argv[2]->arg, NULL, 10); + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + +- babel_ifp->hello_interval = interval; ++ babel_ifp->hello_interval = no ? ++ BABEL_DEFAULT_HELLO_INTERVAL : hello_interval; + return CMD_SUCCESS; + } + + /* [Interface Command]. */ +-DEFUN (babel_set_update_interval, ++DEFPY (babel_set_update_interval, + babel_set_update_interval_cmd, +- "babel update-interval (20-655340)", ++ "[no] babel update-interval (20-655340)", ++ NO_STR + "Babel interface commands\n" + "Time between scheduled updates\n" + "Milliseconds\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +- int interval; +- +- interval = strtoul(argv[2]->arg, NULL, 10); + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + +- babel_ifp->update_interval = interval; ++ babel_ifp->update_interval = no ? ++ BABEL_DEFAULT_UPDATE_INTERVAL : update_interval; + return CMD_SUCCESS; + } + +-DEFUN (babel_set_rxcost, ++DEFPY (babel_set_rxcost, + babel_set_rxcost_cmd, +- "babel rxcost (1-65534)", ++ "[no] babel rxcost (1-65534)", ++ NO_STR + "Babel interface commands\n" + "Rxcost multiplier\n" + "Units\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +- int rxcost; +- +- rxcost = strtoul(argv[2]->arg, NULL, 10); + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + ++ if (no) ++ rxcost = CHECK_FLAG(babel_ifp->flags, BABEL_IF_WIRED) ? ++ BABEL_DEFAULT_RXCOST_WIRED : BABEL_DEFAULT_RXCOST_WIRELESS; ++ + babel_ifp->cost = rxcost; + return CMD_SUCCESS; + } + +-DEFUN (babel_set_rtt_decay, ++DEFPY (babel_set_rtt_decay, + babel_set_rtt_decay_cmd, +- "babel rtt-decay (1-256)", ++ "[no] babel rtt-decay (1-256)", ++ NO_STR + "Babel interface commands\n" + "Decay factor for exponential moving average of RTT samples\n" + "Units of 1/256\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +- int decay; +- +- decay = strtoul(argv[2]->arg, NULL, 10); + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + +- babel_ifp->rtt_decay = decay; ++ babel_ifp->rtt_decay = no ? BABEL_DEFAULT_RTT_DECAY : rtt_decay; + return CMD_SUCCESS; + } + +-DEFUN (babel_set_rtt_min, ++DEFPY (babel_set_rtt_min, + babel_set_rtt_min_cmd, +- "babel rtt-min (1-65535)", ++ "[no] babel rtt-min (1-65535)", ++ NO_STR + "Babel interface commands\n" + "Minimum RTT starting for increasing cost\n" + "Milliseconds\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +- int rtt; +- +- rtt = strtoul(argv[2]->arg, NULL, 10); + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + + /* The value is entered in milliseconds but stored as microseconds. */ +- babel_ifp->rtt_min = rtt * 1000; ++ babel_ifp->rtt_min = no ? BABEL_DEFAULT_RTT_MIN : rtt_min * 1000; + return CMD_SUCCESS; + } + +-DEFUN (babel_set_rtt_max, ++DEFPY (babel_set_rtt_max, + babel_set_rtt_max_cmd, +- "babel rtt-max (1-65535)", ++ "[no] babel rtt-max (1-65535)", ++ NO_STR + "Babel interface commands\n" + "Maximum RTT\n" + "Milliseconds\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +- int rtt; +- +- rtt = strtoul(argv[2]->arg, NULL, 10); + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + + /* The value is entered in milliseconds but stored as microseconds. */ +- babel_ifp->rtt_max = rtt * 1000; ++ babel_ifp->rtt_max = no ? BABEL_DEFAULT_RTT_MAX : rtt_max * 1000; + return CMD_SUCCESS; + } + +-DEFUN (babel_set_max_rtt_penalty, ++DEFPY (babel_set_max_rtt_penalty, + babel_set_max_rtt_penalty_cmd, +- "babel max-rtt-penalty (0-65535)", ++ "[no] babel max-rtt-penalty (0-65535)", ++ NO_STR + "Babel interface commands\n" + "Maximum additional cost due to RTT\n" + "Milliseconds\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +- int penalty; +- +- penalty = strtoul(argv[2]->arg, NULL, 10); + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + +- babel_ifp->max_rtt_penalty = penalty; ++ babel_ifp->max_rtt_penalty = no ? ++ BABEL_DEFAULT_MAX_RTT_PENALTY : max_rtt_penalty; + return CMD_SUCCESS; + } + +-DEFUN (babel_set_enable_timestamps, ++DEFPY (babel_set_enable_timestamps, + babel_set_enable_timestamps_cmd, +- "babel enable-timestamps", +- "Babel interface commands\n" +- "Enable timestamps\n") +-{ +- VTY_DECLVAR_CONTEXT(interface, ifp); +- babel_interface_nfo *babel_ifp; +- +- babel_ifp = babel_get_if_nfo(ifp); +- assert (babel_ifp != NULL); +- +- babel_ifp->flags |= BABEL_IF_TIMESTAMPS; +- return CMD_SUCCESS; +-} +- +-DEFUN (no_babel_set_enable_timestamps, +- no_babel_set_enable_timestamps_cmd, +- "no babel enable-timestamps", ++ "[no] babel enable-timestamps", + NO_STR + "Babel interface commands\n" +- "Disable timestamps\n") ++ "Enable timestamps\n") + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; + + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); +- +- babel_ifp->flags &= ~BABEL_IF_TIMESTAMPS; ++ if (!no) ++ SET_FLAG(babel_ifp->flags, BABEL_IF_TIMESTAMPS); ++ else ++ UNSET_FLAG(babel_ifp->flags, BABEL_IF_TIMESTAMPS); + return CMD_SUCCESS; + } + +-DEFUN (babel_set_channel, ++DEFPY (babel_set_channel, + babel_set_channel_cmd, +- "babel channel (1-254)", +- "Babel interface commands\n" +- "Channel number for diversity routing\n" +- "Number\n") +-{ +- VTY_DECLVAR_CONTEXT(interface, ifp); +- babel_interface_nfo *babel_ifp; +- int channel; +- +- channel = strtoul(argv[2]->arg, NULL, 10); +- +- babel_ifp = babel_get_if_nfo(ifp); +- assert (babel_ifp != NULL); +- +- babel_ifp->channel = channel; +- return CMD_SUCCESS; +-} +- +-DEFUN (babel_set_channel_interfering, +- babel_set_channel_interfering_cmd, +- "babel channel interfering", ++ "[no] babel channel <(1-254)$ch|interfering$interfering|" ++ "noninterfering$noninterfering>", ++ NO_STR + "Babel interface commands\n" + "Channel number for diversity routing\n" +- "Mark channel as interfering\n") ++ "Number\n" ++ "Mark channel as interfering\n" ++ "Mark channel as noninterfering\n" ++ ) + { + VTY_DECLVAR_CONTEXT(interface, ifp); + babel_interface_nfo *babel_ifp; +@@ -585,24 +541,15 @@ DEFUN (babel_set_channel_interfering, + babel_ifp = babel_get_if_nfo(ifp); + assert (babel_ifp != NULL); + +- babel_ifp->channel = BABEL_IF_CHANNEL_INTERFERING; +- return CMD_SUCCESS; +-} +- +-DEFUN (babel_set_channel_noninterfering, +- babel_set_channel_noninterfering_cmd, +- "babel channel noninterfering", +- "Babel interface commands\n" +- "Channel number for diversity routing\n" +- "Mark channel as noninterfering\n") +-{ +- VTY_DECLVAR_CONTEXT(interface, ifp); +- babel_interface_nfo *babel_ifp; +- +- babel_ifp = babel_get_if_nfo(ifp); +- assert (babel_ifp != NULL); ++ if (no) ++ ch = CHECK_FLAG(babel_ifp->flags, BABEL_IF_WIRED) ? ++ BABEL_IF_CHANNEL_NONINTERFERING : BABEL_IF_CHANNEL_INTERFERING; ++ else if (interfering) ++ ch = BABEL_IF_CHANNEL_INTERFERING; ++ else if (noninterfering) ++ ch = BABEL_IF_CHANNEL_NONINTERFERING; + +- babel_ifp->channel = BABEL_IF_CHANNEL_NONINTERFERING; ++ babel_ifp->channel = ch; + return CMD_SUCCESS; + } + +@@ -1239,7 +1186,6 @@ babel_if_init(void) + install_element(BABEL_NODE, &babel_network_cmd); + install_element(BABEL_NODE, &no_babel_network_cmd); + install_element(INTERFACE_NODE, &babel_split_horizon_cmd); +- install_element(INTERFACE_NODE, &no_babel_split_horizon_cmd); + install_element(INTERFACE_NODE, &babel_set_wired_cmd); + install_element(INTERFACE_NODE, &babel_set_wireless_cmd); + install_element(INTERFACE_NODE, &babel_set_hello_interval_cmd); +@@ -1251,9 +1197,6 @@ babel_if_init(void) + install_element(INTERFACE_NODE, &babel_set_rtt_max_cmd); + install_element(INTERFACE_NODE, &babel_set_max_rtt_penalty_cmd); + install_element(INTERFACE_NODE, &babel_set_enable_timestamps_cmd); +- install_element(INTERFACE_NODE, &no_babel_set_enable_timestamps_cmd); +- install_element(INTERFACE_NODE, &babel_set_channel_interfering_cmd); +- install_element(INTERFACE_NODE, &babel_set_channel_noninterfering_cmd); + + /* "show babel ..." commands */ + install_element(VIEW_NODE, &show_babel_interface_cmd); +diff --git a/babeld/babeld.c b/babeld/babeld.c +index dfdc924cb..34e1a4318 100644 +--- a/babeld/babeld.c ++++ b/babeld/babeld.c +@@ -47,6 +47,10 @@ THE SOFTWARE. + #include "babel_zebra.h" + #include "babel_errors.h" + ++#ifndef VTYSH_EXTRACT_PL ++#include "babeld/babeld_clippy.c" ++#endif ++ + DEFINE_MGROUP(BABELD, "babeld"); + DEFINE_MTYPE_STATIC(BABELD, BABEL, "Babel Structure"); + +@@ -662,50 +666,42 @@ DEFUN (no_babel_diversity, + } + + /* [Babel Command] */ +-DEFUN (babel_diversity_factor, ++DEFPY (babel_diversity_factor, + babel_diversity_factor_cmd, +- "babel diversity-factor (1-256)", ++ "[no] babel diversity-factor (1-256)$factor", ++ NO_STR + "Babel commands\n" + "Set the diversity factor.\n" + "Factor in units of 1/256.\n") + { +- int factor; +- +- factor = strtoul(argv[2]->arg, NULL, 10); +- +- diversity_factor = factor; ++ diversity_factor = no ? BABEL_DEFAULT_DIVERSITY_FACTOR : factor; + return CMD_SUCCESS; + } + + /* [Babel Command] */ +-DEFUN (babel_set_resend_delay, ++DEFPY (babel_set_resend_delay, + babel_set_resend_delay_cmd, +- "babel resend-delay (20-655340)", ++ "[no] babel resend-delay (20-655340)$delay", ++ NO_STR + "Babel commands\n" + "Time before resending a message\n" + "Milliseconds\n") + { +- int interval; +- +- interval = strtoul(argv[2]->arg, NULL, 10); +- +- resend_delay = interval; ++ resend_delay = no ? BABEL_DEFAULT_RESEND_DELAY : delay; + return CMD_SUCCESS; + } + + /* [Babel Command] */ +-DEFUN (babel_set_smoothing_half_life, ++DEFPY (babel_set_smoothing_half_life, + babel_set_smoothing_half_life_cmd, +- "babel smoothing-half-life (0-65534)", ++ "[no] babel smoothing-half-life (0-65534)$seconds", ++ NO_STR + "Babel commands\n" + "Smoothing half-life\n" + "Seconds (0 to disable)\n") + { +- int seconds; +- +- seconds = strtoul(argv[2]->arg, NULL, 10); +- +- change_smoothing_half_life(seconds); ++ change_smoothing_half_life(no ? BABEL_DEFAULT_SMOOTHING_HALF_LIFE ++ : seconds); + return CMD_SUCCESS; + } + +diff --git a/babeld/subdir.am b/babeld/subdir.am +index 856cbd13e..6183c8c83 100644 +--- a/babeld/subdir.am ++++ b/babeld/subdir.am +@@ -48,4 +48,8 @@ noinst_HEADERS += \ + babeld/xroute.h \ + # end + ++clippy_scan += \ ++ babeld/babel_interface.c \ ++ babeld/babeld.c ++ + babeld_babeld_LDADD = lib/libfrr.la $(LIBCAP) +-- +2.37.1 (Apple Git-137.1) + diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile index 9fd8e9e3..d7dd063e 100644 --- a/packages/hostap/Jenkinsfile +++ b/packages/hostap/Jenkinsfile @@ -21,11 +21,11 @@ def pkgList = [ ['name': 'wpa', - 'scmCommit': 'debian/2%2.10-7', + 'scmCommit': 'debian/2%2.10-10', 'scmUrl': 'https://salsa.debian.org/debian/wpa', 'buildCmd': '/bin/true'], ['name': 'hostap', - 'scmCommit': 'b704dc72ef824dfdd96674b90179b274d1d38105', + 'scmCommit': '6b9c86466', 'scmUrl': 'git://w1.fi/srv/git/hostap.git', 'buildCmd': 'cd ..; ./build.sh'], ] diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh index 4e140d80..98b77d38 100755 --- a/packages/hostap/build.sh +++ b/packages/hostap/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash CWD=$(pwd) set -e @@ -27,4 +27,5 @@ 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 +DEB_CPPFLAGS_SET="-Wno-use-after-free -Wno-deprecated-declarations" \ + dpkg-buildpackage -us -uc -tc -b -Ppkg.wpa.nogui,noudeb diff --git a/packages/iproute2/.gitignore b/packages/iproute2/.gitignore deleted file mode 100644 index 02be8f3d..00000000 --- a/packages/iproute2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -iproute2/ diff --git a/packages/iproute2/Jenkinsfile b/packages/iproute2/Jenkinsfile deleted file mode 100644 index b6bf9d1c..00000000 --- a/packages/iproute2/Jenkinsfile +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2020-2021 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')_ - -// NOTE: we can build with -d as the libbpf dependency is installed manually -// and not via a DEB package -def pkgList = [ - ['name': 'iproute2', - 'scmCommit': 'debian/6.1.0-1', - 'scmUrl': 'https://salsa.debian.org/debian/iproute2', - 'buildCmd': 'cd ..; ./build.sh'], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('iproute2', pkgList, null, true, "**/packages/iproute2/*") diff --git a/packages/iproute2/build.sh b/packages/iproute2/build.sh deleted file mode 100755 index 09babb95..00000000 --- a/packages/iproute2/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -CWD=$(pwd) -set -e - -SRC=iproute2 -if [ ! -d ${SRC} ]; then - echo "Source directory does not exists, please 'git clone'" - exit 1 -fi - -cd ${SRC} -PATCH_DIR=${CWD}/patches -for patch in $(ls ${PATCH_DIR}) -do - echo "I: Apply patch: ${PATCH_DIR}/${patch}" - patch -p1 < ${PATCH_DIR}/${patch} -done - -echo "I: Build Debian Package" -dpkg-buildpackage -uc -us -tc -b -d diff --git a/packages/linux-kernel/.gitignore b/packages/linux-kernel/.gitignore index 6373bd11..b3c05f66 100644 --- a/packages/linux-kernel/.gitignore +++ b/packages/linux-kernel/.gitignore @@ -5,6 +5,7 @@ /intel-qat /linux-firmware /qat* +/QAT* *.tar.xz /*.postinst diff --git a/packages/linux-kernel/build-accel-ppp.sh b/packages/linux-kernel/build-accel-ppp.sh index 45c3494e..01fd7bd8 100755 --- a/packages/linux-kernel/build-accel-ppp.sh +++ b/packages/linux-kernel/build-accel-ppp.sh @@ -24,7 +24,7 @@ cmake -DBUILD_IPOE_DRIVER=TRUE \ -DKDIR=${KERNEL_DIR} \ -DLUA=5.3 \ -DMODULES_KDIR=${KERNEL_VERSION}${KERNEL_SUFFIX} \ - -DCPACK_TYPE=Debian11 .. + -DCPACK_TYPE=Debian12 .. make cpack -G DEB diff --git a/packages/linux-kernel/build-intel-qat.sh b/packages/linux-kernel/build-intel-qat.sh index a6627c50..e1c61c92 100755 --- a/packages/linux-kernel/build-intel-qat.sh +++ b/packages/linux-kernel/build-intel-qat.sh @@ -14,102 +14,97 @@ fi . ${KERNEL_VAR_FILE} -declare -a intel=( - "https://dev.packages.vyos.net/source-mirror/QAT1.7.L.4.20.0-00001.tar.gz" -) - -for url in "${intel[@]}" -do - cd ${CWD} - - DRIVER_FILE=$(basename ${url} | sed -e s/tar_0/tar/) - DRIVER_DIR="${DRIVER_FILE%.tar.gz}" - DRIVER_NAME="QAT" - DRIVER_VERSION=$(echo ${DRIVER_DIR} | awk -F${DRIVER_NAME} '{print $2}') - DRIVER_VERSION_EXTRA="-0" - - # Build up Debian related variables required for packaging - DEBIAN_ARCH=$(dpkg --print-architecture) - DEBIAN_DIR="${CWD}/vyos-intel-${DRIVER_NAME}_${DRIVER_VERSION}${DRIVER_VERSION_EXTRA}_${DEBIAN_ARCH}" - DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control" - DEBIAN_POSTINST="${CWD}/vyos-intel-qat.postinst" - - # Fetch Intel driver source from SourceForge - if [ -e ${DRIVER_FILE} ]; then - rm -f ${DRIVER_FILE} - fi - curl -L -o ${DRIVER_FILE} ${url} - if [ "$?" -ne "0" ]; then - exit 1 - fi - - # Unpack archive - if [ -d ${DRIVER_DIR} ]; then - rm -rf ${DRIVER_DIR} - fi - mkdir -p ${DRIVER_DIR} - tar -C ${DRIVER_DIR} -xf ${DRIVER_FILE} - - cd ${DRIVER_DIR} - if [ -z $KERNEL_DIR ]; then - echo "KERNEL_DIR not defined" - exit 1 - fi - - echo "I: Compile Kernel module for Intel ${DRIVER_NAME} driver" - mkdir -p \ - ${DEBIAN_DIR}/lib/firmware \ - ${DEBIAN_DIR}/usr/sbin \ - ${DEBIAN_DIR}/usr/lib/x86_64-linux-gnu \ - ${DEBIAN_DIR}/etc/init.d - KERNEL_SOURCE_ROOT=${KERNEL_DIR} ./configure --enable-kapi --enable-qat-lkcf - make -j $(getconf _NPROCESSORS_ONLN) all - make INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} \ - qat-driver-install adf-ctl-all - - if [ "x$?" != "x0" ]; then - exit 1 - fi - - cp quickassist/qat/fw/*.bin ${DEBIAN_DIR}/lib/firmware - cp build/*.so ${DEBIAN_DIR}/usr/lib/x86_64-linux-gnu - cp build/adf_ctl ${DEBIAN_DIR}/usr/sbin - cp quickassist/build_system/build_files/qat_service ${DEBIAN_DIR}/etc/init.d - cp build/usdm_drv.ko ${DEBIAN_DIR}/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/updates/drivers - chmod 644 ${DEBIAN_DIR}/lib/firmware/* - chmod 755 ${DEBIAN_DIR}/etc/init.d/* ${DEBIAN_DIR}/usr/local/bin/* - - if [ -f ${DEBIAN_DIR}.deb ]; then - rm ${DEBIAN_DIR}.deb - fi - - # build Debian package - echo "I: Building Debian package vyos-intel-${DRIVER_NAME}" - cd ${CWD} - - # delete non required files which are also present in the kernel package - # und thus lead to duplicated files - find ${DEBIAN_DIR} -name "modules.*" | xargs rm -f - - echo "#!/bin/sh" > ${DEBIAN_POSTINST} - echo "/sbin/depmod -a ${KERNEL_VERSION}${KERNEL_SUFFIX}" >> ${DEBIAN_POSTINST} - - fpm --input-type dir --output-type deb --name vyos-intel-${DRIVER_NAME} \ - --version ${DRIVER_VERSION}${DRIVER_VERSION_EXTRA} --deb-compression gz \ - --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \ - --description "Vendor based driver for Intel ${DRIVER_NAME}" \ - --depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \ - --license "GPL2" -C ${DEBIAN_DIR} --after-install ${DEBIAN_POSTINST} - - echo "I: Cleanup ${DRIVER_NAME} source" - cd ${CWD} - if [ -e ${DRIVER_FILE} ]; then - rm -f ${DRIVER_FILE} - fi - if [ -d ${DRIVER_DIR} ]; then - rm -rf ${DRIVER_DIR} - fi - if [ -d ${DEBIAN_DIR} ]; then - rm -rf ${DEBIAN_DIR} - fi -done +url="https://dev.packages.vyos.net/source-mirror/QAT1.7.L.4.20.0-00001.tar.gz" + +cd ${CWD} + +DRIVER_FILE=$(basename ${url} | sed -e s/tar_0/tar/) +DRIVER_DIR="${DRIVER_FILE%.tar.gz}" +DRIVER_NAME="QAT" +DRIVER_VERSION=$(echo ${DRIVER_DIR} | awk -F${DRIVER_NAME} '{print $2}') +DRIVER_VERSION_EXTRA="-0" + +# Build up Debian related variables required for packaging +DEBIAN_ARCH=$(dpkg --print-architecture) +DEBIAN_DIR="${CWD}/vyos-intel-${DRIVER_NAME}_${DRIVER_VERSION}${DRIVER_VERSION_EXTRA}_${DEBIAN_ARCH}" +DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control" +DEBIAN_POSTINST="${CWD}/vyos-intel-qat.postinst" + +# Fetch Intel driver source from SourceForge +if [ -e ${DRIVER_FILE} ]; then + rm -f ${DRIVER_FILE} +fi +curl -L -o ${DRIVER_FILE} ${url} +if [ "$?" -ne "0" ]; then + exit 1 +fi + +# Unpack archive +if [ -d ${DRIVER_DIR} ]; then + rm -rf ${DRIVER_DIR} +fi +mkdir -p ${DRIVER_DIR} +tar -C ${DRIVER_DIR} -xf ${DRIVER_FILE} + +cd ${DRIVER_DIR} +if [ -z $KERNEL_DIR ]; then + echo "KERNEL_DIR not defined" + exit 1 +fi + +echo "I: Compile Kernel module for Intel ${DRIVER_NAME} driver" +mkdir -p \ + ${DEBIAN_DIR}/lib/firmware \ + ${DEBIAN_DIR}/usr/sbin \ + ${DEBIAN_DIR}/usr/lib/x86_64-linux-gnu \ + ${DEBIAN_DIR}/etc/init.d +KERNEL_SOURCE_ROOT=${KERNEL_DIR} ./configure --enable-kapi --enable-qat-lkcf +make -j $(getconf _NPROCESSORS_ONLN) all +make INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} \ + qat-driver-install adf-ctl-all + +if [ "x$?" != "x0" ]; then + exit 1 +fi + +cp quickassist/qat/fw/*.bin ${DEBIAN_DIR}/lib/firmware +cp build/*.so ${DEBIAN_DIR}/usr/lib/x86_64-linux-gnu +cp build/adf_ctl ${DEBIAN_DIR}/usr/sbin +cp quickassist/build_system/build_files/qat_service ${DEBIAN_DIR}/etc/init.d +cp build/usdm_drv.ko ${DEBIAN_DIR}/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/updates/drivers +chmod 644 ${DEBIAN_DIR}/lib/firmware/* +chmod 755 ${DEBIAN_DIR}/etc/init.d/* ${DEBIAN_DIR}/usr/local/bin/* + +if [ -f ${DEBIAN_DIR}.deb ]; then + rm ${DEBIAN_DIR}.deb +fi + +# build Debian package +echo "I: Building Debian package vyos-intel-${DRIVER_NAME}" +cd ${CWD} + +# delete non required files which are also present in the kernel package +# und thus lead to duplicated files +find ${DEBIAN_DIR} -name "modules.*" | xargs rm -f + +echo "#!/bin/sh" > ${DEBIAN_POSTINST} +echo "/sbin/depmod -a ${KERNEL_VERSION}${KERNEL_SUFFIX}" >> ${DEBIAN_POSTINST} + +fpm --input-type dir --output-type deb --name vyos-intel-${DRIVER_NAME} \ + --version ${DRIVER_VERSION}${DRIVER_VERSION_EXTRA} --deb-compression gz \ + --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \ + --description "Vendor based driver for Intel ${DRIVER_NAME}" \ + --depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \ + --license "GPL2" -C ${DEBIAN_DIR} --after-install ${DEBIAN_POSTINST} + +echo "I: Cleanup ${DRIVER_NAME} source" +cd ${CWD} +if [ -e ${DRIVER_FILE} ]; then + rm -f ${DRIVER_FILE} +fi +if [ -d ${DRIVER_DIR} ]; then + rm -rf ${DRIVER_DIR} +fi +if [ -d ${DEBIAN_DIR} ]; then + rm -rf ${DEBIAN_DIR} +fi
\ No newline at end of file diff --git a/packages/netfilter/.gitignore b/packages/netfilter/.gitignore deleted file mode 100644 index 5f482452..00000000 --- a/packages/netfilter/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -pkg-conntrack-tools/ -pkg-libnetfilter-conntrack/ -pkg-libnftnl/ -pkg-nftables/ diff --git a/packages/netfilter/Jenkinsfile b/packages/netfilter/Jenkinsfile deleted file mode 100644 index d79076f0..00000000 --- a/packages/netfilter/Jenkinsfile +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (C) 2020-2021 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 = [ - // libnftnl - ['name': 'pkg-libnftnl', - 'scmCommit': 'debian/1.2.3-1', - 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-libnftnl.git', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], - - // nftables - ['name': 'pkg-nftables', - 'scmCommit': 'debian/1.0.5-1', - 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-nftables.git', - 'buildCmd': '''sudo dpkg -i ../libnftnl*.deb; - sed -i "s/debhelper-compat.*/debhelper-compat (= 12),/" debian/control; - sudo apt-get update; sudo apt-get install -y libeditreadline-dev; - dpkg-buildpackage -uc -us -tc -b'''], - - // libnetfilter-conntrack - ['name': 'pkg-libnetfilter-conntrack', - 'scmCommit': 'debian/1.0.9-1', - 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-libnetfilter-conntrack.git', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], - - // conntrack-tools - ['name': 'pkg-conntrack-tools', - 'scmCommit': 'debian/1%1.4.6-2', - 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-conntrack-tools.git', - 'buildCmd': '''sudo dpkg -i ../libnetfilter*.deb && dpkg-buildpackage -uc -us -tc -b'''], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('Netfilter', pkgList, null, true) diff --git a/packages/ocserv/.gitignore b/packages/ocserv/.gitignore deleted file mode 100644 index 88e6b112..00000000 --- a/packages/ocserv/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ocserv/ diff --git a/packages/ocserv/Jenkinsfile b/packages/ocserv/Jenkinsfile deleted file mode 100644 index f0b3e9cf..00000000 --- a/packages/ocserv/Jenkinsfile +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2020 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 'equuleus' 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': 'ocserv', - 'scmCommit': 'debian/1.1.6-2', - 'scmUrl': 'https://salsa.debian.org/debian/ocserv.git', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('ocserv', pkgList, null, true, "**/packages/ocserv/*") diff --git a/packages/podman/.gitignore b/packages/podman/.gitignore deleted file mode 100644 index 1055abad..00000000 --- a/packages/podman/.gitignore +++ /dev/null @@ -1 +0,0 @@ -podman/ diff --git a/packages/podman/Jenkinsfile b/packages/podman/Jenkinsfile deleted file mode 100644 index 6c4dd59d..00000000 --- a/packages/podman/Jenkinsfile +++ /dev/null @@ -1,30 +0,0 @@ -// 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': 'podman', - 'scmCommit': 'v4.3.1', - 'scmUrl': 'https://github.com/containers/podman', - 'buildCmd': 'cd ..; ./build.sh'], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('podman', pkgList, null, true, "**/packages/podman/*") diff --git a/packages/podman/build.sh b/packages/podman/build.sh deleted file mode 100755 index 08aa319a..00000000 --- a/packages/podman/build.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -CWD=$(pwd) -set -e - -SRC=podman - -if [ ! -d ${SRC} ]; then - echo "${SRC} directory does not exists, please 'git clone'" - exit 1 -fi - -# Setup Go -export PATH=/opt/go/bin:$PATH - -# Build Debian package -cd ${SRC} -version="$(git describe --tags | tr _ .)" -echo "I: Build Debian $SRC Package" - -PREFIX=/usr DESTDIR=tmp make all install.systemd install - -rm -f *.deb -fpm --input-type dir --output-type deb --name podman \ - --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \ - --description "engine to run OCI-based containers in Pods" \ - --depends "libgpgme11,conmon (>= 2.0.18~), containernetworking-plugins (>= 0.8.7), golang-github-containers-common, crun, iptables" \ - --architecture $(dpkg-architecture -qDEB_HOST_ARCH) \ - --version $(git describe --tags | cut -c 2-) \ - --url "https://github.com/containers/podman" \ - --deb-compression gz -C tmp - -mv *.deb .. diff --git a/packages/sstp-client/.gitignore b/packages/sstp-client/.gitignore deleted file mode 100644 index 5a3cee2b..00000000 --- a/packages/sstp-client/.gitignore +++ /dev/null @@ -1 +0,0 @@ -sstp-client/ diff --git a/packages/sstp-client/Jenkinsfile b/packages/sstp-client/Jenkinsfile deleted file mode 100644 index 9ee4f2c7..00000000 --- a/packages/sstp-client/Jenkinsfile +++ /dev/null @@ -1,30 +0,0 @@ -// 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': 'sstp-client', - 'scmCommit': 'debian/1.0.18-1', - 'scmUrl': 'https://salsa.debian.org/debian/sstp-client', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('sstp-client', pkgList, null, true, "**/packages/sstp-client/*") diff --git a/packages/strongswan/Jenkinsfile b/packages/strongswan/Jenkinsfile index 6f8862d5..019761dd 100644 --- a/packages/strongswan/Jenkinsfile +++ b/packages/strongswan/Jenkinsfile @@ -21,7 +21,7 @@ def pkgList = [ ['name': 'strongswan', - 'scmCommit': 'debian/5.9.8-3', + 'scmCommit': 'debian/5.9.8-5', 'scmUrl': 'https://salsa.debian.org/debian/strongswan.git', 'buildCmd': 'sudo apt-get install -y libcurl4-openssl-dev; cd ..; ./build.sh'], ] |