debian: T5003: Update to to Debian 12 "Bookworm"

* Remove obsolete packages and dependencies
This commit is contained in:
sarthurdev 2023-02-12 20:46:12 +01:00
parent b00c41e6a5
commit 1e116e0254
26 changed files with 15 additions and 559 deletions

View File

@ -1,6 +1,5 @@
additional_repositories = [
"deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main",
"deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-48 main"
"deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main"
]
kernel_flavor = "amd64-vyos"

View File

@ -2,7 +2,7 @@ build_type = "development"
architecture = "amd64"
debian_distribution = "bullseye"
debian_distribution = "bookworm"
debian_mirror = "http://deb.debian.org/debian"
debian_security_mirror = "http://deb.debian.org/debian-security"
@ -17,4 +17,4 @@ bootloaders = "syslinux,grub-efi"
website_url = "https://vyos.io"
support_url = "https://support.vyos.io"
bugtracker_url = "https://phabricator.vyos.net"
bugtracker_url = "https://vyos.dev"

View File

@ -1,30 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
mQINBFV2/GwBEADD4oJuwcLkYZD6R+PM0zKdZ04owicJ9e1nTbBb8OA+92TI0cJY
8XGpjEJBRECOMJi9Gr6p3QxgZX1IQbiB/RJgRN0BYTZJ6BKobJAlSNsZBVH4wt/F
Xg8IFXi8O8XNwrhhTHVLyhZxB5WIqd8Xgdb39t7qcKLLuhdzH+hTWtGNaC3UJ1xz
3KMx79U/U71XRtvloiZF1ef0XUNvDZ/2DdTNWavdJzVeDq+whD0/ThvP0LsJzzCQ
cgfRUljfxtWHOYVqHspfFg03ofDODodzq+yT5ElIQNWL71fRQ5lX8cPAVrX6v3Rs
h2tBsWV3xjMscG36E7nKbgSXWxDInr4Xw056Mx/JO6If8vnCOYOhXcv3fdZ5Lqpr
qr6uniBTcRi1q97JI1+KDoHU6MfJ7I17wU/bTPFgy6Yck4Ropmwd5dvbwRVTdQHx
n08XYEZyNdq8zskbj8MI83jvDdvdd7b95SiBO6X3qIYKebk8rg1CfYFxBIyRd2ll
yt1K0ow4M54woB/68cMy0UB6cA8uOHscRObau3T3UB0ohsEPF7KYAqOKfKP0irV+
Ys6tR0KI/TeHqrqKhCA9PGOpOmqJaibt5GqFTc3Dp4U19njMmh4eboki8EwS6DNy
4HD76dFz2jkSQ74uB/X+nxuFEVRKS54q4aeg83NL5lnsD8TWdhTui4mURQARAQAB
tDxQb3dlckROUyBSZWxlYXNlIFNpZ25pbmcgS2V5IDxwb3dlcmRucy5zdXBwb3J0
QHBvd2VyZG5zLmNvbT6JAj4EEwECACgFAlV2/GwCGwMFCQ8JnAAGCwkIBwMCBhUI
AgkKCwQWAgMBAh4BAheAAAoJEBsMYgX9OA+75QYQAJ7a3rZiTmBJkYfDYbZGOcJj
tIgWj5ieyIHjaG1kR3setK1GbYrd7dkeHuWIT8FCO/mQwrKTlxEd+Vj5a79Bpu0D
de1MRi7jTIb/Qrge532Pnk5T7qFjJWfvTWhpSV9XDwHR216aByuHZ9gAJt92hgo5
eSXHPpwbi+qAdymndUswFBHY0kLNpIYAa2mZcSNbaI/RFNYPOM/aqDMcpQ2s1Rf1
c8iTPewf04jlNd75M59AAbnpdoFiCKbV+Q8oeUNxRGhHCQgcTaWhT5vdF2pXP1jb
rVykPxN7U5zTu03m/qbUCKg9Pqkhr79a2XNIpcGHhsp58B6dJdBPhXT/tFXnVpY0
wZHGGlBVhZzC1Qdq58ilyQ2qfIci2sjMoS62lAffemb88CyoQ2UadhNKZTn93Ogo
lmW1txqN7UU7hUBxwdztw+Pgf7V+ADwkPHnSsNLupkZ7QUOl2i1kPwgcnwHLPFoD
bYDteCtqcVVCY5v3OC95jGJ4bqwgIIeQ5kloKY2pRLeNedbCHbGc6rVjX5X0K2zt
F7/dWOklI1Ox4Y+Vv0Ln7u3BvSyl5jWXWzH2V6q3ff7NKVro3keZmgTzcBwJEv/z
p40ds9f2LTKJX4DajyAF2Z+j79obMYwKo0w+Vy36QrO8TlKk+ZU/6vcFfVdEoCtv
d5a03QgyYgMX0WW8Smam
=BY4B
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,3 +0,0 @@
Package: pdns-*
Pin: origin repo.powerdns.com
Pin-Priority: 600

