vim: add actual xxd version

Use the actual xxd version instead of the vim one for packaging.

Add matching CI test.

Signed-off-by: George Sapkin <george@sapk.in>
This commit is contained in:
George Sapkin
2025-11-17 10:37:59 +02:00
committed by Hannu Nyman
parent 6db7c6bae4
commit 3365ba873b
2 changed files with 7 additions and 2 deletions

View File

@@ -9,7 +9,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vim PKG_NAME:=vim
PKG_VERSION:=9.1 PKG_VERSION:=9.1
PKG_RELEASE:=1 PKG_XXD_VERSION:=2023.10.25
PKG_RELEASE:=2
VIMVER:=91 VIMVER:=91
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -71,6 +72,7 @@ define Package/xxd
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=make a hexdump or do the reverse TITLE:=make a hexdump or do the reverse
URL:=http://www.vim.org/ URL:=http://www.vim.org/
VERSION:=$(PKG_XXD_VERSION)
endef endef
define Package/vim-full/conffiles define Package/vim-full/conffiles

View File

@@ -2,6 +2,9 @@
case "$1" in case "$1" in
vim|vim-full|vim-fuller) vim|vim-full|vim-fuller)
vim --version | grep "$2" vim --version | grep -F "$2"
;;
xxd)
xxd --version 2>&1 | grep -F "${2//./-}"
;; ;;
esac esac