package repos: use '.' instead of '-' as version separator on FreeBSD

This commit is contained in:
Hannes Mehnert 2022-02-24 14:30:54 +01:00 committed by Robur
parent d6098cfa91
commit 443bcd1a19
2 changed files with 6 additions and 6 deletions

View file

@ -101,7 +101,7 @@ mv "${TMP}/usr" "${PKG_ROOT}"
VERSION=$(jq -r '.version' "${MANIFEST}") VERSION=$(jq -r '.version' "${MANIFEST}")
NAME=$(jq -r '.name' "${MANIFEST}") NAME=$(jq -r '.name' "${MANIFEST}")
FULL_VERSION="${VERSION}-${BUILD_TIME}-${SHA}" FULL_VERSION="${VERSION}.${BUILD_TIME}.${SHA}"
jq -ca ".version=\"$FULL_VERSION\"" "${MANIFEST}" > "${TMPMANIFEST}" jq -ca ".version=\"$FULL_VERSION\"" "${MANIFEST}" > "${TMPMANIFEST}"
mv "${TMPMANIFEST}" "${MANIFEST}" mv "${TMPMANIFEST}" "${MANIFEST}"

View file

@ -13,9 +13,9 @@ of output, and clients do not need to update their packages), and also due to
the nature of opam, if a dependency (opam package) is released, the output may the nature of opam, if a dependency (opam package) is released, the output may
differ (although the final package version is not increased). We solve the differ (although the final package version is not increased). We solve the
latter by adapting the version number of packages: package version 1.5.2 becomes latter by adapting the version number of packages: package version 1.5.2 becomes
1.5.2-TIMESTAMP-SHA256. The timestamp is of the form YYYYMMDDhhmmss. The SHA256 1.5.2-TIMESTAMP-SHA256 (on FreeBSD using '.' instead of '-'). The timestamp is
is the hex-encoded SHA256 checksum of the original binary package and can be of the form YYYYMMDDhhmmss. The SHA256 is the hex-encoded SHA256 checksum of
used for lookup in the database. the original binary package and can be used for lookup in the database.
## DPKG package repository ## DPKG package repository
@ -27,7 +27,7 @@ $ gpg --full-generate-key
$ gpg --export --armor > gpg.pub $ gpg --export --armor > gpg.pub
``` ```
Set REPO_KEYID in the shell script to the key identifier generated Set `REPO_KEYID` in the shell script to the key identifier generated
(`gpg --list-keys`), and make the gpg.pub available to clients (`gpg --list-keys`), and make the gpg.pub available to clients
(`cp gpg.pub ~/.aptly/public/`). (`cp gpg.pub ~/.aptly/public/`).
@ -56,7 +56,7 @@ And a directory that acts as package repository (`mkdir /usr/local/www/pkg`).
Copy the public key to the package repository Copy the public key to the package repository
(`cp repo.pub /usr/local/www/pkg`) to make it available for clients. (`cp repo.pub /usr/local/www/pkg`) to make it available for clients.
Both can be configured in the shell script itself (REPO and REPO_KEY). The Both can be configured in the shell script itself (`REPO` and `REPO_KEY`). The
public key needs to be distributed to clients - e.g. put it at the root of the public key needs to be distributed to clients - e.g. put it at the root of the
repository. repository.