From c9b3d51c180c84eca0b2e41280cc7b231bf07584 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Fri, 25 Oct 2024 15:05:48 +0000
Subject: [PATCH] lvh: Add net branch of bpf-next

For testing we also need the net branch of bpf-next.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---
 .github/workflows/bpf-next.yaml | 2 ++
 .github/workflows/buildx.yaml   | 2 +-
 Makefile                        | 2 +-
 _data/kernels.json              | 9 ++++++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bpf-next.yaml b/.github/workflows/bpf-next.yaml
index 15a2dce9..bda0f930 100644
--- a/.github/workflows/bpf-next.yaml
+++ b/.github/workflows/bpf-next.yaml
@@ -19,6 +19,7 @@ jobs:
           git config user.name "GH action"
           git config user.email "ghabot@does.not.exist.cilium.org"
           echo "bpf-next $id" > misc/dummy
+          echo "bpf-net $id" >> misc/dummy
           echo "bpf $id" >> misc/dummy
           git add misc/dummy
           git commit -a -m "bpf/bpf-next: $id"
@@ -32,6 +33,7 @@ jobs:
           id=${{ steps.commit.outputs.id }}
           gh pr create \
             -l "gha-builds/kernel/bpf-next" \
+            -l "gha-builds/kernel/bpf-net" \
             -l "gha-builds/kernel/bpf" \
             --title "bpf/bpf-next update: $id" \
             --body "PR to update bpf/bpf-next" \
diff --git a/.github/workflows/buildx.yaml b/.github/workflows/buildx.yaml
index cd4eed48..db2dcc84 100644
--- a/.github/workflows/buildx.yaml
+++ b/.github/workflows/buildx.yaml
@@ -57,7 +57,7 @@ jobs:
         name: kernel versions
         with:
           script: |
-              var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-next', 'rhel8.6', 'rhel8.9' ]
+              var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-net', 'bpf-next', 'rhel8.6', 'rhel8.9' ]
               var kernels = []
               const kernel_label_prefix = 'gha-builds/kernel/'
               res = await github.rest.issues.listLabelsOnIssue({
diff --git a/Makefile b/Makefile
index 4cf36c44..b4ffb850 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ COMPLEXITY_TEST_IMAGES    ?= $(OCIORG)/complexity-test-ci
 KERNEL_BUILDER_TAG        ?= main
 ROOT_BUILDER_TAG          ?= main
 ROOT_IMAGES_TAG           ?= main
-KERNEL_VERSIONS           ?= 4.19 5.4 5.10 5.15 6.1 6.6 bpf bpf-next
+KERNEL_VERSIONS           ?= 4.19 5.4 5.10 5.15 6.1 6.6 bpf bpf-net bpf-next
 
 DOCKER ?= docker
 export DOCKER_BUILDKIT = 1
diff --git a/_data/kernels.json b/_data/kernels.json
index 68ca6875..e246aa6b 100644
--- a/_data/kernels.json
+++ b/_data/kernels.json
@@ -1,6 +1,6 @@
 {
     "kernels": [
-        {
+	{
             "name": "bpf-next",
             "url": "git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git?depth=1",
             "opts": [
@@ -14,6 +14,13 @@
                  [ "--enable",  "CONFIG_NETKIT"]
             ]
 	},
+	{
+            "name": "bpf-net",
+            "url": "git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git?depth=1#net",
+            "opts": [
+                 [ "--enable",  "CONFIG_NETKIT"]
+            ]
+	},
 	{
             "name": "6.6",
             "url": "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git?depth=1#linux-6.6.y"