[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 048d2be91a17ea57b870b0b944d439978b2f88a8

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 5235 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  048d2be91a17ea57b870b0b944d439978b2f88a8 (commit)
       via  f9864480df82ba135b14989801338504000c3d32 (commit)
      from  0a110703cac98300f23199b621eab2583832f463 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 048d2be91a17ea57b870b0b944d439978b2f88a8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 20 16:08:32 2024 +0000

    make.sh: Remove all traces of KCFG
    
    This variable is no longer been used and has been abused way too much in
    the past. May it rest in pieces.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f9864480df82ba135b14989801338504000c3d32
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 20 16:08:16 2024 +0000

    rtl8812au: Fix build with updated KVER
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/Config    |  2 +-
 lfs/alsa      |  2 --
 lfs/openssl   |  2 +-
 lfs/rtl8812au | 17 ++++++++---------
 make.sh       |  8 +++-----
 5 files changed, 13 insertions(+), 18 deletions(-)

Difference in files:
diff --git a/lfs/Config b/lfs/Config
index 6d1dbd23d..fe4e9605c 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -282,7 +282,7 @@ define POSTBUILD
 	# $(TARGET)_rootfile : ROOTFILE with KVER replacement
 	# $(TARGET) : log result with {commented|include|added} files
 	@if [ -s "$(TARGET)_diff" ]; then \
-		LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
+		LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
 		echo $(LFS_SCRIPT); \
 		ROOTFILE=$$(find -L $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
 		if [ "$$ROOTFILE" = "" ]; then \
diff --git a/lfs/alsa b/lfs/alsa
index 55b4f7152..6f8d6d018 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -31,8 +31,6 @@ UVER       = 1.2.10
 CVER       = 1.2.10
 FVER       = 1.2.4
 
-VERSUFIX   = ipfire$(KCFG)
-
 THISAPP    = alsa-lib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
diff --git a/lfs/openssl b/lfs/openssl
index a714d4dcd..00b19b41a 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 CFLAGS += -DPURIFY -Wa,--noexecstack
 
diff --git a/lfs/rtl8812au b/lfs/rtl8812au
index b7f9b8657..3382abe97 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 --check=crc32 --lzma2=dict=512KiB $$f; \
-		install -m 644 $$f.xz $(MODPATH); \
+		install -v -m 644 $$f.xz $(MODPATH); \
 	done
 
 	@rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index 48f1ad404..6516f9dc0 100755
--- a/make.sh
+++ b/make.sh
@@ -2096,11 +2096,9 @@ build_system() {
 	lfsmake2 inotify-tools
 	lfsmake2 grub-btrfs
 
-	# Kernelbuild ... current we have no platform that need
-	# multi kernel builds so KCFG is empty
-	lfsmake2 linux		KCFG=""
-	lfsmake2 rtl8812au		KCFG=""
-	lfsmake2 linux-initrd		KCFG=""
+	lfsmake2 linux
+	lfsmake2 rtl8812au
+	lfsmake2 linux-initrd
 
 	lfsmake2 memtest
 


hooks/post-receive
--
IPFire 2.x development tree