feature(keyringctl): move main/packager folders to isolated keyring dir

This helps to structure the layout of the repository better by having
one root folder that contains the actual decomposed keyring structure.
This commit is contained in:
Levente Polyak 2021-10-20 01:41:04 +02:00
parent 48e9bb67cb
commit b91e8b983c
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
PREFIX ?= /usr/local PREFIX ?= /usr/local
KEYRING_TARGET_DIR=$(DESTDIR)$(PREFIX)/share/pacman/keyrings/ KEYRING_TARGET_DIR=$(DESTDIR)$(PREFIX)/share/pacman/keyrings/
KEYRING_FILES=$(wildcard output/*.gpg) $(wildcard output/*-revoked) $(wildcard output/*-trusted) KEYRING_FILES=$(wildcard keyring/output/*.gpg) $(wildcard keyring/output/*-revoked) $(wildcard keyring/output/*-trusted)
all: build all: build

View File

@ -6,8 +6,8 @@ The keyring is used by pacman to establish the web of trust for the packagers
of the distribution. of the distribution.
The PGP packets describing the main signing keys can be found below the The PGP packets describing the main signing keys can be found below the
[main](main) directory, while those of the packagers are located below the [keyring/main](keyring/main) directory, while those of the packagers are located below the
[packager](packager) directory. [keyring/packager](keyring/packager) directory.
## Requirements ## Requirements

View File

@ -1196,7 +1196,7 @@ if __name__ == "__main__":
# temporary working directory that gets auto cleaned # temporary working directory that gets auto cleaned
with TemporaryDirectory(prefix="arch-keyringctl-") as tempdir: with TemporaryDirectory(prefix="arch-keyringctl-") as tempdir:
keyring_root = Path().absolute() keyring_root = Path("keyring").absolute()
working_dir = Path(tempdir) working_dir = Path(tempdir)
debug(f"Working directory: {working_dir}") debug(f"Working directory: {working_dir}")
with cwd(working_dir): with cwd(working_dir):