From 7212a66761e8d6ec1ca9a154132af1d2460e28b6 Mon Sep 17 00:00:00 2001
From: Vincent Li <vincent.mc.li@gmail.com>
Date: Sun, 15 Sep 2024 00:39:23 +0000
Subject: [PATCH] lunatik: re-arrange lunatik and kernel build order

lunatik kernel modules requires kernel to be built first
so /lib/modules is available for lunatik

lunatik also requires resolve_btfids under:

/lib/modules/$(VER)-$(VERSUFIX)/build/tools/bpf/resolve_btfids/

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
---
 lfs/linux | 2 ++
 make.sh   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lfs/linux b/lfs/linux
index 0edada031..54f9804dd 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -230,6 +230,8 @@ endif
 		/lib/modules/$(VER)-$(VERSUFIX)/build/autoconf.h
 	cp /lib/modules/$(VER)-$(VERSUFIX)/build/.config \
 		/lib/modules/$(VER)-$(VERSUFIX)/build/include/config/auto.conf
+	# for lunatik: copy resolve_btfids to /lib/modules/$(VER)-$(VERSUFIX)/build/tools/bpf/resolve_btfids/
+	cp -f $(DIR_APP)/tools/bpf/resolve_btfids/resolve_btfids /lib/modules/$(VER)-$(VERSUFIX)/build/tools/bpf/resolve_btfids/
 
 	# Fix permissions
 	find /lib/modules/$(VER)-$(VERSUFIX) -name "modules.order" \
diff --git a/make.sh b/make.sh
index 7a863c2e3..f4d464ba2 100755
--- a/make.sh
+++ b/make.sh
@@ -1721,7 +1721,6 @@ buildipfire() {
   lfsmake2 loxilb-tc
   lfsmake2 loxicmd
   lfsmake2 loxilb
-  lfsmake2 lunatik
 
 
   # Kernelbuild ... current we have no platform that need
@@ -1729,6 +1728,8 @@ buildipfire() {
   lfsmake2 linux		KCFG=""
   lfsmake2 rtl8812au		KCFG=""
   lfsmake2 linux-initrd		KCFG=""
+  # lunatik kernel module requires linux kernel to be built first
+  lfsmake2 lunatik
 }
 
 buildinstaller() {