From aa40b27d9eea7bf9e5c7d1c173c352cf0bc00e6e Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 25 Nov 2024 14:37:10 +0000 Subject: T6912: Fix build package script dependencies Install dependencies declared in the package.toml file does not work due to the wrong logic. Set global dependencies instaed of dependencies per package. --- scripts/package-build/build.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/package-build/build.py b/scripts/package-build/build.py index 0648b564..e6ba8a8f 100755 --- a/scripts/package-build/build.py +++ b/scripts/package-build/build.py @@ -75,12 +75,11 @@ def prepare_package(repo_dir: Path, install_data: str) -> None: raise -def build_package(package: list, dependencies: list, patch_dir: Path) -> None: +def build_package(package: list, patch_dir: Path) -> None: """Build a package from the repository Args: package (list): List of Packages from toml - dependencies (list): List of additional dependencies patch_dir (Path): Directory containing patches """ repo_name = package['name'] @@ -94,9 +93,6 @@ def build_package(package: list, dependencies: list, patch_dir: Path) -> None: # Check out the specific commit run(['git', 'checkout', package['commit_id']], cwd=repo_dir, check=True) - # Ensure dependencies - ensure_dependencies(dependencies) - # Apply patches if any if (repo_dir / 'patches'): apply_patches(repo_dir, patch_dir) @@ -177,11 +173,15 @@ if __name__ == '__main__': packages = config['packages'] patch_dir = Path(args.patch_dir) - for package in packages: - dependencies = package.get('dependencies', {}).get('packages', []) + # Load global dependencies + global_dependencies = config.get('dependencies', {}).get('packages', []) + if global_dependencies: + print(global_dependencies) + ensure_dependencies(global_dependencies) + for package in packages: # Build the package - build_package(package, dependencies, patch_dir) + build_package(package, patch_dir) # Clean up build dependency packages after build cleanup_build_deps(Path(package['name'])) -- cgit v1.2.3 From 3b786bf6f560e82ba97abba35b6b1522f79115f5 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 25 Nov 2024 14:39:49 +0000 Subject: T6912: Build FRR use global dependencies --- scripts/package-build/frr/.gitignore | 1 + scripts/package-build/frr/package.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/package-build/frr/.gitignore b/scripts/package-build/frr/.gitignore index 590895c0..f22f6747 100644 --- a/scripts/package-build/frr/.gitignore +++ b/scripts/package-build/frr/.gitignore @@ -6,3 +6,4 @@ libyang/ *.changes *.deb *.dsc +*.tar.gz diff --git a/scripts/package-build/frr/package.toml b/scripts/package-build/frr/package.toml index 48d51ae6..caae3537 100644 --- a/scripts/package-build/frr/package.toml +++ b/scripts/package-build/frr/package.toml @@ -16,7 +16,7 @@ commit_id = "stable/9.1" scm_url = "https://github.com/FRRouting/frr.git" build_cmd = "sudo dpkg -i ../*.deb; sudo dpkg-buildpackage -us -uc -tc -b -Ppkg.frr.rtrlib,pkg.frr.lua" -[packages.dependencies] +[dependencies] packages = [ "chrpath", "gawk", -- cgit v1.2.3 From 3bbcbb689bf7ac08453b0deca6abeb64818e3c38 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 25 Nov 2024 14:40:14 +0000 Subject: T6912: Build TACACS use global dependencies --- scripts/package-build/tacacs/.gitignore | 1 + scripts/package-build/tacacs/package.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/package-build/tacacs/.gitignore b/scripts/package-build/tacacs/.gitignore index 7588fff4..142020c5 100644 --- a/scripts/package-build/tacacs/.gitignore +++ b/scripts/package-build/tacacs/.gitignore @@ -6,3 +6,4 @@ libtacplus-map/ *.changes *.deb *.dsc +*.tar.gz diff --git a/scripts/package-build/tacacs/package.toml b/scripts/package-build/tacacs/package.toml index ec50ca85..fde9df6e 100644 --- a/scripts/package-build/tacacs/package.toml +++ b/scripts/package-build/tacacs/package.toml @@ -16,7 +16,7 @@ commit_id = "master" scm_url = "https://github.com/vyos/libnss-tacplus.git" build_cmd = "sudo dpkg -i ../libtac*.deb ../libpam-tacplus*.deb; dpkg-buildpackage -us -uc -tc -b" -[packages.dependencies] +[dependencies] packages = [ "libpam-dev", "autoconf-archive", -- cgit v1.2.3 From 8e669e323df6329798ec3207eb386eaed4f07077 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 25 Nov 2024 14:46:06 +0000 Subject: T6912: Remove print dependencies for build packages --- scripts/package-build/build.py | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/package-build/build.py b/scripts/package-build/build.py index e6ba8a8f..7212b6cf 100755 --- a/scripts/package-build/build.py +++ b/scripts/package-build/build.py @@ -176,7 +176,6 @@ if __name__ == '__main__': # Load global dependencies global_dependencies = config.get('dependencies', {}).get('packages', []) if global_dependencies: - print(global_dependencies) ensure_dependencies(global_dependencies) for package in packages: -- cgit v1.2.3