From 048d2be91a17ea57b870b0b944d439978b2f88a8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 20 Aug 2024 16:08:32 +0000 Subject: [PATCH] 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 --- lfs/Config | 2 +- lfs/alsa | 2 -- lfs/openssl | 2 +- make.sh | 8 +++----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lfs/Config b/lfs/Config index 6d1dbd23d7..fe4e9605cb 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 55b4f7152f..6f8d6d018a 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 a714d4dcd1..00b19b41a6 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/make.sh b/make.sh index 48f1ad4041..6516f9dc0d 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 -- 2.39.5