diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-10-29 18:00:12 +0100 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-10-29 18:00:12 +0100 |
| commit | a2527669ca3e1ccda41a00ae39b8cc569a452274 (patch) | |
| tree | 49b4f99047293aeaa13fd6cbcc5f94fc7eac75d7 /scripts | |
| parent | 409958db9784c20a31418f8151eb8980953155fe (diff) | |
| parent | 3a53e7b44215ed3a3108a009e4901ddc66a4f120 (diff) | |
| download | vyos-build-a2527669ca3e1ccda41a00ae39b8cc569a452274.tar.gz vyos-build-a2527669ca3e1ccda41a00ae39b8cc569a452274.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/package-build/netfilter/.gitignore | 2 | ||||
| -rwxr-xr-x | scripts/package-build/netfilter/build.py | 6 | ||||
| -rw-r--r-- | scripts/package-build/openvpn-otp/.gitignore | 1 | ||||
| -rw-r--r-- | scripts/package-build/openvpn-otp/package.toml | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/scripts/package-build/netfilter/.gitignore b/scripts/package-build/netfilter/.gitignore index 9bf39f82..c6444404 100644 --- a/scripts/package-build/netfilter/.gitignore +++ b/scripts/package-build/netfilter/.gitignore @@ -5,4 +5,4 @@ *.changes *.deb *.dsc - +*.tar.gz diff --git a/scripts/package-build/netfilter/build.py b/scripts/package-build/netfilter/build.py index 9737b7d3..d15b5770 100755 --- a/scripts/package-build/netfilter/build.py +++ b/scripts/package-build/netfilter/build.py @@ -112,6 +112,12 @@ def build_package(package: dict, dependencies: list, patch_dir: Path) -> None: # Apply patches if any apply_patches(repo_dir, patch_dir, repo_name) + # Sanitize the commit ID and build a tarball for the package + commit_id_sanitized = package['commit_id'].replace('/', '_') + tarball_name = f"{repo_name}_{commit_id_sanitized}.tar.gz" + run(['tar', '-czf', tarball_name, '-C', str(repo_dir.parent), repo_name], check=True) + print(f"I: Tarball created: {tarball_name}") + # Prepare the package if required if package.get('prepare_package', False): prepare_package(repo_dir, package.get('install_data', '')) diff --git a/scripts/package-build/openvpn-otp/.gitignore b/scripts/package-build/openvpn-otp/.gitignore index 7f89da2b..60dd3cad 100644 --- a/scripts/package-build/openvpn-otp/.gitignore +++ b/scripts/package-build/openvpn-otp/.gitignore @@ -4,3 +4,4 @@ openvpn-otp/ *.changes *.deb *.dsc +*.tar.gz diff --git a/scripts/package-build/openvpn-otp/package.toml b/scripts/package-build/openvpn-otp/package.toml index 72209ad1..bdbc6d9d 100644 --- a/scripts/package-build/openvpn-otp/package.toml +++ b/scripts/package-build/openvpn-otp/package.toml @@ -1,6 +1,6 @@ [[packages]] name = "openvpn-otp" -commit_id = "master" +commit_id = "9781ff1" scm_url = "https://github.com/evgeny-gridasov/openvpn-otp" # build_cmd = "cd ..; ./build-openvpn-otp.sh" |