From 97f0eb94ad15f9fdf9a398c4c419ee28bf16438a Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Fri, 22 Nov 2024 21:54:29 +0200 Subject: [PATCH] hfsprogs: Make version apk compatible Adjust version to match apk semantic rules. Signed-off-by: Hannu Nyman --- utils/hfsprogs/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/hfsprogs/Makefile b/utils/hfsprogs/Makefile index a3c05c4132..e230dbcc1c 100644 --- a/utils/hfsprogs/Makefile +++ b/utils/hfsprogs/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hfsprogs -PKG_VERSION:=540.1.linux3 +PKG_REAL_VERSION:=540.1.linux3 +PKG_VERSION:=$(subst linux,,$(PKG_REAL_VERSION)) PKG_RELEASE:=2 -PKG_SOURCE:=diskdev_cmds-$(PKG_VERSION).tar.gz +PKG_SOURCE:=diskdev_cmds-$(PKG_REAL_VERSION).tar.gz PKG_SOURCE_URL:=https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/$(PKG_SOURCE)/0435afc389b919027b69616ad1b05709 PKG_HASH:=b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497 -PKG_BUILD_DIR:=$(BUILD_DIR)/diskdev_cmds-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/diskdev_cmds-$(PKG_REAL_VERSION) PKG_MAINTAINER:= PKG_LICENSE:=APSL-2.0 @@ -59,7 +60,7 @@ TARGET_CFLAGS+=$(if $(CONFIG_USE_MUSL),-D__P\(x\)=x -D__va_copy=va_copy -DBSD_SO define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS+="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1 -D VERSION=\\\"$(PKG_VERSION)\\\"" \ + CFLAGS+="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1 -D VERSION=\\\"$(PKG_REAL_VERSION)\\\"" \ LDFLAGS+="$(TARGET_LDFLAGS)" \ all endef -- 2.30.2