CondorCORE/condorcore-keyring
CondorCORE/condorcore-keyring
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dvzrv/revsig_allan
condorcore-keyring/Makefile

73 lines
2.7 KiB
Makefile
Raw Permalink Normal View History

Hardcode using bash as make's shell On Debian/Ubuntu the default shell is dash, and builds are done with SHELL overridden to dash. Since archlinux-keyring now has Bash-isms in the install and uninstall targets (for {} expansion), and rewriting it to drop this is inconvenient (because we'll have to repeat the path prefixes), hardcode the use of Bash instead. Use /bin/bash to be compatible with distros that have not finished the /bin -> /usr/bin migration yet. Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
2022-09-09 13:13:22 -05:00
SHELL = /bin/bash
Makefile: Change to use new targets Makefile: Remove soon unneeded targets for dist and upload. Add lint and build targets. Simplify the installation and uninstallation target.
2021-10-16 17:41:17 -05:00
PREFIX ?= /usr/local
Adapt Makefile to build wkd dir and inspect it Makefile: Change the Makefile to build WKD dirs based on a given WKD_FQDN and add them to WKD_BUILD_DIR.
2022-08-31 04:01:15 -05:00
BUILD_DIR ?= build
Make install locations more configurable and clean up Makefile: Change Makefile to allow installation of keyring data, systemd units and scripts more configurable. This allows user provided overrides via KEYRING_TARGET_DIR, SCRIPT_TARGET_DIR, SYSTEMD_SYSTEM_UNIT_DIR. Instead of relying on wildcards, rely on specifically named files, as this can be reused also in the uninstall target without issue and provides a clearer overview of what will be installed/uninstalled. Specifically only make use of DESTDIR in the install and uninstall targets, which allows easier overrides. Extend uninstall target to also remove WKD sync related script and systemd units.
2022-08-04 05:41:23 -05:00
KEYRING_TARGET_DIR ?= $(PREFIX)/share/pacman/keyrings/
Remove extra forward slash from archlinux-keyring-wkd-sync.service Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
2023-02-14 14:54:51 -06:00
SCRIPT_TARGET_DIR ?= $(PREFIX)/bin
Make install locations more configurable and clean up Makefile: Change Makefile to allow installation of keyring data, systemd units and scripts more configurable. This allows user provided overrides via KEYRING_TARGET_DIR, SCRIPT_TARGET_DIR, SYSTEMD_SYSTEM_UNIT_DIR. Instead of relying on wildcards, rely on specifically named files, as this can be reused also in the uninstall target without issue and provides a clearer overview of what will be installed/uninstalled. Specifically only make use of DESTDIR in the install and uninstall targets, which allows easier overrides. Extend uninstall target to also remove WKD sync related script and systemd units.
2022-08-04 05:41:23 -05:00
SYSTEMD_SYSTEM_UNIT_DIR ?= $(shell pkgconf --variable systemd_system_unit_dir systemd)
Adapt Makefile to build wkd dir and inspect it Makefile: Change the Makefile to build WKD dirs based on a given WKD_FQDN and add them to WKD_BUILD_DIR.
2022-08-31 04:01:15 -05:00
WKD_FQDN ?= archlinux.org
WKD_BUILD_DIR ?= $(BUILD_DIR)/wkd
Make install locations more configurable and clean up Makefile: Change Makefile to allow installation of keyring data, systemd units and scripts more configurable. This allows user provided overrides via KEYRING_TARGET_DIR, SCRIPT_TARGET_DIR, SYSTEMD_SYSTEM_UNIT_DIR. Instead of relying on wildcards, rely on specifically named files, as this can be reused also in the uninstall target without issue and provides a clearer overview of what will be installed/uninstalled. Specifically only make use of DESTDIR in the install and uninstall targets, which allows easier overrides. Extend uninstall target to also remove WKD sync related script and systemd units.
2022-08-04 05:41:23 -05:00
KEYRING_FILE=archlinux.gpg
KEYRING_REVOKED_FILE=archlinux-revoked
KEYRING_TRUSTED_FILE=archlinux-trusted
WKD_SYNC_SCRIPT=archlinux-keyring-wkd-sync
Allow overriding the script location in WKD sync service wkd_sync/archlinux-keyring-wkd-sync.service.in: Replace use of explicit script location (i.e. /usr/bin) with SCRIPT_TARGET_DIR placeholder. Makefile: Create WKD sync service file from input file, replacing the SCRIPT_TARGET_DIR placeholder with $SCRIPT_TARGET_DIR.
2022-08-04 05:59:24 -05:00
WKD_SYNC_SERVICE_IN=archlinux-keyring-wkd-sync.service.in
Make install locations more configurable and clean up Makefile: Change Makefile to allow installation of keyring data, systemd units and scripts more configurable. This allows user provided overrides via KEYRING_TARGET_DIR, SCRIPT_TARGET_DIR, SYSTEMD_SYSTEM_UNIT_DIR. Instead of relying on wildcards, rely on specifically named files, as this can be reused also in the uninstall target without issue and provides a clearer overview of what will be installed/uninstalled. Specifically only make use of DESTDIR in the install and uninstall targets, which allows easier overrides. Extend uninstall target to also remove WKD sync related script and systemd units.
2022-08-04 05:41:23 -05:00
WKD_SYNC_SERVICE=archlinux-keyring-wkd-sync.service
WKD_SYNC_TIMER=archlinux-keyring-wkd-sync.timer
Install WKD update script/service/timer with Makefile Makefile: Extend install target to also install the WKD update script and the systemd service and timer. Vendor enable the systemd timer.
2022-07-22 18:47:38 -05:00
SYSTEMD_TIMER_DIR=$(SYSTEMD_SYSTEM_UNIT_DIR)/timers.target.wants/
fix(make): use proper dependency tracking for the build output Declare the whole keyring data as well as the code as input dependency for the build target. This way we can properly depend on the build target for installation without forcing rebuilding on every invocation. A rebuild will be triggered if either the keyring or the source code creating the build output changes. The directories are added to the source dependencies on purpose to guarantee that changes like deleted files will result in a rebuild. The mtime of the build directory is force updated on every run to allow make to track the output artifacts mtime compared against the dependencies.
2021-11-26 16:40:11 -06:00
SOURCES := $(shell find keyring) $(shell find libkeyringctl -name '*.py' -or -type d) keyringctl
Add Makefile
2012-02-13 07:37:52 -06:00
Makefile: Change to use new targets Makefile: Remove soon unneeded targets for dist and upload. Add lint and build targets. Simplify the installation and uninstallation target.
2021-10-16 17:41:17 -05:00
all: build
Add Makefile
2012-02-13 07:37:52 -06:00
Makefile: Change to use new targets Makefile: Remove soon unneeded targets for dist and upload. Add lint and build targets. Simplify the installation and uninstallation target.
2021-10-16 17:41:17 -05:00
lint:
feature(ci): add testing and coverage data to gitlab ci artifacts
2021-11-01 11:36:02 -06:00
black --check --diff keyringctl libkeyringctl tests
Makefile: Change to use new targets Makefile: Remove soon unneeded targets for dist and upload. Add lint and build targets. Simplify the installation and uninstallation target.
2021-10-16 17:41:17 -05:00
isort --diff .
feature(ci): add testing and coverage data to gitlab ci artifacts
2021-11-01 11:36:02 -06:00
flake8 keyringctl libkeyringctl tests
mypy --install-types --non-interactive keyringctl libkeyringctl tests
Add Makefile
2012-02-13 07:37:52 -06:00
feature(make): adding `fmt` target to format the project accordingly
2021-10-24 15:10:14 -05:00
fmt:
black .
isort .
feature(ci): run keyring integrity check if keyring or code changes
2021-11-07 16:31:19 -06:00
check:
./keyringctl -v check
feature(keyringctl): adding basic infrastructure for running tests
2021-10-31 11:53:20 -06:00
test:
Makefile: Use coverage instead of pytest Makefile: Run pytest via coverage in `make test` to also generate a coverage report.
2021-10-31 14:26:27 -06:00
coverage run
Add more specific coverage configuration pyproject.toml: Set specific source for `toolscoverage.paths` (as we only provide one module). Set `tools.coverage.run.relative_files` to true (although it is still bug riddled and does not seem to work as advertized in regards to xml output: https://github.com/nedbat/coveragepy/issues/963, https://github.com/nedbat/coveragepy/issues/1147). Set `tool.coverage.xml.output`, so we don't have to provide it on the commandline. Makefile: Do not provide an output file to the coverage xml call, as we do that in configuration now.
2021-11-01 15:25:11 -06:00
coverage xml
Fail test target under 100% test coverage Makefile: Fail coverage report below 100% test coverage.
2021-11-14 09:10:23 -06:00
coverage report --fail-under=100.0
feature(keyringctl): adding basic infrastructure for running tests
2021-10-31 11:53:20 -06:00
fix(make): use proper dependency tracking for the build output Declare the whole keyring data as well as the code as input dependency for the build target. This way we can properly depend on the build target for installation without forcing rebuilding on every invocation. A rebuild will be triggered if either the keyring or the source code creating the build output changes. The directories are added to the source dependencies on purpose to guarantee that changes like deleted files will result in a rebuild. The mtime of the build directory is force updated on every run to allow make to track the output artifacts mtime compared against the dependencies.
2021-11-26 16:40:11 -06:00
build: $(SOURCES)
Adapt Makefile to build wkd dir and inspect it Makefile: Change the Makefile to build WKD dirs based on a given WKD_FQDN and add them to WKD_BUILD_DIR.
2022-08-31 04:01:15 -05:00
./keyringctl -v $(BUILD_DIR)
wkd: build
sq -f wkd generate -s $(WKD_BUILD_DIR)/ $(WKD_FQDN) $(BUILD_DIR)/$(KEYRING_FILE)
wkd_inspect: wkd
for file in $(WKD_BUILD_DIR)/.well-known/openpgpkey/$(WKD_FQDN)/hu/*; do sq inspect $$file; done
Add Makefile
2012-02-13 07:37:52 -06:00
Allow overriding the script location in WKD sync service wkd_sync/archlinux-keyring-wkd-sync.service.in: Replace use of explicit script location (i.e. /usr/bin) with SCRIPT_TARGET_DIR placeholder. Makefile: Create WKD sync service file from input file, replacing the SCRIPT_TARGET_DIR placeholder with $SCRIPT_TARGET_DIR.
2022-08-04 05:59:24 -05:00
wkd_sync_service: wkd_sync/$(WKD_SYNC_SERVICE_IN)
Adapt Makefile to build wkd dir and inspect it Makefile: Change the Makefile to build WKD dirs based on a given WKD_FQDN and add them to WKD_BUILD_DIR.
2022-08-31 04:01:15 -05:00
sed -e 's|SCRIPT_TARGET_DIR|$(SCRIPT_TARGET_DIR)|' wkd_sync/$(WKD_SYNC_SERVICE_IN) > $(BUILD_DIR)/$(WKD_SYNC_SERVICE)
Allow overriding the script location in WKD sync service wkd_sync/archlinux-keyring-wkd-sync.service.in: Replace use of explicit script location (i.e. /usr/bin) with SCRIPT_TARGET_DIR placeholder. Makefile: Create WKD sync service file from input file, replacing the SCRIPT_TARGET_DIR placeholder with $SCRIPT_TARGET_DIR.
2022-08-04 05:59:24 -05:00
fix(make): use proper dependency tracking for the build output Declare the whole keyring data as well as the code as input dependency for the build target. This way we can properly depend on the build target for installation without forcing rebuilding on every invocation. A rebuild will be triggered if either the keyring or the source code creating the build output changes. The directories are added to the source dependencies on purpose to guarantee that changes like deleted files will result in a rebuild. The mtime of the build directory is force updated on every run to allow make to track the output artifacts mtime compared against the dependencies.
2021-11-26 16:40:11 -06:00
clean:
Adapt Makefile to build wkd dir and inspect it Makefile: Change the Makefile to build WKD dirs based on a given WKD_FQDN and add them to WKD_BUILD_DIR.
2022-08-31 04:01:15 -05:00
rm -rf $(BUILD_DIR) $(WKD_BUILD_DIR)
fix(make): use proper dependency tracking for the build output Declare the whole keyring data as well as the code as input dependency for the build target. This way we can properly depend on the build target for installation without forcing rebuilding on every invocation. A rebuild will be triggered if either the keyring or the source code creating the build output changes. The directories are added to the source dependencies on purpose to guarantee that changes like deleted files will result in a rebuild. The mtime of the build directory is force updated on every run to allow make to track the output artifacts mtime compared against the dependencies.
2021-11-26 16:40:11 -06:00
Allow overriding the script location in WKD sync service wkd_sync/archlinux-keyring-wkd-sync.service.in: Replace use of explicit script location (i.e. /usr/bin) with SCRIPT_TARGET_DIR placeholder. Makefile: Create WKD sync service file from input file, replacing the SCRIPT_TARGET_DIR placeholder with $SCRIPT_TARGET_DIR.
2022-08-04 05:59:24 -05:00
install: build wkd_sync_service
Make install locations more configurable and clean up Makefile: Change Makefile to allow installation of keyring data, systemd units and scripts more configurable. This allows user provided overrides via KEYRING_TARGET_DIR, SCRIPT_TARGET_DIR, SYSTEMD_SYSTEM_UNIT_DIR. Instead of relying on wildcards, rely on specifically named files, as this can be reused also in the uninstall target without issue and provides a clearer overview of what will be installed/uninstalled. Specifically only make use of DESTDIR in the install and uninstall targets, which allows easier overrides. Extend uninstall target to also remove WKD sync related script and systemd units.
2022-08-04 05:41:23 -05:00
install -vDm 644 build/{$(KEYRING_FILE),$(KEYRING_REVOKED_FILE),$(KEYRING_TRUSTED_FILE)} -t $(DESTDIR)$(KEYRING_TARGET_DIR)
install -vDm 755 wkd_sync/$(WKD_SYNC_SCRIPT) -t $(DESTDIR)$(SCRIPT_TARGET_DIR)
Allow overriding the script location in WKD sync service wkd_sync/archlinux-keyring-wkd-sync.service.in: Replace use of explicit script location (i.e. /usr/bin) with SCRIPT_TARGET_DIR placeholder. Makefile: Create WKD sync service file from input file, replacing the SCRIPT_TARGET_DIR placeholder with $SCRIPT_TARGET_DIR.
2022-08-04 05:59:24 -05:00
install -vDm 644 build/$(WKD_SYNC_SERVICE) -t $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)
install -vDm 644 wkd_sync/$(WKD_SYNC_TIMER) -t $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)
Make install locations more configurable and clean up Makefile: Change Makefile to allow installation of keyring data, systemd units and scripts more configurable. This allows user provided overrides via KEYRING_TARGET_DIR, SCRIPT_TARGET_DIR, SYSTEMD_SYSTEM_UNIT_DIR. Instead of relying on wildcards, rely on specifically named files, as this can be reused also in the uninstall target without issue and provides a clearer overview of what will be installed/uninstalled. Specifically only make use of DESTDIR in the install and uninstall targets, which allows easier overrides. Extend uninstall target to also remove WKD sync related script and systemd units.
2022-08-04 05:41:23 -05:00
install -vdm 755 $(DESTDIR)$(SYSTEMD_TIMER_DIR)
Force symlinking of systemd unit for activation Makefile: Force symlinking of systemd unit for activation. If the service is already installed and activated (symlinked) on the target system, a non-forced symlink would fail otherwise.
2022-09-02 06:26:29 -05:00
ln -fsv ../$(WKD_SYNC_TIMER) $(DESTDIR)$(SYSTEMD_TIMER_DIR)/$(WKD_SYNC_TIMER)
Add Makefile
2012-02-13 07:37:52 -06:00
Makefile: Change to use new targets Makefile: Remove soon unneeded targets for dist and upload. Add lint and build targets. Simplify the installation and uninstallation target.
2021-10-16 17:41:17 -05:00
uninstall:
Make install locations more configurable and clean up Makefile: Change Makefile to allow installation of keyring data, systemd units and scripts more configurable. This allows user provided overrides via KEYRING_TARGET_DIR, SCRIPT_TARGET_DIR, SYSTEMD_SYSTEM_UNIT_DIR. Instead of relying on wildcards, rely on specifically named files, as this can be reused also in the uninstall target without issue and provides a clearer overview of what will be installed/uninstalled. Specifically only make use of DESTDIR in the install and uninstall targets, which allows easier overrides. Extend uninstall target to also remove WKD sync related script and systemd units.
2022-08-04 05:41:23 -05:00
rm -fv $(DESTDIR)$(KEYRING_TARGET_DIR)/{$(KEYRING_FILE),$(KEYRING_REVOKED_FILE),$(KEYRING_TRUSTED_FILE)}
rmdir -pv --ignore-fail-on-non-empty $(DESTDIR)$(KEYRING_TARGET_DIR)
rm -v $(DESTDIR)$(SCRIPT_TARGET_DIR)/$(WKD_SYNC_SCRIPT)
rmdir -pv --ignore-fail-on-non-empty $(DESTDIR)$(SCRIPT_TARGET_DIR)
rm -v $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/{$(WKD_SYNC_SERVICE),$(WKD_SYNC_TIMER)}
rmdir -pv --ignore-fail-on-non-empty $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)
rm -v $(DESTDIR)$(SYSTEMD_TIMER_DIR)/$(WKD_SYNC_TIMER)
rmdir -pv --ignore-fail-on-non-empty $(DESTDIR)$(SYSTEMD_TIMER_DIR)
Add Makefile
2012-02-13 07:37:52 -06:00
Adapt Makefile to build wkd dir and inspect it Makefile: Change the Makefile to build WKD dirs based on a given WKD_FQDN and add them to WKD_BUILD_DIR.
2022-08-31 04:01:15 -05:00
.PHONY: all lint fmt check test clean install uninstall wkd wkd_inspect
Reference in New Issue Copy Permalink