From b84fc597e94e5938ab429141b46d8270ed6c8524 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 18:27:27 -0500 Subject: [PATCH 01/29] hacking on rpm build process --- Earthfile | 5 ++++ package/rpm/veilid-server.spec | 49 ++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 package/rpm/veilid-server.spec diff --git a/Earthfile b/Earthfile index 2c7edfc0..1a7c97d9 100644 --- a/Earthfile +++ b/Earthfile @@ -131,6 +131,11 @@ package-linux-amd64: RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu # save artifacts SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ + + ################################ + ### RPMBUILD .RPM FILES + ################################ + package-linux-arm64: FROM +build-linux-arm64 diff --git a/package/rpm/veilid-server.spec b/package/rpm/veilid-server.spec new file mode 100644 index 00000000..ffe0f384 --- /dev/null +++ b/package/rpm/veilid-server.spec @@ -0,0 +1,49 @@ +Summary: Install a server grade, headless Veilid node +Name: veilid-server +Version: $CARGO_VERSION +Release: 1 +URL: https://veilid.com +Group: System +License: MPL 2.0 +Packager: Veilid Foundation, Inc. +Requires: glibc-common >= 2.23 +BuildRoot: ~/rpm-work-dir/veilid-server +BuildArch: $ARCH + +%description +A server grade, headless Veilid node + +%install +mkdir -p %{buildroot}/usr/bin/ +cp ~/veilid-binaries/server/veilid-server %{buildroot}/usr/bin/veilid-server + +mkdir -p %{buildroot}/etc/systemd/system +cp ~/veilid-binaries/server/veilid-server.service %{buildroot}/etc/systemd/system/veilid-server.service + +mkdir -p %{buildroot}/etc/veilid-server +cp ~/veilid-binaries/server/veilid-server.conf %{buildroot}/etc/veilid-server/veilid-server.conf + +%files +/usr/bin/veilid-server +/etc/systemd/system/veilid-server.service +/etc/veilid-server/veilid-server.conf + +%post +adduser --system -u veilid &>/dev/null || true +mkdir -p /var/db/veilid-server/protected_store +mkdir -p /var/db/veilid-server/table_store +mkdir -p /var/db/veilid-server/block_store +chown -R veilid:veilid /var/db/veilid-server +chmod 0750 /var/db/veilid-server/protected_store +chmod 0750 /var/db/veilid-server/table_store +chmod 0750 /var/db/veilid-server/block_store +chmod 0750 /var/db/veilid-server +chmod 755 /usr/bin/veilid-server + +systemctl daemon-reload + +echo "Congratulations! To start your Veilid node and set it to start at boot, run the command systemctl enable --now veilid-server" + +%changelog +* Sun Jul 2 2023 TC +- experimental RPM building From 8e38a962d28713510039dc2ece93e799e9d78008 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:12:42 -0500 Subject: [PATCH 02/29] hacking on rpm building --- Earthfile | 24 +++++++++++++++---- .../earthly_make_veilid_server_rpm.sh | 10 ++++++++ .../{ => veilid-server}/veilid-server.spec | 8 +++---- 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh rename package/rpm/{ => veilid-server}/veilid-server.spec (78%) diff --git a/Earthfile b/Earthfile index 1a7c97d9..939e21a0 100644 --- a/Earthfile +++ b/Earthfile @@ -118,7 +118,7 @@ unit-tests-linux-arm64: RUN cargo test --target aarch64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core # Package -package-linux-amd64: +package-linux-amd64-deb: FROM +build-linux-amd64 ################################# ### DEBIAN DPKG .DEB FILES @@ -132,12 +132,26 @@ package-linux-amd64: # save artifacts SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ - ################################ +package-linux-amd64-rpm: + FROM --platform amd64 centos:8 + RUN yum install -y createrepo rpm-build rpm-sign wget gcc python3 yum-utils rpmdevtools + RUN rpmdev-setuptree + ################################# ### RPMBUILD .RPM FILES - ################################ + ################################# + COPY --dir package /veilid + RUN mkdir /veilid/target + COPY --dir +build-linux-amd64/target/x86_64-unknown-linux-gnu /target/x86_64-unknown-linux-gnu + RUN mkdir -p /rpm-work-dir/veilid-server + # veilid-server + RUN /veilid/package/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu + SAVE ARTIFACT --keep-ts /rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ + # veilid-cli + #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu + # save artifacts + #SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ - -package-linux-arm64: +package-linux-arm64-deb: FROM +build-linux-arm64 ################################# ### DEBIAN DPKG .DEB FILES diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh new file mode 100644 index 00000000..a496d72d --- /dev/null +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -0,0 +1,10 @@ +#!/bin/bash +ARCH=$1 +CARGO_ARCH=$2 +CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-server/Cargo.toml)" + +# veilid-server spec file +cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /rpmbuild/specs/ +/veilid/package/replace_variable.sh /veilid/package/rpm/veilid-server/veilid-server.spec CARGO_VERSION $CARGO_VERSION +/veilid/package/replace_variable.sh /veilid/package/rpm/veilid-server/veilid-server.spec ARCH $ARCH +/veilid/package/replace_variable.sh /veilid/package/rpm/veilid-server/veilid-server.spec CARGO_ARCH $CARGO_ARCH diff --git a/package/rpm/veilid-server.spec b/package/rpm/veilid-server/veilid-server.spec similarity index 78% rename from package/rpm/veilid-server.spec rename to package/rpm/veilid-server/veilid-server.spec index ffe0f384..e5ff6c9b 100644 --- a/package/rpm/veilid-server.spec +++ b/package/rpm/veilid-server/veilid-server.spec @@ -7,7 +7,7 @@ Group: System License: MPL 2.0 Packager: Veilid Foundation, Inc. Requires: glibc-common >= 2.23 -BuildRoot: ~/rpm-work-dir/veilid-server +BuildRoot: /rpm-work-dir/veilid-server BuildArch: $ARCH %description @@ -15,13 +15,13 @@ A server grade, headless Veilid node %install mkdir -p %{buildroot}/usr/bin/ -cp ~/veilid-binaries/server/veilid-server %{buildroot}/usr/bin/veilid-server +cp /veilid/target/$CARGO_ARCH/release/veilid-server %{buildroot}/usr/bin/veilid-server mkdir -p %{buildroot}/etc/systemd/system -cp ~/veilid-binaries/server/veilid-server.service %{buildroot}/etc/systemd/system/veilid-server.service +cp /veilid/package/systemd/veilid-server.service %{buildroot}/etc/systemd/system/veilid-server.service mkdir -p %{buildroot}/etc/veilid-server -cp ~/veilid-binaries/server/veilid-server.conf %{buildroot}/etc/veilid-server/veilid-server.conf +cp /veilid/package/linux/veilid-server.conf %{buildroot}/etc/veilid-server/veilid-server.conf %files /usr/bin/veilid-server From d752ef3bc968eca7d31db907fe4a3d744444dc29 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:17:19 -0500 Subject: [PATCH 03/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 939e21a0..7a2f57b1 100644 --- a/Earthfile +++ b/Earthfile @@ -141,7 +141,7 @@ package-linux-amd64-rpm: ################################# COPY --dir package /veilid RUN mkdir /veilid/target - COPY --dir +build-linux-amd64/target/x86_64-unknown-linux-gnu /target/x86_64-unknown-linux-gnu + COPY --dir +build-linux-amd64/veilid/target/x86_64-unknown-linux-gnu /target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN /veilid/package/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu From fa3461c6cf3bd288736d0143bb3c2932a5fa20be Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:22:53 -0500 Subject: [PATCH 04/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 7a2f57b1..400ae8e0 100644 --- a/Earthfile +++ b/Earthfile @@ -141,7 +141,7 @@ package-linux-amd64-rpm: ################################# COPY --dir package /veilid RUN mkdir /veilid/target - COPY --dir +build-linux-amd64/veilid/target/x86_64-unknown-linux-gnu /target/x86_64-unknown-linux-gnu + COPY --dir +build-linux-amd64/veilid/target/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN /veilid/package/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu From e192ab41e5385469c3ea08253397e0f4e2e9b3c3 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:24:14 -0500 Subject: [PATCH 05/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 400ae8e0..4de9fb1f 100644 --- a/Earthfile +++ b/Earthfile @@ -141,7 +141,7 @@ package-linux-amd64-rpm: ################################# COPY --dir package /veilid RUN mkdir /veilid/target - COPY --dir +build-linux-amd64/veilid/target/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu + COPY +build-linux-amd64/veilid/target/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN /veilid/package/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu From 79f98741c623f7d30954a0adb8428bb7823816f2 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:29:42 -0500 Subject: [PATCH 06/29] hacking on rpm building --- Earthfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Earthfile b/Earthfile index 4de9fb1f..5e01dbb9 100644 --- a/Earthfile +++ b/Earthfile @@ -87,6 +87,7 @@ clippy: build-linux-amd64: FROM +code-linux RUN cargo build --target x86_64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core + SAVE ARTIFACT ./target/x86_64-unknown-linux-gnu SAVE ARTIFACT ./target/x86_64-unknown-linux-gnu AS LOCAL ./target/artifacts/x86_64-unknown-linux-gnu build-linux-arm64: From 3819cf9352e5d8ed38308b7452b7f0fd4ae5a981 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:47:06 -0500 Subject: [PATCH 07/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 5e01dbb9..7afde192 100644 --- a/Earthfile +++ b/Earthfile @@ -87,8 +87,8 @@ clippy: build-linux-amd64: FROM +code-linux RUN cargo build --target x86_64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core - SAVE ARTIFACT ./target/x86_64-unknown-linux-gnu SAVE ARTIFACT ./target/x86_64-unknown-linux-gnu AS LOCAL ./target/artifacts/x86_64-unknown-linux-gnu + RUN false build-linux-arm64: FROM +code-linux From de405951480533232eee5381d8fdcd7e9d159a18 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:50:09 -0500 Subject: [PATCH 08/29] hacking on rpm building --- Earthfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index 7afde192..60cb2344 100644 --- a/Earthfile +++ b/Earthfile @@ -88,7 +88,6 @@ build-linux-amd64: FROM +code-linux RUN cargo build --target x86_64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core SAVE ARTIFACT ./target/x86_64-unknown-linux-gnu AS LOCAL ./target/artifacts/x86_64-unknown-linux-gnu - RUN false build-linux-arm64: FROM +code-linux @@ -142,7 +141,7 @@ package-linux-amd64-rpm: ################################# COPY --dir package /veilid RUN mkdir /veilid/target - COPY +build-linux-amd64/veilid/target/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu + COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN /veilid/package/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu From 3088e711135522a98d1dea067f7cb3114593a4f6 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 19:56:12 -0500 Subject: [PATCH 09/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 60cb2344..efaa5a01 100644 --- a/Earthfile +++ b/Earthfile @@ -133,7 +133,7 @@ package-linux-amd64-deb: SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ package-linux-amd64-rpm: - FROM --platform amd64 centos:8 + FROM --platform amd64 rockylinux:8 RUN yum install -y createrepo rpm-build rpm-sign wget gcc python3 yum-utils rpmdevtools RUN rpmdev-setuptree ################################# From 1baa8a077aed16474e714a9ab2720318587e8b53 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:01:00 -0500 Subject: [PATCH 10/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index efaa5a01..b0422952 100644 --- a/Earthfile +++ b/Earthfile @@ -144,7 +144,7 @@ package-linux-amd64-rpm: COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server - RUN /veilid/package/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu + RUN /veilid/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu SAVE ARTIFACT --keep-ts /rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ # veilid-cli #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu From 923008d0fe19b85fbd937a7c89127487982d8806 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:02:32 -0500 Subject: [PATCH 11/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index b0422952..f8246a6d 100644 --- a/Earthfile +++ b/Earthfile @@ -144,7 +144,7 @@ package-linux-amd64-rpm: COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server - RUN /veilid/rpm/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu + RUN veilid/rpm/veilid-server/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu SAVE ARTIFACT --keep-ts /rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ # veilid-cli #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu From b4329d8453d1e6a71f9d62da3218dcf602fbaf70 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:06:27 -0500 Subject: [PATCH 12/29] hacking on rpm building --- package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh old mode 100644 new mode 100755 From 4f38c0e44c677010e51dd299d50771176a9f968f Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:09:11 -0500 Subject: [PATCH 13/29] hacking on rpm building --- .../veilid-server/earthly_make_veilid_server_rpm.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh index a496d72d..6463d39e 100755 --- a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -1,10 +1,10 @@ #!/bin/bash ARCH=$1 CARGO_ARCH=$2 -CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-server/Cargo.toml)" +CARGO_VERSION="$(/veilid/cargo_version.sh /veilid/veilid-server/Cargo.toml)" # veilid-server spec file -cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /rpmbuild/specs/ -/veilid/package/replace_variable.sh /veilid/package/rpm/veilid-server/veilid-server.spec CARGO_VERSION $CARGO_VERSION -/veilid/package/replace_variable.sh /veilid/package/rpm/veilid-server/veilid-server.spec ARCH $ARCH -/veilid/package/replace_variable.sh /veilid/package/rpm/veilid-server/veilid-server.spec CARGO_ARCH $CARGO_ARCH +cp -rf /veilid/rpm/veilid-server/veilid-server.spec /rpmbuild/specs/ +/veilid/replace_variable.sh /rpmbuild/specs/veilid-server.spec CARGO_VERSION $CARGO_VERSION +/veilid/replace_variable.sh /rpmbuild/specs/veilid-server.spec ARCH $ARCH +/veilid/replace_variable.sh /rpmbuild/specs/veilid-server.spec CARGO_ARCH $CARGO_ARCH From 304221f0844e6f728556044db7f86efdd93f8c81 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:12:18 -0500 Subject: [PATCH 14/29] hacking on rpm building --- Earthfile | 2 +- .../rpm/veilid-server/earthly_make_veilid_server_rpm.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Earthfile b/Earthfile index f8246a6d..35f045d9 100644 --- a/Earthfile +++ b/Earthfile @@ -145,7 +145,7 @@ package-linux-amd64-rpm: RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN veilid/rpm/veilid-server/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu - SAVE ARTIFACT --keep-ts /rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ + SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ # veilid-cli #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu # save artifacts diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh index 6463d39e..6737c613 100755 --- a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -4,7 +4,7 @@ CARGO_ARCH=$2 CARGO_VERSION="$(/veilid/cargo_version.sh /veilid/veilid-server/Cargo.toml)" # veilid-server spec file -cp -rf /veilid/rpm/veilid-server/veilid-server.spec /rpmbuild/specs/ -/veilid/replace_variable.sh /rpmbuild/specs/veilid-server.spec CARGO_VERSION $CARGO_VERSION -/veilid/replace_variable.sh /rpmbuild/specs/veilid-server.spec ARCH $ARCH -/veilid/replace_variable.sh /rpmbuild/specs/veilid-server.spec CARGO_ARCH $CARGO_ARCH +cp -rf /veilid/rpm/veilid-server/veilid-server.spec /root/rpmbuild/specs/ +/veilid/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_VERSION $CARGO_VERSION +/veilid/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec ARCH $ARCH +/veilid/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_ARCH $CARGO_ARCH From 13fefe1dc9d8ede699eb98a265b7ab6542a34a80 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:19:47 -0500 Subject: [PATCH 15/29] hacking on rpm building --- Earthfile | 4 ++-- .../veilid-server/earthly_make_veilid_server_rpm.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Earthfile b/Earthfile index 35f045d9..0f7cd6ba 100644 --- a/Earthfile +++ b/Earthfile @@ -139,12 +139,12 @@ package-linux-amd64-rpm: ################################# ### RPMBUILD .RPM FILES ################################# - COPY --dir package /veilid RUN mkdir /veilid/target + COPY --dir package /veilid COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server - RUN veilid/rpm/veilid-server/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu + RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ # veilid-cli #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh index 6737c613..3d0ea3fb 100755 --- a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -1,10 +1,10 @@ #!/bin/bash ARCH=$1 CARGO_ARCH=$2 -CARGO_VERSION="$(/veilid/cargo_version.sh /veilid/veilid-server/Cargo.toml)" +CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-server/Cargo.toml)" # veilid-server spec file -cp -rf /veilid/rpm/veilid-server/veilid-server.spec /root/rpmbuild/specs/ -/veilid/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_VERSION $CARGO_VERSION -/veilid/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec ARCH $ARCH -/veilid/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_ARCH $CARGO_ARCH +cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/specs/ +/veilid/package/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_VERSION $CARGO_VERSION +/veilid/package/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec ARCH $ARCH +/veilid/package/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_ARCH $CARGO_ARCH From 70776963d344f116566f082d397b5d193309ae61 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:23:05 -0500 Subject: [PATCH 16/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 0f7cd6ba..6da3a65a 100644 --- a/Earthfile +++ b/Earthfile @@ -134,7 +134,7 @@ package-linux-amd64-deb: package-linux-amd64-rpm: FROM --platform amd64 rockylinux:8 - RUN yum install -y createrepo rpm-build rpm-sign wget gcc python3 yum-utils rpmdevtools + RUN yum install -y createrepo rpm-build rpm-sign yum-utils rpmdevtools RUN rpmdev-setuptree ################################# ### RPMBUILD .RPM FILES From f6833966cf442136571d32a4c135a257c0829d26 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:25:06 -0500 Subject: [PATCH 17/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 6da3a65a..131fbfef 100644 --- a/Earthfile +++ b/Earthfile @@ -139,7 +139,7 @@ package-linux-amd64-rpm: ################################# ### RPMBUILD .RPM FILES ################################# - RUN mkdir /veilid/target + RUN mkdir -p /veilid/target COPY --dir package /veilid COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server From 2a58d9c173b306d7b3ca44327c35e7e8328db10d Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:27:04 -0500 Subject: [PATCH 18/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 131fbfef..714b6246 100644 --- a/Earthfile +++ b/Earthfile @@ -140,7 +140,7 @@ package-linux-amd64-rpm: ### RPMBUILD .RPM FILES ################################# RUN mkdir -p /veilid/target - COPY --dir package /veilid + COPY COPY --dir .cargo external files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml package /veilid COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server From 1fe5ba17d6a1a7157a2ac8c160239d7d6dffb88d Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:27:45 -0500 Subject: [PATCH 19/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 714b6246..b4af2ae0 100644 --- a/Earthfile +++ b/Earthfile @@ -140,7 +140,7 @@ package-linux-amd64-rpm: ### RPMBUILD .RPM FILES ################################# RUN mkdir -p /veilid/target - COPY COPY --dir .cargo external files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml package /veilid + COPY --dir .cargo external files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml package /veilid COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server From f99bc4d73fa54183f02a342f243aa874704de380 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:30:00 -0500 Subject: [PATCH 20/29] hacking on rpm building --- .../rpm/veilid-server/earthly_make_veilid_server_rpm.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh index 3d0ea3fb..a7d1547b 100755 --- a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -4,7 +4,7 @@ CARGO_ARCH=$2 CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-server/Cargo.toml)" # veilid-server spec file -cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/specs/ -/veilid/package/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_VERSION $CARGO_VERSION -/veilid/package/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec ARCH $ARCH -/veilid/package/replace_variable.sh /root/rpmbuild/specs/veilid-server.spec CARGO_ARCH $CARGO_ARCH +cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/SPECS/ +/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec CARGO_VERSION $CARGO_VERSION +/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec ARCH $ARCH +/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec CARGO_ARCH $CARGO_ARCH From c5ec72aa147615eac1e6bcb25fd448cf9ee449ed Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:35:06 -0500 Subject: [PATCH 21/29] hacking on rpm building --- package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh index a7d1547b..48f941c3 100755 --- a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -8,3 +8,6 @@ cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/SPECS /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec CARGO_VERSION $CARGO_VERSION /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec ARCH $ARCH /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec CARGO_ARCH $CARGO_ARCH + +# build the rpm +rpmbuild --target "x86_64" -bb /root/rpmbuild/SPECS/veilid-server.spec \ No newline at end of file From e776bd8b8e21b3bb2b0ce648f8f08dd3dbdfef88 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:40:27 -0500 Subject: [PATCH 22/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index b4af2ae0..bd31fee8 100644 --- a/Earthfile +++ b/Earthfile @@ -141,7 +141,7 @@ package-linux-amd64-rpm: ################################# RUN mkdir -p /veilid/target COPY --dir .cargo external files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml package /veilid - COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/target/x86_64-unknown-linux-gnu + COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu From 4596bf35a2756e6cc33b00ad474b59238dbb0750 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:44:10 -0500 Subject: [PATCH 23/29] hacking on rpm building --- Earthfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index bd31fee8..886910c2 100644 --- a/Earthfile +++ b/Earthfile @@ -144,10 +144,10 @@ package-linux-amd64-rpm: COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server - RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh amd64 x86_64-unknown-linux-gnu + RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh x86_64 x86_64-unknown-linux-gnu SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ # veilid-cli - #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu + #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh x86_64 x86_64-unknown-linux-gnu # save artifacts #SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ From 067aa185f7a28d1e4acb507f837f4871e34c6e21 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 20:45:22 -0500 Subject: [PATCH 24/29] hacking on rpm building --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 886910c2..38ffb469 100644 --- a/Earthfile +++ b/Earthfile @@ -145,7 +145,7 @@ package-linux-amd64-rpm: RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh x86_64 x86_64-unknown-linux-gnu - SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/.rpm AS LOCAL ./target/packages/ + SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ # veilid-cli #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh x86_64 x86_64-unknown-linux-gnu # save artifacts From 899249e2a74e897e936d6c25b4fd3ea6594dc275 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 21:02:48 -0500 Subject: [PATCH 25/29] hacking on rpm building --- Earthfile | 6 ++-- .../veilid-cli/earthly_make_veilid_cli_rpm.sh | 13 ++++++++ package/rpm/veilid-cli/veilid-cli.spec | 31 +++++++++++++++++++ package/rpm/veilid-server/veilid-server.spec | 6 ++++ 4 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh create mode 100644 package/rpm/veilid-cli/veilid-cli.spec diff --git a/Earthfile b/Earthfile index 38ffb469..a4504a65 100644 --- a/Earthfile +++ b/Earthfile @@ -145,11 +145,11 @@ package-linux-amd64-rpm: RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh x86_64 x86_64-unknown-linux-gnu - SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ + #SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ # veilid-cli - #RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh x86_64 x86_64-unknown-linux-gnu + RUN veilid/package/rpm/veilid-server/earthly_make_veilid_cli_rpm.sh x86_64 x86_64-unknown-linux-gnu # save artifacts - #SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ + SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ package-linux-arm64-deb: FROM +build-linux-arm64 diff --git a/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh b/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh new file mode 100644 index 00000000..0d5aa627 --- /dev/null +++ b/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh @@ -0,0 +1,13 @@ +#!/bin/bash +ARCH=$1 +CARGO_ARCH=$2 +CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-cli/Cargo.toml)" + +# veilid-cli spec file +cp -rf /veilid/package/rpm/veilid-cli/veilid-cli.spec /root/rpmbuild/SPECS/ +/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec CARGO_VERSION $CARGO_VERSION +/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec ARCH $ARCH +/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec CARGO_ARCH $CARGO_ARCH + +# build the rpm +rpmbuild --target "x86_64" -bb /root/rpmbuild/SPECS/veilid-cli.spec \ No newline at end of file diff --git a/package/rpm/veilid-cli/veilid-cli.spec b/package/rpm/veilid-cli/veilid-cli.spec new file mode 100644 index 00000000..645daf6b --- /dev/null +++ b/package/rpm/veilid-cli/veilid-cli.spec @@ -0,0 +1,31 @@ +Summary: Veilid Server Command Line Interface +Name: veilid-cli +Version: $CARGO_VERSION +Release: 1 +URL: https://veilid.com +Group: System +License: MPL 2.0 +Packager: Veilid Foundation, Inc. +Requires: glibc-common >= 2.23 +BuildRoot: /rpm-work-dir/veilid-cli +BuildArch: $ARCH + +%description +Veilid Server Command Line Interface + +%install +mkdir -p %{buildroot}/usr/bin/ +cp /veilid/target/$CARGO_ARCH/release/veilid-cli %{buildroot}/usr/bin/veilid-cli + +%files +/usr/bin/veilid-cli + +%post +chmod 755 /usr/bin/veilid-cli + +%postun +rm /usr/bin/veilid-cli + +%changelog +* Sun Jul 2 2023 TC +- experimental RPM building diff --git a/package/rpm/veilid-server/veilid-server.spec b/package/rpm/veilid-server/veilid-server.spec index e5ff6c9b..78fea582 100644 --- a/package/rpm/veilid-server/veilid-server.spec +++ b/package/rpm/veilid-server/veilid-server.spec @@ -44,6 +44,12 @@ systemctl daemon-reload echo "Congratulations! To start your Veilid node and set it to start at boot, run the command systemctl enable --now veilid-server" +%postun +systemctl stop veilid-server.service +rm /usr/bin/veilid-server +rm /etc/systemd/system/veilid-server.service +systemctl daemon-reload + %changelog * Sun Jul 2 2023 TC - experimental RPM building From 6fbfafb8e2f4f82b5df7f20a38ae525d9ff0d37f Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 21:06:38 -0500 Subject: [PATCH 26/29] hacking on rpm building --- Earthfile | 2 +- package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh diff --git a/Earthfile b/Earthfile index a4504a65..e4fc6f64 100644 --- a/Earthfile +++ b/Earthfile @@ -147,7 +147,7 @@ package-linux-amd64-rpm: RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh x86_64 x86_64-unknown-linux-gnu #SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ # veilid-cli - RUN veilid/package/rpm/veilid-server/earthly_make_veilid_cli_rpm.sh x86_64 x86_64-unknown-linux-gnu + RUN veilid/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh x86_64 x86_64-unknown-linux-gnu # save artifacts SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ diff --git a/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh b/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh old mode 100644 new mode 100755 From 743f67070396f31030c7cbe775a36f38a0d2de19 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 21:17:02 -0500 Subject: [PATCH 27/29] hacking on rpm building --- package/rpm/veilid-server/veilid-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpm/veilid-server/veilid-server.spec b/package/rpm/veilid-server/veilid-server.spec index 78fea582..177123d4 100644 --- a/package/rpm/veilid-server/veilid-server.spec +++ b/package/rpm/veilid-server/veilid-server.spec @@ -29,7 +29,7 @@ cp /veilid/package/linux/veilid-server.conf %{buildroot}/etc/veilid-server/veili /etc/veilid-server/veilid-server.conf %post -adduser --system -u veilid &>/dev/null || true +adduser --system -U veilid &>/dev/null || true mkdir -p /var/db/veilid-server/protected_store mkdir -p /var/db/veilid-server/table_store mkdir -p /var/db/veilid-server/block_store From 7ddfc1ccdfbd11251aa98cbaff7767eeeb9bbc4c Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 21:49:52 -0500 Subject: [PATCH 28/29] hacking on rpm building --- package/rpm/veilid-server/veilid-server.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/rpm/veilid-server/veilid-server.spec b/package/rpm/veilid-server/veilid-server.spec index 177123d4..2790f042 100644 --- a/package/rpm/veilid-server/veilid-server.spec +++ b/package/rpm/veilid-server/veilid-server.spec @@ -45,9 +45,6 @@ systemctl daemon-reload echo "Congratulations! To start your Veilid node and set it to start at boot, run the command systemctl enable --now veilid-server" %postun -systemctl stop veilid-server.service -rm /usr/bin/veilid-server -rm /etc/systemd/system/veilid-server.service systemctl daemon-reload %changelog From 2e2c94aac1e81f7de6d1fc41362a66a7588134b9 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 2 Jul 2023 21:53:22 -0500 Subject: [PATCH 29/29] hacking on rpm building --- package/rpm/veilid-cli/veilid-cli.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/rpm/veilid-cli/veilid-cli.spec b/package/rpm/veilid-cli/veilid-cli.spec index 645daf6b..8553de0b 100644 --- a/package/rpm/veilid-cli/veilid-cli.spec +++ b/package/rpm/veilid-cli/veilid-cli.spec @@ -23,9 +23,6 @@ cp /veilid/target/$CARGO_ARCH/release/veilid-cli %{buildroot}/usr/bin/veilid-cli %post chmod 755 /usr/bin/veilid-cli -%postun -rm /usr/bin/veilid-cli - %changelog * Sun Jul 2 2023 TC - experimental RPM building