From 07163889a30df7acad42b6986a3025eedd756b8f Mon Sep 17 00:00:00 2001 From: Disassembler Date: Fri, 13 Mar 2020 17:53:31 +0100 Subject: [PATCH] Name the repo key properly --- build/etc/abuild.conf | 2 +- build/install-toolchain.sh | 2 +- doc/toolchain/abuild.md | 2 +- .../etc/apk/keys/{vm.rsa.pub => repo.spotter.cz.rsa.pub} | 0 vm/etc/apk/keys/{vm.rsa.pub => repo.spotter.cz.rsa.pub} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename lxc-shared/alpine3.11/image.d/etc/apk/keys/{vm.rsa.pub => repo.spotter.cz.rsa.pub} (100%) rename vm/etc/apk/keys/{vm.rsa.pub => repo.spotter.cz.rsa.pub} (100%) diff --git a/build/etc/abuild.conf b/build/etc/abuild.conf index 66f1cd5..15c9b86 100644 --- a/build/etc/abuild.conf +++ b/build/etc/abuild.conf @@ -23,7 +23,7 @@ REPODEST=/srv/build/alpine/v3.11 # the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively. #PACKAGER="Your Name " #MAINTAINER="$PACKAGER" -PACKAGER_PRIVKEY="/root/repokey.rsa" +PACKAGER_PRIVKEY="/root/repo.spotter.cz.rsa" # what to clean up after a successful build CLEANUP="srcdir bldroot pkgdir deps" diff --git a/build/install-toolchain.sh b/build/install-toolchain.sh index cc73d71..38f2edc 100755 --- a/build/install-toolchain.sh +++ b/build/install-toolchain.sh @@ -30,7 +30,7 @@ service nginx reload sed -i 's/repo\.spotter\.cz/repo.build.vm/' /etc/spoc/spoc.conf # Supply abuild key -# echo '/root/repokey.rsa' | abuild-keygen +# echo '/root/repo.spotter.cz.rsa' | abuild-keygen # Supply SPOC key # openssl ecparam -genkey -name secp384r1 -out /etc/spoc/publish.key diff --git a/doc/toolchain/abuild.md b/doc/toolchain/abuild.md index e74b7a4..11db971 100644 --- a/doc/toolchain/abuild.md +++ b/doc/toolchain/abuild.md @@ -13,7 +13,7 @@ The usage of Abuild, APK package manager and syntax of `APKBUILD` files is best ## Abuild in a nutshell -Building with abuild requires `alpine-sdk` package installed, `/etc/abuild.conf` configured and an RSA private key created in `/srv/build/repokey.rsa` and subsequently registered by `abuild-keygen` command. All these are taken care of in `install-toolchain.sh` script as part of [Build environment installation](vm-creation). +Building with abuild requires `alpine-sdk` package installed, `/etc/abuild.conf` configured and an RSA private key created in `/srv/repo.spotter.cz.rsa` and subsequently registered by `abuild-keygen` command. All these are taken care of in `install-toolchain.sh` script as part of [Build environment installation](vm-creation). Abuild toolchain is intended to be used in automated builds, therefore it requires some dependencies normally not found in other packaging systems. Abuild expects that `APKBUILD` files are a part of git repository and tries to read current commit hash. Then it tries to automatically download, build (compile), strip binaries, find out dependencies, and generally perform a lot of tasks normally useful when you are compiling from sources. Finally it packages the result to one or more subpackages, according to the build recipe. For purposes of LXC packaging, this is mostly useless, which is the reason why we have a [custom package manager](pkgmgr). It is however perfectly suitable for packages installed directly on the basic VM. diff --git a/lxc-shared/alpine3.11/image.d/etc/apk/keys/vm.rsa.pub b/lxc-shared/alpine3.11/image.d/etc/apk/keys/repo.spotter.cz.rsa.pub similarity index 100% rename from lxc-shared/alpine3.11/image.d/etc/apk/keys/vm.rsa.pub rename to lxc-shared/alpine3.11/image.d/etc/apk/keys/repo.spotter.cz.rsa.pub diff --git a/vm/etc/apk/keys/vm.rsa.pub b/vm/etc/apk/keys/repo.spotter.cz.rsa.pub similarity index 100% rename from vm/etc/apk/keys/vm.rsa.pub rename to vm/etc/apk/keys/repo.spotter.cz.rsa.pub