diff --git a/config/rootfiles/common/lunatik b/config/rootfiles/common/lunatik deleted file mode 100644 index 764763de5..000000000 --- a/config/rootfiles/common/lunatik +++ /dev/null @@ -1,47 +0,0 @@ -lib/modules/6.10.11-ipfire/lunatik -lib/modules/6.10.11-ipfire/lunatik/luacompletion.ko -lib/modules/6.10.11-ipfire/lunatik/luadata.ko -lib/modules/6.10.11-ipfire/lunatik/luadevice.ko -lib/modules/6.10.11-ipfire/lunatik/luafib.ko -lib/modules/6.10.11-ipfire/lunatik/luafifo.ko -lib/modules/6.10.11-ipfire/lunatik/lualinux.ko -lib/modules/6.10.11-ipfire/lunatik/luanetfilter.ko -lib/modules/6.10.11-ipfire/lunatik/luanotifier.ko -lib/modules/6.10.11-ipfire/lunatik/luaprobe.ko -lib/modules/6.10.11-ipfire/lunatik/luarcu.ko -lib/modules/6.10.11-ipfire/lunatik/luasocket.ko -lib/modules/6.10.11-ipfire/lunatik/luasyscall.ko -lib/modules/6.10.11-ipfire/lunatik/luathread.ko -lib/modules/6.10.11-ipfire/lunatik/luaxdp.ko -lib/modules/6.10.11-ipfire/lunatik/luaxtable.ko -lib/modules/6.10.11-ipfire/lunatik/lunatik.ko -lib/modules/6.10.11-ipfire/lunatik/lunatik_run.ko -lib/modules/lua -lib/modules/lua/driver.lua -lib/modules/lua/examples -lib/modules/lua/examples/dnsblock -lib/modules/lua/examples/dnsblock/common.lua -lib/modules/lua/examples/dnsblock/dnsblock.lua -lib/modules/lua/examples/dnsblock/nf_dnsblock.lua -lib/modules/lua/examples/dnsdoctor -lib/modules/lua/examples/dnsdoctor/common.lua -lib/modules/lua/examples/dnsdoctor/dnsdoctor.lua -lib/modules/lua/examples/dnsdoctor/libxt_dnsdoctor.lua -lib/modules/lua/examples/dnsdoctor/nf_dnsdoctor.lua -lib/modules/lua/examples/echod -lib/modules/lua/examples/echod/daemon.lua -lib/modules/lua/examples/echod/worker.lua -lib/modules/lua/examples/filter -lib/modules/lua/examples/filter/sni.lua -lib/modules/lua/examples/keylocker.lua -lib/modules/lua/examples/shared.lua -lib/modules/lua/examples/spyglass.lua -lib/modules/lua/examples/systrack.lua -lib/modules/lua/examples/tap.lua -lib/modules/lua/mailbox.lua -lib/modules/lua/socket -lib/modules/lua/socket/inet.lua -lib/modules/lua/syscall -lib/modules/lua/syscall/table.lua -usr/sbin/lunatik -usr/lib/bpf/https.o diff --git a/lfs/linux b/lfs/linux index 757a96bec..244a7fa0d 100644 --- a/lfs/linux +++ b/lfs/linux @@ -232,11 +232,6 @@ endif cp /lib/modules/$(VER)-$(VERSUFIX)/build/.config \ /lib/modules/$(VER)-$(VERSUFIX)/build/include/config/auto.conf - # lunatik: copy resolve_btfids to /lib/modules/$(VER)-$(VERSUFIX)/build/tools/bpf/resolve_btfids/ - # cop.btf.vmlinux.bin.o to vmlinux for lunatik kernel modules build - cp -f $(DIR_APP)/tools/bpf/resolve_btfids/resolve_btfids /lib/modules/$(VER)-$(VERSUFIX)/build/tools/bpf/resolve_btfids/ - cp -f $(DIR_APP)/.tmp_vmlinux1.btf.o /lib/modules/$(VER)-$(VERSUFIX)/build/vmlinux - # Fix permissions find /lib/modules/$(VER)-$(VERSUFIX) -name "modules.order" \ -exec chmod 644 {} \; diff --git a/make.sh b/make.sh index 0210e0b39..15b647fb8 100755 --- a/make.sh +++ b/make.sh @@ -1727,8 +1727,6 @@ buildipfire() { # multi kernel builds so KCFG is empty lfsmake2 linux KCFG="" lfsmake2 linux-initrd KCFG="" - # lunatik kernel module requires linux kernel to be built first - lfsmake2 lunatik } buildinstaller() {