From c8d53b8484c267ae0e037ac693c21b9f93d8eb57 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Mon, 11 Mar 2024 21:37:19 +0800
Subject: [PATCH] update linux kernel 6.7.6 (#3371)

* update kernel

* update elf dep

* add patch deps

* add zstd deps

* add zstd

* enable patch

* fix linux
---
 packages/e/elfutils/xmake.lua              |  2 +-
 packages/l/linux-headers/xmake.lua         | 11 ++++++-----
 packages/l/linux-tools/modules/bpftool.lua |  6 ++++--
 packages/l/linux-tools/xmake.lua           |  4 ++++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/e/elfutils/xmake.lua b/packages/e/elfutils/xmake.lua
index d12efd3d6..faba20b01 100644
--- a/packages/e/elfutils/xmake.lua
+++ b/packages/e/elfutils/xmake.lua
@@ -15,7 +15,7 @@ package("elfutils")
     add_configs("libdw",    {description = "Enable libdw", default = true, type = "boolean"})
     add_configs("libasm",   {description = "Enable libasm", default = false, type = "boolean"})
 
-    add_deps("m4", "zlib")
+    add_deps("m4", "zstd", "zlib")
     if is_plat("android") then
         add_deps("libintl", "argp-standalone")
     end
diff --git a/packages/l/linux-headers/xmake.lua b/packages/l/linux-headers/xmake.lua
index c11cbb289..b6ccd65fe 100644
--- a/packages/l/linux-headers/xmake.lua
+++ b/packages/l/linux-headers/xmake.lua
@@ -10,12 +10,13 @@ package("linux-headers")
              {version = function (version)
                  return "v" .. version:major() .. ".x/linux-" .. version
              end})
-    add_versions("4.20.9", "b5de28fd594a01edacd06e53491ad0890293e5fbf98329346426cf6030ef1ea6")
-    add_versions("5.0.8",  "11908044e8cce1e093141f8da594708d45d05d0381676ae9aa3d8aeaf7c85435")
-    add_versions("5.9.16", "b0d7abae88e5f91893627c645e680a95c818defd1b4fcaf3e2afb4b2b6b4ab86")
+    add_versions("4.20.9",  "b5de28fd594a01edacd06e53491ad0890293e5fbf98329346426cf6030ef1ea6")
+    add_versions("5.0.8",   "11908044e8cce1e093141f8da594708d45d05d0381676ae9aa3d8aeaf7c85435")
+    add_versions("5.9.16",  "b0d7abae88e5f91893627c645e680a95c818defd1b4fcaf3e2afb4b2b6b4ab86")
     add_versions("5.10.46", "569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415")
-    add_versions("5.16.9", "1660e7228ec299c187c19739d115ded97f6b1be05a24986c4c443e7c5e8b744f")
-    add_versions("5.15", "57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8")
+    add_versions("5.16.9",  "1660e7228ec299c187c19739d115ded97f6b1be05a24986c4c443e7c5e8b744f")
+    add_versions("5.15",    "57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8")
+    add_versions("6.7.6",   "e489ec0e1370d089b446d565aded7a698093d2b7c4122a18f21edb6ef93d37d3")
 
     add_configs("driver_modules", {description = "Enable driver modules files.", default = false, type = "boolean"})
 
diff --git a/packages/l/linux-tools/modules/bpftool.lua b/packages/l/linux-tools/modules/bpftool.lua
index 32b85d316..8558d77b0 100644
--- a/packages/l/linux-tools/modules/bpftool.lua
+++ b/packages/l/linux-tools/modules/bpftool.lua
@@ -1,5 +1,5 @@
 function load(package)
-    package:add("deps", "libcap", "libelf", "zlib", {host = true})
+    package:add("deps", "libcap", "elfutils", "zlib", {host = true})
     package:add("deps", "python 3.x", {kind = "binary"})
     package:addenv("PATH", "sbin")
 end
@@ -8,7 +8,7 @@ function install(package)
 
     local cflags = {}
     local ldflags = {}
-    for _, dep in ipairs(package:orderdeps()) do
+    for _, dep in ipairs(package:librarydeps()) do
         local fetchinfo = dep:fetch()
         if fetchinfo then
             for _, includedir in ipairs(fetchinfo.includedirs or fetchinfo.sysincludedirs) do
@@ -30,6 +30,8 @@ function install(package)
     os.cd("tools/bpf/bpftool")
     io.replace("Makefile", "prefix ?= /usr/local", "prefix ?= " .. package:installdir(), {plain = true})
     io.replace("Makefile", "bash_compdir ?= /usr/share", "bash_compdir ?= " .. package:installdir("share"), {plain = true})
+    io.replace("Makefile", "-lelf -lz", "-lelf -lzstd -lz", {plain = true})
+    io.replace("Makefile", "$(Q)$(LLVM_STRIP) -g $@", "echo skip", {plain = true})
     import("package.tools.make").build(package, configs)
     os.vrunv("make", table.join("install", configs))
 end
diff --git a/packages/l/linux-tools/xmake.lua b/packages/l/linux-tools/xmake.lua
index 6b901ceed..330eb941f 100644
--- a/packages/l/linux-tools/xmake.lua
+++ b/packages/l/linux-tools/xmake.lua
@@ -14,9 +14,13 @@ package("linux-tools")
     add_versions("5.0.8",  "11908044e8cce1e093141f8da594708d45d05d0381676ae9aa3d8aeaf7c85435")
     add_versions("5.9.16", "b0d7abae88e5f91893627c645e680a95c818defd1b4fcaf3e2afb4b2b6b4ab86")
     add_versions("5.16.9", "1660e7228ec299c187c19739d115ded97f6b1be05a24986c4c443e7c5e8b744f")
+    add_versions("6.7.6",  "e489ec0e1370d089b446d565aded7a698093d2b7c4122a18f21edb6ef93d37d3")
 
     add_configs("bpftool",     { description = "Enable bpftool.", default = true, type = "boolean"})
 
+    add_patches("6.7.6", "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.7.6.xz",
+        "a394326aa325f8a930a4ce33c69ba7b8b454aef1107a4d3c2a8ae12908615fc4", {reverse = true})
+
     local modules = {"bpftool"}
 
     on_load(function (package)