diff options
| -rw-r--r-- | data/live-build-config/archives/trixie.list.chroot | 2 | ||||
| -rw-r--r-- | data/live-build-config/archives/trixie.pref.chroot | 15 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 3 | ||||
| -rw-r--r-- | packages/frr/patches/0001-ospfd-fix-internal-ldp-sync-state-flags-when-feature.patch | 129 | ||||
| -rw-r--r-- | packages/podman/.gitignore | 1 | ||||
| -rw-r--r-- | packages/podman/Jenkinsfile | 31 | ||||
| -rwxr-xr-x | packages/podman/build.sh | 31 |
7 files changed, 63 insertions, 149 deletions
diff --git a/data/live-build-config/archives/trixie.list.chroot b/data/live-build-config/archives/trixie.list.chroot deleted file mode 100644 index 1e6803c3..00000000 --- a/data/live-build-config/archives/trixie.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb http://deb.debian.org/debian/ trixie main -deb http://deb.debian.org/debian/ trixie-updates main diff --git a/data/live-build-config/archives/trixie.pref.chroot b/data/live-build-config/archives/trixie.pref.chroot deleted file mode 100644 index d1016081..00000000 --- a/data/live-build-config/archives/trixie.pref.chroot +++ /dev/null @@ -1,15 +0,0 @@ -Package: podman -Pin: version 4.9.4* -Pin-Priority: 900 - -Package: netavark -Pin: release n=trixie -Pin-Priority: 900 - -Package: libgpgme11t64 -Pin: release n=trixie -Pin-Priority: 900 - -Package: * -Pin: release n=trixie -Pin-Priority: -10 diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 0732e597..26c7f094 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -62,9 +62,6 @@ systemctl disable dnsdist.service systemctl disable haproxy.service systemctl disable owamp-server.service systemctl disable twamp-server.service -systemctl disable podman-auto-update.service -systemctl disable podman-auto-update.timer -systemctl disable podman-restart.service systemctl disable vyos-wan-load-balance.service systemctl disable nvmf-autoconnect.service systemctl disable dpkg-db-backup.timer diff --git a/packages/frr/patches/0001-ospfd-fix-internal-ldp-sync-state-flags-when-feature.patch b/packages/frr/patches/0001-ospfd-fix-internal-ldp-sync-state-flags-when-feature.patch deleted file mode 100644 index 5d05cdcd..00000000 --- a/packages/frr/patches/0001-ospfd-fix-internal-ldp-sync-state-flags-when-feature.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 5a70378a47f541b0354fbb96770dd0a65ec552b8 Mon Sep 17 00:00:00 2001 -From: Christian Breunig <christian@breunig.cc> -Date: Sat, 13 Jul 2024 08:43:36 +0200 -Subject: [PATCH] ospfd: fix internal ldp-sync state flags when feature is - disabled - -When enabling "mpls ldp-sync" under "router ospf" ospfd configures -SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG) so internally knowing -that the ldp-sync feature is enabled. However the flag is not cleared when -turning of the feature using "nompls ldp-sync"! - -https://github.com/FRRouting/frr/issues/16375 - -Signed-off-by: Christian Breunig <christian@breunig.cc> ---- - ospfd/ospf_ldp_sync.c | 2 +- - tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref | 4 ++-- - .../r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref | 4 ++-- - .../r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref | 4 ++-- - tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref | 4 ++-- - .../r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref | 4 ++-- - .../r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref | 4 ++-- - 7 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c -index d1ef85c9a..496ae5b4b 100644 ---- a/ospfd/ospf_ldp_sync.c -+++ b/ospfd/ospf_ldp_sync.c -@@ -901,7 +901,7 @@ DEFPY (no_mpls_ldp_sync, - * stop holddown timer if running - * restore ospf cost - */ -- SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG); -+ UNSET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG); - ldp_sync_info->enabled = LDP_IGP_SYNC_DEFAULT; - ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; - EVENT_OFF(ldp_sync_info->t_holddown); -diff --git a/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref -index 6c27a1042..846be5b84 100644 ---- a/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref -+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref -@@ -5,8 +5,8 @@ - "ldpIgpSyncState":"Sync achieved" - }, - "r2-eth2":{ -- "ldpIgpSyncEnabled":false, -+ "ldpIgpSyncEnabled":true, - "holdDownTimeInSec":50, -- "ldpIgpSyncState":"Sync not required" -+ "ldpIgpSyncState":"Sync achieved" - } - } -diff --git a/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref -index 889f69ed7..ad3b8b5ca 100644 ---- a/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref -+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref -@@ -5,8 +5,8 @@ - "ldpIgpSyncState":"Holding down until Sync" - }, - "r2-eth2":{ -- "ldpIgpSyncEnabled":false, -+ "ldpIgpSyncEnabled":true, - "holdDownTimeInSec":50, -- "ldpIgpSyncState":"Sync not required" -+ "ldpIgpSyncState":"Sync achieved" - } - } -diff --git a/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref -index d9036e124..d5e4b88d0 100644 ---- a/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref -+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref -@@ -1,7 +1,7 @@ - { - "r2-eth2":{ -- "ldpIgpSyncEnabled":false, -+ "ldpIgpSyncEnabled":true, - "holdDownTimeInSec":50, -- "ldpIgpSyncState":"Sync not required" -+ "ldpIgpSyncState":"Sync achieved" - } - } -diff --git a/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref -index b417ab040..5b9542d5a 100644 ---- a/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref -+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref -@@ -1,8 +1,8 @@ - { - "r3-eth1":{ -- "ldpIgpSyncEnabled":false, -+ "ldpIgpSyncEnabled":true, - "holdDownTimeInSec":50, -- "ldpIgpSyncState":"Sync not required" -+ "ldpIgpSyncState":"Sync achieved" - }, - "r3-eth2":{ - "ldpIgpSyncEnabled":true, -diff --git a/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref -index b417ab040..5b9542d5a 100644 ---- a/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref -+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref -@@ -1,8 +1,8 @@ - { - "r3-eth1":{ -- "ldpIgpSyncEnabled":false, -+ "ldpIgpSyncEnabled":true, - "holdDownTimeInSec":50, -- "ldpIgpSyncState":"Sync not required" -+ "ldpIgpSyncState":"Sync achieved" - }, - "r3-eth2":{ - "ldpIgpSyncEnabled":true, -diff --git a/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref -index b417ab040..5b9542d5a 100644 ---- a/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref -+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref -@@ -1,8 +1,8 @@ - { - "r3-eth1":{ -- "ldpIgpSyncEnabled":false, -+ "ldpIgpSyncEnabled":true, - "holdDownTimeInSec":50, -- "ldpIgpSyncState":"Sync not required" -+ "ldpIgpSyncState":"Sync achieved" - }, - "r3-eth2":{ - "ldpIgpSyncEnabled":true, --- -2.39.2 - diff --git a/packages/podman/.gitignore b/packages/podman/.gitignore new file mode 100644 index 00000000..1055abad --- /dev/null +++ b/packages/podman/.gitignore @@ -0,0 +1 @@ +podman/ diff --git a/packages/podman/Jenkinsfile b/packages/podman/Jenkinsfile new file mode 100644 index 00000000..cc787565 --- /dev/null +++ b/packages/podman/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': 'podman', + 'scmCommit': 'v4.9.5', + '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 new file mode 100755 index 00000000..194a139a --- /dev/null +++ b/packages/podman/build.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -x + +SRC=podman +if [ ! -d $SRC ]; then + echo "source directory $SRC does not exist!" + exit 1 +fi + +sudo apt-get install -y libseccomp-dev libgpgme-dev + +cd $SRC + +echo "I: installing dependencies" +make install.tools +echo "I: building podman" +make podman-release + +tar xf podman-release-$(dpkg --print-architecture).tar.gz +# retrieve version number from podman archive folder: podman-v4.9.5/ +# remove leading podman string +VERSION=$(ls -d podman-v* | cut -c9-) + +fpm --input-type dir --output-type deb --name podman \ + --version $VERSION --deb-compression gz \ + --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \ + --description "Engine to run OCI-based containers in Pods" \ + --depends conmon --depends crun --depends netavark \ + --license "Apache License 2.0" -C podman-v$VERSION --package .. + |