X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Frtl8812au;h=b7f9b86577cc5e4441bf324d6d562840218e6b97;hb=HEAD;hp=fd3128f426c3d30d03b1083b3441dc3f6eb8c7e7;hpb=1604674b51373aa592d6f353f8ccf5fef61be80a;p=ipfire-2.x.git

diff --git a/lfs/rtl8812au b/lfs/rtl8812au
index fd3128f426..3382abe97b 100644
--- a/lfs/rtl8812au
+++ b/lfs/rtl8812au
@@ -24,16 +24,15 @@
 
 include Config
 
-VERSUFIX = ipfire$(KCFG)
-MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-
 VER        = 20210629-e6a0d1704ccd31145800ff5eb09ec2435a02f995
 
 THISAPP    = 8812au-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
+
+MODPATH    = /lib/modules/$(KVER)/extra/wlan
 
 ###############################################################################
 # Top-level Rules
@@ -78,17 +77,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/enable_usbmodeswitch.patch
 	cd $(DIR_APP) && CONFIG_RTL8812AU=m make $(MAKETUNING) \
-		-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
+		-C /lib/modules/$(KVER)/build/ M=$(DIR_APP)/ modules
 
 	# Install the built kernel modules.
 	mkdir -p $(MODPATH)
 	cd $(DIR_APP) && for f in $$(ls *.ko); do \
-		/lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
-			/lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
-			/lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
+		/lib/modules/$(KVER)/build/scripts/sign-file sha512 \
+			/lib/modules/$(KVER)/build/certs/signing_key.pem \
+			/lib/modules/$(KVER)/build/certs/signing_key.x509 \
 			$$f; \
-		xz $$f; \
-		install -m 644 $$f.xz $(MODPATH); \
+		xz --check=crc32 --lzma2=dict=512KiB $$f; \
+		install -v -m 644 $$f.xz $(MODPATH); \
 	done
 
 	@rm -rf $(DIR_APP)