From 539a37d3ccac46edd1bee697c6dfa77697199406 Mon Sep 17 00:00:00 2001
From: jjm2473 <1129525450@qq.com>
Date: Tue, 18 Apr 2023 15:38:34 +0800
Subject: [PATCH] package: fix some kmod build dir

---
 package/diy/ntfs3-oot/Makefile                       | 11 +++++++----
 package/{network => kernel}/fullconenat/Makefile     | 12 ++++++++----
 .../{network => kernel}/fullconenat/files/Makefile   |  0
 .../fullconenat/patches/001-fix-CE.patch             |  0
 package/kernel/r8125/Makefile                        |  4 +++-
 5 files changed, 18 insertions(+), 9 deletions(-)
 rename package/{network => kernel}/fullconenat/Makefile (85%)
 rename package/{network => kernel}/fullconenat/files/Makefile (100%)
 rename package/{network => kernel}/fullconenat/patches/001-fix-CE.patch (100%)

diff --git a/package/diy/ntfs3-oot/Makefile b/package/diy/ntfs3-oot/Makefile
index 826021a36f..92c79f964c 100644
--- a/package/diy/ntfs3-oot/Makefile
+++ b/package/diy/ntfs3-oot/Makefile
@@ -7,20 +7,23 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ntfs3-oot
+PKG_VERSION:=2021-07-05
 PKG_RELEASE:=3
 
 PKG_SOURCE_VERSION:=46d199e7d7302879b23ad20097ba53b152257288
-PKG_HASH:=6c53ec51f33a71f8762b6280d097a7fbf52ff6e69d53d7f11d38f56d9be2dccb
-PKG_SOURCE_URL_FILE:=$(PKG_SOURCE_VERSION).zip
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_URL_FILE)
+PKG_HASH:=a11b5891522f1c7e674ae622af59ce6a49ebdeb1bbb1b97c49ab166d850d98ea
+PKG_SOURCE_URL_FILE:=$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/LGA1150/ntfs3-oot/archive/
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-only
 
 include $(INCLUDE_DIR)/package.mk
 
+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
 define KernelPackage/fs-ntfs3-oot
   SECTION:=kernel
   CATEGORY:=Kernel modules
diff --git a/package/network/fullconenat/Makefile b/package/kernel/fullconenat/Makefile
similarity index 85%
rename from package/network/fullconenat/Makefile
rename to package/kernel/fullconenat/Makefile
index 9fff7a8acd..01cef02e80 100644
--- a/package/network/fullconenat/Makefile
+++ b/package/kernel/fullconenat/Makefile
@@ -9,19 +9,23 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fullconenat
+PKG_VERSION:=2021-12-04
 PKG_RELEASE:=5
 
-PKG_SOURCE_DATE:=2021-12-04
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/llccd/netfilter-full-cone-nat.git
 PKG_SOURCE_VERSION:=7fe02604e073945a3b081c18efbb4d3c799a31f6
-PKG_MIRROR_HASH:=857062e07606d00ef9ce1b6c5d457ffc1ccfb7667694c1958bc59f1d7c4f08a4
+PKG_HASH:=214a80b647981e55b733ba37d29f5951141d481b81c5bb8e55a442b651d09025
+PKG_SOURCE_URL_FILE:=$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/llccd/netfilter-full-cone-nat/archive/
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
 define Package/iptables-mod-fullconenat
   SUBMENU:=Firewall
   SECTION:=net
diff --git a/package/network/fullconenat/files/Makefile b/package/kernel/fullconenat/files/Makefile
similarity index 100%
rename from package/network/fullconenat/files/Makefile
rename to package/kernel/fullconenat/files/Makefile
diff --git a/package/network/fullconenat/patches/001-fix-CE.patch b/package/kernel/fullconenat/patches/001-fix-CE.patch
similarity index 100%
rename from package/network/fullconenat/patches/001-fix-CE.patch
rename to package/kernel/fullconenat/patches/001-fix-CE.patch
diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile
index f74b38e7c8..5f6ad40bf4 100644
--- a/package/kernel/r8125/Makefile
+++ b/package/kernel/r8125/Makefile
@@ -13,13 +13,15 @@ PKG_RELEASE:=$(AUTORELEASE)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)?
 PKG_HASH:=e3f0a0a02a4ba847cb962ea7e12c89e3f4ab732944f04ebeb76d4d9711fa8ca6
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILE:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
 define KernelPackage/r8125
   TITLE:=Driver for Realtek r8125 chipsets
   SUBMENU:=Network Devices