hacking on rpm building

This commit is contained in:
TC 2023-07-02 20:19:47 -05:00
parent 304221f084
commit 13fefe1dc9
2 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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