diff options
| -rw-r--r-- | .github/workflows/trigger_rebuild_packages.yml | 6 | ||||
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | scripts/package-build/opennhrp/.gitignore | 1 | ||||
| l--------- | scripts/package-build/opennhrp/build.py | 1 | ||||
| -rw-r--r-- | scripts/package-build/opennhrp/package.toml | 21 |
5 files changed, 0 insertions, 34 deletions
diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml index 1391ad8f..7cfee337 100644 --- a/.github/workflows/trigger_rebuild_packages.yml +++ b/.github/workflows/trigger_rebuild_packages.yml @@ -64,8 +64,6 @@ jobs: - 'scripts/package-build/netfilter/**' node_exporter: - 'scripts/package-build/node_exporter/**' - opennhrp: - - 'scripts/package-build/opennhrp/**' openvpn-otp: - 'scripts/package-build/openvpn-otp/**' owamp: @@ -187,10 +185,6 @@ jobs: trigger_build "node_exporter" fi - if [ "${{ steps.changes.outputs.opennhrp }}" == "true" ]; then - trigger_build "opennhrp" - fi - if [ "${{ steps.changes.outputs.openvpn-otp }}" == "true" ]; then trigger_build "openvpn-otp" fi diff --git a/docker/Dockerfile b/docker/Dockerfile index a2e0a74d..49f2f0a4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -273,11 +273,6 @@ RUN GO_VERSION_INSTALL="1.23.2" ; \ rm /tmp/go*.tar.gz RUN echo "export PATH=/opt/go/bin:$PATH" >> /etc/bash.bashrc -# Packages needed for opennhrp -RUN apt-get update && apt-get install -y \ - libc-ares-dev \ - libev-dev - # Packages needed for Qemu test-suite # This is for now only supported on i386 and amd64 platforms RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ diff --git a/scripts/package-build/opennhrp/.gitignore b/scripts/package-build/opennhrp/.gitignore deleted file mode 100644 index a06f6fde..00000000 --- a/scripts/package-build/opennhrp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/opennhrp/ diff --git a/scripts/package-build/opennhrp/build.py b/scripts/package-build/opennhrp/build.py deleted file mode 120000 index 3c76af73..00000000 --- a/scripts/package-build/opennhrp/build.py +++ /dev/null @@ -1 +0,0 @@ -../build.py
\ No newline at end of file diff --git a/scripts/package-build/opennhrp/package.toml b/scripts/package-build/opennhrp/package.toml deleted file mode 100644 index d647c072..00000000 --- a/scripts/package-build/opennhrp/package.toml +++ /dev/null @@ -1,21 +0,0 @@ -[[packages]] -name = "opennhrp" -commit_id = "613277f" -scm_url = "https://git.code.sf.net/p/opennhrp/code" - -build_cmd = """ -make clean -make - -install --directory debian/etc debian/usr/sbin -install --mode 0644 etc/racoon-ph1dead.sh debian/etc -install --mode 0644 etc/racoon-ph1down.sh debian/etc -install --strip --mode 0755 nhrp/opennhrp debian/usr/sbin -install --strip --mode 0755 nhrp/opennhrpctl debian/usr/sbin - -fpm --input-type dir --output-type deb --name opennhrp \ - --version $(git describe --always | cut -c2-) --deb-compression gz \ - --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \ - --description "NBMA Next Hop Resolution Protocol daemon" \ - --license "MIT" -C debian --package .. -""" |