diff --git a/packaging/FreeBSD-repo.sh b/packaging/FreeBSD-repo.sh index c40d8b9..22f6ea0 100755 --- a/packaging/FreeBSD-repo.sh +++ b/packaging/FreeBSD-repo.sh @@ -101,7 +101,7 @@ mv "${TMP}/usr" "${PKG_ROOT}" VERSION=$(jq -r '.version' "${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}" mv "${TMPMANIFEST}" "${MANIFEST}" diff --git a/packaging/README.md b/packaging/README.md index 2c73804..17a08bd 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -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 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 -1.5.2-TIMESTAMP-SHA256. The timestamp is of the form YYYYMMDDhhmmss. The SHA256 -is the hex-encoded SHA256 checksum of the original binary package and can be -used for lookup in the database. +1.5.2-TIMESTAMP-SHA256 (on FreeBSD using '.' instead of '-'). The timestamp is +of the form YYYYMMDDhhmmss. The SHA256 is the hex-encoded SHA256 checksum of +the original binary package and can be used for lookup in the database. ## DPKG package repository @@ -27,7 +27,7 @@ $ gpg --full-generate-key $ 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 (`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 (`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 repository.