restool: bump to lf-6.18.2-1.0.0

This commit bumps restool layerscape package to lf-6.18.2-1.0.0 version.

Patch to disable manpage build was dropped and replaced with MANPAGE=""
in MAKE_FLAGS.

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23290
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/package/network/utils/layerscape/restool/Makefile b/package/network/utils/layerscape/restool/Makefile
index ac8c5887a2df219aaa5c316b6c02477a1d97ef1a..eecc8d5a0d899f76222823d57d39708e52bde219 100644 (file)
--- a/package/network/utils/layerscape/restool/Makefile
+++ b/package/network/utils/layerscape/restool/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=restool
-PKG_VERSION:=6.6.23.2.0.0
+PKG_VERSION:=6.18.2.1.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nxp-qoriq/restool
-PKG_SOURCE_VERSION:=lf-6.6.23-2.0.0
-PKG_MIRROR_HASH:=e669c9faf5a00e36d763dbbd6dd866d878b0101df086582c38908d281fa3b465
+PKG_SOURCE_VERSION:=lf-6.18.2-1.0.0
+PKG_MIRROR_HASH:=d3e35b9e8e0db98aa52c0f48fba4b2c9c6e124a0d32e8bf36c208f9dfe3a8dc2
 
 PKG_FLAGS:=nonshared
 
@@ -27,7 +27,7 @@ define Package/restool
   DEPENDS:=@TARGET_layerscape_armv8_64b
 endef
 
-MAKE_FLAGS += \
+MAKE_FLAGS += MANPAGE="" \
        DESTDIR="$(PKG_BUILD_DIR)"/output/ \
        install
 

diff --git a/package/network/utils/layerscape/restool/patches/remove-manpage.patch b/package/network/utils/layerscape/restool/patches/remove-manpage.patch
deleted file mode 100644 (file)
index ffd73c3..0000000
--- a/package/network/utils/layerscape/restool/patches/remove-manpage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -55,14 +55,13 @@ restool: $(OBJ)
- %.1: %.md
-       pandoc --standalone --to man $^ -o $@
- 
--install: restool scripts/ls-main scripts/ls-append-dpl scripts/ls-debug scripts/restool_completion.sh $(MANPAGE)
-+install: restool scripts/ls-main scripts/ls-append-dpl scripts/ls-debug scripts/restool_completion.sh
-       install -D -m 755 restool $(DESTDIR)$(bindir)/restool
-       install -D -m 755 scripts/ls-main $(DESTDIR)$(bindir)/ls-main
-       install -D -m 755 scripts/ls-append-dpl $(DESTDIR)$(bindir)/ls-append-dpl
-       install -D -m 755 scripts/ls-debug $(DESTDIR)$(bindir)/ls-debug
-       $(foreach symlink, $(RESTOOL_SCRIPT_SYMLINKS), sh -c "cd $(DESTDIR)$(bindir) && ln -sf ls-main $(symlink)" ;)
-       install -D -m 755 scripts/restool_completion.sh $(DESTDIR)$(bindir_completion)/restool
--      install -m 0644 -D $(MANPAGE) $(call get_manpage_destination,$(MANPAGE))
- 
- clean:
-       rm -f $(OBJ) $(MANPAGE) \