diff --git a/base/Makefile b/base/Makefile index 1b0f2e7..28d9f8f 100644 --- a/base/Makefile +++ b/base/Makefile @@ -1,5 +1,5 @@ TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk SYSTEMD_MAIN_UNIT_NAMES += var-lib-virtiofs-data.mount SYSTEMD_MAIN_UNIT_NAMES += rpm-ostree-install-qemu-guest-agent.service SYSTEMD_MAIN_UNIT_NAMES += install-fastfetch.service diff --git a/Makefile.common b/common.mk similarity index 99% rename from Makefile.common rename to common.mk index ef9485f..ba49109 100644 --- a/Makefile.common +++ b/common.mk @@ -116,7 +116,7 @@ PROJECT_UID ?= 0 PROJECT_GID ?= 0 # Source Makefiles providing hooks to extend this Makefile. -HOOKS := $(wildcard $(TOP_LEVEL_DIR)/*/Makefile.hooks) +HOOKS := $(wildcard $(TOP_LEVEL_DIR)/*/hooks.mk) include $(HOOKS) # Ensure that the Makefile is not run from the top-level directory and that it is run as root. diff --git a/gitea/Makefile b/gitea/Makefile index 606461d..9b3ae55 100644 --- a/gitea/Makefile +++ b/gitea/Makefile @@ -9,4 +9,4 @@ PROJECT_UID = 10009 PROJECT_GID = 10000 TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/keycloak/Makefile b/keycloak/Makefile index 7f95819..d6b08c1 100644 --- a/keycloak/Makefile +++ b/keycloak/Makefile @@ -9,5 +9,5 @@ PROJECT_UID = 10007 PROJECT_GID = 10000 TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/lego/Makefile b/lego/Makefile index 682936e..544353e 100644 --- a/lego/Makefile +++ b/lego/Makefile @@ -8,6 +8,6 @@ PROJECT_GID = 10000 # Include common Makefile TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/miniflux/Makefile b/miniflux/Makefile index 4d6bc24..cc43a4a 100644 --- a/miniflux/Makefile +++ b/miniflux/Makefile @@ -9,5 +9,5 @@ PROJECT_UID = 10010 PROJECT_GID = 10000 TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/nextcloud/Makefile b/nextcloud/Makefile index 6e1912a..f8a19bc 100644 --- a/nextcloud/Makefile +++ b/nextcloud/Makefile @@ -26,7 +26,7 @@ $(TARGET_CHROOT)/etc/quadlets/nextcloud/collabora-seccomp-profile.json: curl -sSfL -o $@ https://raw.githubusercontent.com/CollaboraOnline/online/refs/heads/main/docker/cool-seccomp-profile.json TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk .PHONY: test test-set-nextcloud-major diff --git a/nginx/Makefile b/nginx/Makefile index 1568eaf..bf0e666 100644 --- a/nginx/Makefile +++ b/nginx/Makefile @@ -1,5 +1,5 @@ TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk .PHONY: test diff --git a/postgresql/Makefile b/postgresql/Makefile index bb92571..5aca0bb 100644 --- a/postgresql/Makefile +++ b/postgresql/Makefile @@ -12,7 +12,7 @@ $(TARGET_CHROOT)/etc/quadlets/postgresql/init.d: # Include common Makefile TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk .PHONY: test test-set-pgmajor install-config diff --git a/postgresql/Makefile.hooks b/postgresql/hooks.mk similarity index 100% rename from postgresql/Makefile.hooks rename to postgresql/hooks.mk diff --git a/qemu-user-static/Makefile b/qemu-user-static/Makefile index f9bef1c..ac5dfde 100644 --- a/qemu-user-static/Makefile +++ b/qemu-user-static/Makefile @@ -1,2 +1,2 @@ TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/restic-server/Makefile b/restic-server/Makefile index 888d06c..19c6600 100644 --- a/restic-server/Makefile +++ b/restic-server/Makefile @@ -9,6 +9,6 @@ PROJECT_UID = 10022 PROJECT_GID = 10000 TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk SYSTEMD_MAIN_UNIT_NAMES += restic-server.service diff --git a/samba/Makefile b/samba/Makefile index aaae5be..e937ad9 100644 --- a/samba/Makefile +++ b/samba/Makefile @@ -1,5 +1,5 @@ TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk $(TARGET_CHROOT)/etc/quadlets/samba/smb.conf.d: install -d -m 0700 -o $(PROJECT_UID) -g $(PROJECT_GID) -D $< $@ diff --git a/samba/Makefile.hooks b/samba/hooks.mk similarity index 100% rename from samba/Makefile.hooks rename to samba/hooks.mk diff --git a/seedbox/Makefile b/seedbox/Makefile index 81e2f16..baa46a3 100644 --- a/seedbox/Makefile +++ b/seedbox/Makefile @@ -9,5 +9,5 @@ PROJECT_UID = 10017 PROJECT_GID = 10000 TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/traefik/Makefile b/traefik/Makefile index 0f1b777..c471503 100644 --- a/traefik/Makefile +++ b/traefik/Makefile @@ -7,5 +7,5 @@ PROJECT_UID = 10001 PROJECT_GID = 10000 TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/traefik/Makefile.hooks b/traefik/hooks.mk similarity index 100% rename from traefik/Makefile.hooks rename to traefik/hooks.mk diff --git a/vaultwarden/Makefile b/vaultwarden/Makefile index b766c08..aab7152 100644 --- a/vaultwarden/Makefile +++ b/vaultwarden/Makefile @@ -9,5 +9,5 @@ PROJECT_UID = 10020 PROJECT_GID = 10000 TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk diff --git a/vmagent/Makefile b/vmagent/Makefile index b2e3e3c..d704f94 100644 --- a/vmagent/Makefile +++ b/vmagent/Makefile @@ -8,7 +8,7 @@ PROJECT_GID = 10000 # Include common Makefile TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk SYSTEMD_MAIN_UNIT_NAMES += vmagent.service diff --git a/vsftpd/Makefile b/vsftpd/Makefile index 2a8a6cb..4dd348f 100644 --- a/vsftpd/Makefile +++ b/vsftpd/Makefile @@ -10,6 +10,6 @@ PROJECT_GID = 10000 # Include common Makefile TOP_LEVEL_DIR := .. -include $(TOP_LEVEL_DIR)/Makefile.common +include $(TOP_LEVEL_DIR)/common.mk