gokrazy,tstest/integration: use upstream kernel images

Updates tailscale/corp#35814

Signed-off-by: Claus Lensbøl <claus@tailscale.com>

.github/workflows/natlab-integrationtest.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Install qemu
         run: |
-          sudo rm /var/lib/man-db/auto-update
+          sudo rm -f /var/lib/man-db/auto-update
           sudo apt-get -y update
           sudo apt-get -y remove man-db
           sudo apt-get install -y qemu-system-x86 qemu-utils

cmd/vnet/run-krazy.sh

@@ -12,7 +12,7 @@ set -eux
 qemu-system-x86_64 -M microvm,isa-serial=off \
     -m 1G \
     -nodefaults -no-user-config -nographic \
-    -kernel $HOME/src/github.com/tailscale/gokrazy-kernel/vmlinuz \
+    -kernel $HOME/src/github.com/gokrazy/kernel.amd64/vmlinuz \
     -append "console=hvc0 root=PARTUUID=60c24cc1-f3f9-427a-8199-76baa2d60001/PARTNROFF=1 ro init=/gokrazy/init panic=10 oops=panic pci=off nousb tsc=unstable clocksource=hpet tailscale-tta=1 tailscaled.env=TS_DEBUG_RAW_DISCO=1 ${EXTRA_ARG}" \
     -drive id=blk0,file=$HOME/src/tailscale.com/gokrazy/natlabapp.img,format=raw \
     -device virtio-blk-device,drive=blk0 \

gokrazy/natlabapp/config.json

@@ -24,7 +24,7 @@
         "GOOS=linux",
         "GOARCH=amd64"
     ],
-    "KernelPackage": "github.com/tailscale/gokrazy-kernel",
+    "KernelPackage": "github.com/gokrazy/kernel.amd64",
     "FirmwarePackage": "",
     "EEPROMPackage": "",
     "InternalCompatibilityFlags": {}

gokrazy/tsapp/config.json

@@ -31,7 +31,7 @@
         "GOOS=linux",
         "GOARCH=amd64"
     ],
-    "KernelPackage": "github.com/tailscale/gokrazy-kernel",
-    "FirmwarePackage": "github.com/tailscale/gokrazy-kernel",
+    "KernelPackage": "github.com/gokrazy/kernel.amd64",
+    "FirmwarePackage": "github.com/gokrazy/kernel.amd64",
     "InternalCompatibilityFlags": {}
 }

tstest/integration/nat/nat_test.go

@@ -81,7 +81,7 @@ func newNatTest(tb testing.TB) *natTest {
 		}
 	}
 
-	nt.kernel, err = findKernelPath(filepath.Join(modRoot, "gokrazy/natlabapp/builddir/github.com/tailscale/gokrazy-kernel/go.mod"))
+	nt.kernel, err = findKernelPath(filepath.Join(modRoot, "gokrazy/natlabapp/builddir/github.com/gokrazy/kernel.amd64/go.mod"))
 	if err != nil {
 		tb.Skipf("skipping test; kernel not found: %v", err)
 	}
@@ -104,7 +104,7 @@ func findKernelPath(goMod string) (string, error) {
 		return "", err
 	}
 	for _, r := range mf.Require {
-		if r.Mod.Path == "github.com/tailscale/gokrazy-kernel" {
+		if r.Mod.Path == "github.com/gokrazy/kernel.amd64" {
 			return strings.TrimSpace(string(goModB)) + "/" + r.Mod.String() + "/vmlinuz", nil
 		}
 	}