View File

@ -18,7 +18,9 @@
# This Dockerfile is installable on both x86, x86-64, armhf and arm64 systems
ARG ARCH=
FROM ${ARCH}debian:bullseye
FROM ${ARCH}debian:bookworm
RUN grep "VERSION_ID" /etc/os-release || (echo 'VERSION_ID="12"' >> /etc/os-release)
# It is also possible to emulate an arm system inside docker,
# execution of this emulated system needs to be executed on an x86 or x86-64 host.
@ -45,7 +47,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN echo "dash dash/sh boolean false" | debconf-set-selections && \
dpkg-reconfigure dash
RUN echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends
RUN /bin/echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends
RUN apt-get update && apt-get install -y \
dialog \
@ -228,24 +230,6 @@ RUN apt-get update && apt-get install -y \
pkg-config \
systemd
# Packages needed for iproute2
RUN apt-get update && apt-get install -y \
bison \
debhelper \
flex \
libxtables-dev \
libatm1-dev \
libcap-dev \
libdb-dev \
libbsd-dev \
libelf-dev \
libmnl-dev \
libselinux1-dev \
linux-libc-dev \
pkg-config \
po-debconf \
zlib1g-dev
# Prerequisites for building rtrlib
# see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html
RUN apt-get update && apt-get install -y \
@ -275,7 +259,7 @@ RUN apt-get update && apt-get install -y \
RUN export LIBYANG_COMMIT="v2.0.164" && \
git clone https://github.com/CESNET/libyang.git && \
cd libyang && git checkout $LIBYANG_COMMIT && apkg build -i && \
cd pkg/pkgs/debian-11/libyang2_* && dpkg -i *.deb
cd pkg/pkgs/debian-*/libyang2_* && dpkg -i *.deb
# FRR documentation also has a dependency on an up to date spinx version
RUN pip install sphinx==4.0.2
@ -318,6 +302,7 @@ RUN pip install git+https://github.com/aristanetworks/j2lint.git@341b5d5db86
RUN apt-get update && apt-get install -y \
dh-python \
fakeroot \
iproute2 \
libzmq3-dev \
python3 \
python3-setuptools \
@ -405,7 +390,7 @@ RUN apt-get update && apt-get install -y \
po-debconf \
systemd \
tzdata \
python-setuptools \
python3-setuptools \
python3-stdeb
# Packages needed for opennhrp
@ -469,42 +454,6 @@ RUN if dpkg-architecture -iarm64; then \
grub-efi-arm; \
fi
# Packages needed for libnftnl
RUN apt-get update && apt-get install -y \
debhelper-compat \
libmnl-dev \
libtool \
pkg-config
# Packages needed for nftables
RUN apt-get update && apt-get install -y \
asciidoc-base \
automake \
bison \
debhelper-compat \
dh-python \
docbook-xsl \
flex \
libeditreadline-dev \
libgmp-dev \
libjansson-dev \
libmnl-dev \
libtool \
libxtables-dev \
python3-all \
python3-setuptools \
xsltproc
# Packages needed for libnetfilter-conntrack
RUN apt-get update && apt-get install -y \
debhelper-compat \
libmnl-dev \
libnfnetlink-dev \
libnetfilter-cthelper-dev \
libnetfilter-cttimeout-dev \
libnetfilter-queue-dev \
libtool
# Packages needed for wide-dhcpv6
RUN apt-get update && apt-get install -y \
bison \
@ -594,47 +543,13 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
pkg-config; \
fi
# Packages needed for hostapd (wpa_supplicant)
RUN apt-get update && apt-get install -y \
libdbus-1-dev \
libssl-dev \
libncurses5-dev \
libpcsclite-dev \
libnl-3-dev \
libnl-genl-3-dev \
libnl-route-3-dev \
libreadline-dev \
pkg-config \
docbook-to-man \
docbook-utils
# Packages needed for podman
RUN apt-get update && sudo apt-get install -y \
btrfs-progs \
git \
iptables \
libassuan-dev \
libbtrfs-dev \
libc6-dev \
libdevmapper-dev \
libglib2.0-dev \
libgpgme-dev \
libgpg-error-dev \
libprotobuf-dev \
libprotobuf-c-dev \
libseccomp-dev \
libselinux1-dev \
libsystemd-dev \
pkg-config \
runc \
uidmap
# Packages needed for Accel-PPP
# XXX: please note that this must be installed after nftable dependencies - otherwise
# APT will remove liblua5.3-dev which breaks the Accel-PPP build
# With bookworm, updated to libssl3 (Note: https://github.com/accel-ppp/accel-ppp/issues/68)
RUN apt-get update && apt-get install -y \
liblua5.3-dev \
libssl1.1 \
libssl3 \
libssl-dev \
libpcre3-dev
@ -651,47 +566,6 @@ RUN apt-get update && apt-get install -y \
gnulib \
libtool
# Packages required for ocserv
RUN apt-get update && apt-get install -y \
autogen \
debhelper \
freeradius \
gawk \
gnutls-bin \
gperf \
gss-ntlmssp \
haproxy \
iproute2 \
iputils-ping \
libcjose-dev \
libcurl4-gnutls-dev \
libev-dev \
libgnutls28-dev \
libhttp-parser-dev \
libjansson-dev \
libkrb5-dev \
liblz4-dev \
libmaxminddb-dev \
libnl-route-3-dev \
libnss-wrapper \
liboath-dev \
libpam-wrapper \
libpam0g-dev \
libprotobuf-c-dev \
libradcli-dev \
libreadline-dev \
libseccomp-dev \
libsocket-wrapper \
libtalloc-dev \
libuid-wrapper \
nettle-dev \
nuttcp \
pkg-config \
protobuf-c-compiler \
ronn \
tcpdump \
yajl-tools
#
# fpm: a command-line program designed to help you build packages (e.g. deb)
#
@ -704,7 +578,7 @@ RUN gem install --no-document fpm
# Allow password-less 'sudo' for all users in group 'sudo'
RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \
chmod a+s /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/gosu /usr/sbin/usermod
chmod a+s /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/usermod
# Ensure sure all users have access to our OCAM and Go installation
RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \

View File

@ -1 +0,0 @@
ethtool/

View File

@ -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/*")

View File

@ -1,2 +0,0 @@
fastnetmon/
fastnetmon-debian-salsa/

View File

@ -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/*")

View File

@ -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

View File

@ -1,2 +0,0 @@
hostap/
wpa/

View File

@ -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': '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/*")

View File

@ -1,30 +0,0 @@
#!/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

View File

@ -1 +0,0 @@
iproute2/

View File

@ -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/*")

View File

@ -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

View File

@ -1,4 +0,0 @@
pkg-conntrack-tools/
pkg-libnetfilter-conntrack/
pkg-libnftnl/
pkg-nftables/

View File

@ -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)

View File

@ -1 +0,0 @@
ocserv/

View File

@ -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/*")

View File

@ -1 +0,0 @@
podman/

View File

@ -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/*")

View File

@ -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 ..

View File

@ -1 +0,0 @@
sstp-client/

View File

@ -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/*")

View File

@ -108,11 +108,11 @@ PRETTY_NAME="VyOS {version} ({build_config['release_train']})"
NAME="VyOS"
VERSION_ID="{version}"
VERSION="{version} ({build_config['release_train']})"
VERSION_CODENAME=bullseye
VERSION_CODENAME=bookworm
ID=vyos
HOME_URL="https://vyos.io"
SUPPORT_URL="https://support.vyos.io"
BUG_REPORT_URL="https://phabricator.vyos.net"
BUG_REPORT_URL="https://vyos.dev"
"""
os.makedirs(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'usr/share/vyos'), exist_ok=True)