diff options
author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2023-02-12 20:46:12 +0100 |
---|---|---|
committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2023-02-13 11:20:49 +0100 |
commit | 1e116e025439432cd42c3894dcaaafeb06bf8653 (patch) | |
tree | e7999e789a9a8af3dfdf6ee2733d69772b5e75bc /packages | |
parent | b00c41e6a547a3cd1f8dd74d70433e306265cb26 (diff) | |
download | vyos-build-1e116e025439432cd42c3894dcaaafeb06bf8653.tar.gz vyos-build-1e116e025439432cd42c3894dcaaafeb06bf8653.zip |
debian: T5003: Update to to Debian 12 "Bookworm"
* Remove obsolete packages and dependencies
Diffstat (limited to 'packages')
-rw-r--r-- | packages/ethtool/.gitignore | 1 | ||||
-rw-r--r-- | packages/ethtool/Jenkinsfile | 30 | ||||
-rw-r--r-- | packages/fastnetmon/.gitignore | 2 | ||||
-rw-r--r-- | packages/fastnetmon/Jenkinsfile | 34 | ||||
-rwxr-xr-x | packages/fastnetmon/build.sh | 16 | ||||
-rw-r--r-- | packages/hostap/.gitignore | 2 | ||||
-rw-r--r-- | packages/hostap/Jenkinsfile | 34 | ||||
-rwxr-xr-x | packages/hostap/build.sh | 30 | ||||
-rw-r--r-- | packages/iproute2/.gitignore | 1 | ||||
-rw-r--r-- | packages/iproute2/Jenkinsfile | 32 | ||||
-rwxr-xr-x | packages/iproute2/build.sh | 20 | ||||
-rw-r--r-- | packages/netfilter/.gitignore | 4 | ||||
-rw-r--r-- | packages/netfilter/Jenkinsfile | 52 | ||||
-rw-r--r-- | packages/ocserv/.gitignore | 1 | ||||
-rw-r--r-- | packages/ocserv/Jenkinsfile | 31 | ||||
-rw-r--r-- | packages/podman/.gitignore | 1 | ||||
-rw-r--r-- | packages/podman/Jenkinsfile | 30 | ||||
-rwxr-xr-x | packages/podman/build.sh | 32 | ||||
-rw-r--r-- | packages/sstp-client/.gitignore | 1 | ||||
-rw-r--r-- | packages/sstp-client/Jenkinsfile | 30 |
20 files changed, 0 insertions, 384 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/hostap/.gitignore b/packages/hostap/.gitignore deleted file mode 100644 index d0133c0d..00000000 --- a/packages/hostap/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -hostap/ -wpa/ diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile deleted file mode 100644 index 9fd8e9e3..00000000 --- a/packages/hostap/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': '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/*") diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh deleted file mode 100755 index 4e140d80..00000000 --- a/packages/hostap/build.sh +++ /dev/null @@ -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 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/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/*") |