diff --git a/.forgejo/workflows/package.yml b/.forgejo/workflows/package.yml index 8e34285..fd5e170 100644 --- a/.forgejo/workflows/package.yml +++ b/.forgejo/workflows/package.yml @@ -34,7 +34,6 @@ jobs: --upload-file "${file}" \ "${API_REPOSITORY_DEB}" done - atlasswprobe: *job daliserver: *job forgejo: *job forgejo-runner: *job @@ -64,5 +63,6 @@ jobs: python3-telethon: *job repo.s3lph.me-apt-source: *job republik-feeder: *job + ripe-atlas: *job woodpecker-agent: *job woodpecker-cli: *job diff --git a/README.md b/README.md index 18a174f..a7c0b4e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ information, please see [https://repo.s3lph.me/](https://repo.s3lph.me/). ## Packages - [ansible-semaphore](https://github.com/ansible-semaphore/semaphore) -- [atlasswprobe](https://github.com/RIPE-NCC/ripe-atlas-software-probe) - [daliserver](https://github.com/onitake/daliserver) - [forgejo](https://codeberg.org/forgejo/forgejo) - [forgejo-runner](https://code.forgejo.org/forgejo/runner) @@ -40,6 +39,9 @@ information, please see [https://repo.s3lph.me/](https://repo.s3lph.me/). - [python3-telethon](https://github.com/tulir/Telethon) - [repo.s3lph.me-apt-source](https://repo.s3lph.me) - [republik-feeder](https://github.com/maetthu/republik-feeder) +- [ripe-atlas-anchor](https://github.com/RIPE-NCC/ripe-atlas-software-probe) +- [ripe-atlas-common](https://github.com/RIPE-NCC/ripe-atlas-software-probe) +- [ripe-atlas-probe](https://github.com/RIPE-NCC/ripe-atlas-software-probe) - [woodpecker-agent](https://github.com/woodpecker-ci/woodpecker) - [woodpecker-cli](https://github.com/woodpecker-ci/woodpecker) - [woodpecker-server](https://github.com/woodpecker-ci/woodpecker) diff --git a/atlasswprobe/build.sh b/atlasswprobe/build.sh deleted file mode 100755 index 6c96d0e..0000000 --- a/atlasswprobe/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -exo pipefail - -ROOT=$(pwd) - -export BUILDDIR="${ROOT}/build" -export SRCDIR="${ROOT}/build/srcdir" -mkdir -p "${SRCDIR}" - -cd "${SRCDIR}" -apt install --yes git tar fakeroot libssl-dev libcap2-bin autoconf automake libtool build-essential -git clone --recursive https://github.com/RIPE-NCC/ripe-atlas-software-probe - -"${SRCDIR}/ripe-atlas-software-probe/build-config/debian/bin/make-deb" -mv atlasswprobe-*deb "${BUILDDIR}" diff --git a/atlasswprobe/atlasswprobe/build.sh b/ripe-atlas/build.sh similarity index 52% rename from atlasswprobe/atlasswprobe/build.sh rename to ripe-atlas/build.sh index 6c96d0e..fe0420e 100755 --- a/atlasswprobe/atlasswprobe/build.sh +++ b/ripe-atlas/build.sh @@ -9,8 +9,8 @@ export SRCDIR="${ROOT}/build/srcdir" mkdir -p "${SRCDIR}" cd "${SRCDIR}" -apt install --yes git tar fakeroot libssl-dev libcap2-bin autoconf automake libtool build-essential +apt install --yes git build-essential debhelper libssl-dev autotools-dev git clone --recursive https://github.com/RIPE-NCC/ripe-atlas-software-probe - -"${SRCDIR}/ripe-atlas-software-probe/build-config/debian/bin/make-deb" -mv atlasswprobe-*deb "${BUILDDIR}" +git submodule update +dpkg-buildpackage -b -us -uc +mv ../ripe-atlas-*.deb "${BUILDDIR}"