diff options
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/waagent/Jenkinsfile | 32 | ||||
| -rwxr-xr-x | packages/waagent/build.py | 50 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 2 |
4 files changed, 84 insertions, 2 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 67154cdc..2671edb1 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.6.32" +kernel_version = "6.6.33" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/packages/waagent/Jenkinsfile b/packages/waagent/Jenkinsfile new file mode 100644 index 00000000..79415d71 --- /dev/null +++ b/packages/waagent/Jenkinsfile @@ -0,0 +1,32 @@ +// 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 package_name = 'waagent' +def pkgList = [ + ['name': "${package_name}", + 'scmCommit': 'debian/2.9.1.1-2', + 'scmUrl': 'https://salsa.debian.org/cloud-team/waagent.git', + 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; sudo apt-get install --yes --no-install-recommends dpkg-source-gitarchive; ../build.py'], +] + +// Start package build using library function from https://github.com/vyos/vyos-build +buildPackage("${package_name}", pkgList, null, false, "**/packages/waagent/**") diff --git a/packages/waagent/build.py b/packages/waagent/build.py new file mode 100755 index 00000000..04f4791b --- /dev/null +++ b/packages/waagent/build.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 + +from pathlib import Path +from shutil import copy as copy_file +from subprocess import run + + +# copy patches +def apply_deb_patches() -> None: + """Apply patches to sources directory + """ + patches_dir = Path('../patches') + current_dir: str = Path.cwd().as_posix() + if patches_dir.exists(): + patches_list = list(patches_dir.iterdir()) + patches_list.sort() + Path(f'{current_dir}/debian/patches').mkdir(parents=True, exist_ok=True) + series_file = Path(f'{current_dir}/debian/patches/series') + series_data = '' + for patch_file in patches_list: + print(f'Applying patch: {patch_file.name}') + copy_file(patch_file, f'{current_dir}/debian/patches/') + if series_file.exists(): + series_data: str = series_file.read_text() + series_data = f'{series_data}\n{patch_file.name}' + series_file.write_text(series_data) + + +def build_package() -> bool: + """Build a package + + Returns: + bool: build status + """ + build_cmd: list[str] = ['dpkg-buildpackage', '-uc', '-us', '-tc', '-b'] + build_status: int = run(build_cmd).returncode + + if build_status: + return False + return True + + +# build a package +if __name__ == '__main__': + apply_deb_patches() + + if not build_package(): + exit(1) + + exit() diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index b8f3806b..ea3aef63 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -150,7 +150,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, raid=None, iso_img=Non -smp {cpucount},sockets=1,cores={cpucount},threads=1 \ -cpu host \ {uefi} \ - -m 3G \ + -m 4G \ -vga none \ -nographic \ -machine accel=kvm \ |