diff options
Diffstat (limited to 'scripts')
7 files changed, 78 insertions, 11 deletions
diff --git a/scripts/package-build/blackbox_exporter/.gitignore b/scripts/package-build/blackbox_exporter/.gitignore new file mode 100644 index 00000000..435e791f --- /dev/null +++ b/scripts/package-build/blackbox_exporter/.gitignore @@ -0,0 +1 @@ +/blackbox_exporter/ diff --git a/scripts/package-build/blackbox_exporter/build.py b/scripts/package-build/blackbox_exporter/build.py new file mode 120000 index 00000000..3c76af73 --- /dev/null +++ b/scripts/package-build/blackbox_exporter/build.py @@ -0,0 +1 @@ +../build.py
\ No newline at end of file diff --git a/scripts/package-build/blackbox_exporter/build.sh b/scripts/package-build/blackbox_exporter/build.sh new file mode 100755 index 00000000..39a08230 --- /dev/null +++ b/scripts/package-build/blackbox_exporter/build.sh @@ -0,0 +1,66 @@ +#!/bin/sh +CWD=$(pwd) +set -e + +BUILD_ARCH=$(dpkg-architecture -qDEB_TARGET_ARCH) + +SRC="blackbox_exporter" +if [ ! -d ${SRC} ]; then + echo "Source directory does not exist, please 'git clone'" + exit 1 +fi + +cd $SRC + +mkdir -p debian + +echo "I: Create $SRC/debian/control" +cat <<EOF > debian/control +Source: blackbox-exporter +Section: net +Priority: optional +Maintainer: VyOS Package Maintainers <maintainers@vyos.net> +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.5.1 +Homepage: https://github.com/prometheus/blackbox_exporter + +Package: blackbox-exporter +Architecture: ${BUILD_ARCH} +Depends: \${shlibs:Depends}, \${misc:Depends} +Description: The blackbox exporter allows blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP, ICMP and gRPC. +EOF + +echo "I: Create $SRC/debian/changelog" +cat <<EOF > debian/changelog +blackbox-exporter (0.25.0) UNRELEASED; urgency=medium + + * Upstream package + + -- VyOS Maintainers <maintainers@vyos.io> Thu, 26 Sep 2024 12:35:47 +0000 +EOF + +echo "I: Create $SRC/debian/rules" +cat <<EOF > debian/rules +#!/usr/bin/make -f + +clean: + @# Do nothing + +build: + @# Do nothing + +binary: + mkdir -p debian/blackbox-exporter + mkdir -p debian/blackbox-exporter/usr/sbin + mkdir -p debian/blackbox-exporter/run/blackbox_exporter + cp blackbox_exporter debian/blackbox-exporter/usr/sbin/blackbox_exporter + dh_gencontrol + dh_builddeb +EOF +chmod +x debian/rules + +echo "I: Build blackbox_exporter" +go build + +echo "I: Build Debian Package" +dpkg-buildpackage -uc -us -tc -b -d diff --git a/scripts/package-build/blackbox_exporter/package.toml b/scripts/package-build/blackbox_exporter/package.toml new file mode 100644 index 00000000..3cdc21b8 --- /dev/null +++ b/scripts/package-build/blackbox_exporter/package.toml @@ -0,0 +1,5 @@ +[[packages]] +name = "blackbox_exporter" +commit_id = "v0.25.0" +scm_url = "https://github.com/prometheus/blackbox_exporter" +build_cmd = "cd ..; y | ./build.sh" diff --git a/scripts/package-build/linux-kernel/README.md b/scripts/package-build/linux-kernel/README.md index 56954e5a..927e880c 100644 --- a/scripts/package-build/linux-kernel/README.md +++ b/scripts/package-build/linux-kernel/README.md @@ -5,9 +5,9 @@ # About -VyOS runs on a custom Linux Kernel (which is 4.19) at the time of this writing. -This repository holds a Jenkins Pipeline which is used to build the Custom -Kernel (x86_64/amd64 at the moment) and all required out-of tree modules. +VyOS runs on a custom Linux Kernel (which is 6.6) at the time of this writing. +This repository holds build scripts that are used to build the Custom Kernel +(x86_64/amd64 at the moment) and all required out-of tree modules. VyOS does not utilize the build in Intel Kernel drivers for its NICs as those Kernels sometimes lack features e.g. configurable receive-side-scaling queues. @@ -33,9 +33,3 @@ VyOS utilizes several Out-of-Tree modules (e.g. WireGuard, Accel-PPP and Intel network interface card drivers). Module source code is retrieved from the upstream repository and - when needed - patched so it can be build using this pipeline. - -In the past VyOS maintainers had a fork of the Linux Kernel, WireGuard and -Accel-PPP. This is fine but increases maintenance effort. By utilizing vanilla -repositories upgrading to new versions is very easy - only the branch/commit/tag -used when cloning the repository via [Jenkinsfile](Jenkinsfile) needs to be -adjusted. diff --git a/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig b/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig index 7b49f05f..91f26660 100644 --- a/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig +++ b/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig @@ -6194,7 +6194,7 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_DEFAULT_UTF8=y -# CONFIG_EXFAT_FS is not set +CONFIG_EXFAT_FS=m # CONFIG_NTFS_FS is not set # CONFIG_NTFS3_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems diff --git a/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig b/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig index 4c1a4adc..0230e949 100644 --- a/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig @@ -5452,7 +5452,7 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_DEFAULT_UTF8=y -# CONFIG_EXFAT_FS is not set +CONFIG_EXFAT_FS=m # CONFIG_NTFS_FS is not set # CONFIG_NTFS3_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems |