From 7321c813e55d84940340787ae414969efd3da15a Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Wed, 23 Apr 2025 21:00:13 +0200 Subject: [PATCH] remarkable: factorize update rules (#13665) --- make/remarkable-aarch64.mk | 21 +-------------------- make/remarkable.mk | 4 ++-- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/make/remarkable-aarch64.mk b/make/remarkable-aarch64.mk index 1e3c619ef..cb3eaf526 100644 --- a/make/remarkable-aarch64.mk +++ b/make/remarkable-aarch64.mk @@ -1,20 +1 @@ -REMARKABLE_DIR = $(PLATFORM_DIR)/remarkable -REMARKABLE_PACKAGE = koreader-remarkable-aarch64$(KODEDUG_SUFFIX)-$(VERSION).zip -REMARKABLE_PACKAGE_OTA = koreader-remarkable-aarch64$(KODEDUG_SUFFIX)-$(VERSION).targz - -define UPDATE_PATH_EXCLUDES += -plugins/SSH.koplugin -tools -endef - -update: all - # ensure that the binaries were built for ARM - file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM - # Remarkable scripts - $(SYMLINK) $(REMARKABLE_DIR)/* $(INSTALL_DIR)/koreader/ - $(SYMLINK) $(COMMON_DIR)/spinning_zsync $(INSTALL_DIR)/koreader/ - # Create packages. - $(strip $(call mkupdate,$(REMARKABLE_PACKAGE))) - $(strip $(call mkupdate,$(REMARKABLE_PACKAGE_OTA))) - -PHONY += update +include make/remarkable.mk diff --git a/make/remarkable.mk b/make/remarkable.mk index f85ad0a20..5798cf01c 100644 --- a/make/remarkable.mk +++ b/make/remarkable.mk @@ -1,6 +1,6 @@ REMARKABLE_DIR = $(PLATFORM_DIR)/remarkable -REMARKABLE_PACKAGE = koreader-remarkable$(KODEDUG_SUFFIX)-$(VERSION).zip -REMARKABLE_PACKAGE_OTA = koreader-remarkable$(KODEDUG_SUFFIX)-$(VERSION).targz +REMARKABLE_PACKAGE = koreader-$(DIST)$(KODEDUG_SUFFIX)-$(VERSION).zip +REMARKABLE_PACKAGE_OTA = koreader-$(DIST)$(KODEDUG_SUFFIX)-$(VERSION).targz define UPDATE_PATH_EXCLUDES += plugins/SSH.koplugin