aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--cmd/mbf/internal/pkgsite/api.go (renamed from cmd/mbf/internal/pkgserver/api.go)4
-rw-r--r--cmd/mbf/internal/pkgsite/api_test.go (renamed from cmd/mbf/internal/pkgserver/api_test.go)2
-rw-r--r--cmd/mbf/internal/pkgsite/index.go (renamed from cmd/mbf/internal/pkgserver/index.go)2
-rw-r--r--cmd/mbf/internal/pkgsite/index_test.go (renamed from cmd/mbf/internal/pkgserver/index_test.go)2
-rw-r--r--cmd/mbf/internal/pkgsite/search.go (renamed from cmd/mbf/internal/pkgserver/search.go)2
-rw-r--r--cmd/mbf/internal/pkgsite/ui/index.html (renamed from cmd/mbf/internal/pkgserver/ui/index.html)0
-rw-r--r--cmd/mbf/internal/pkgsite/ui/index.ts (renamed from cmd/mbf/internal/pkgserver/ui/index.ts)0
-rw-r--r--cmd/mbf/internal/pkgsite/ui/style.css (renamed from cmd/mbf/internal/pkgserver/ui/style.css)0
-rw-r--r--cmd/mbf/internal/pkgsite/ui/tsconfig.json (renamed from cmd/mbf/internal/pkgserver/ui/tsconfig.json)0
-rw-r--r--cmd/mbf/internal/pkgsite/ui/ui.go (renamed from cmd/mbf/internal/pkgserver/ui/ui.go)0
-rw-r--r--cmd/mbf/internal/pkgsite/ui/ui_full.go (renamed from cmd/mbf/internal/pkgserver/ui/ui_full.go)0
-rw-r--r--cmd/mbf/internal/pkgsite/ui/ui_stub.go (renamed from cmd/mbf/internal/pkgserver/ui/ui_stub.go)0
-rw-r--r--cmd/mbf/main.go6
-rw-r--r--fhs/abs.go2
-rw-r--r--fhs/fhs.go2
-rw-r--r--internal/rosa/package/git.az1
-rw-r--r--internal/rosa/package/gnu.az4
-rw-r--r--internal/rosa/package/kernel/amd64.config6
-rw-r--r--internal/rosa/package/kernel/arm64.config4
-rw-r--r--internal/rosa/package/kernel/package.az8
-rw-r--r--internal/rosa/package/kernel/version.h4
-rw-r--r--internal/rosa/package/libglvnd.az1
-rw-r--r--internal/rosa/package/python/package.az10
-rw-r--r--pkg/exec.go7
-rw-r--r--pkg/internal/testtool/main.go4
26 files changed, 46 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore
index cd4c42ea..022468e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
# go generate
/cmd/hakurei/LICENSE
-/cmd/mbf/internal/pkgserver/ui/static
+/cmd/mbf/internal/pkgsite/ui/static
/pkg/internal/testtool/testtool
/internal/rosa/hakurei_current.tar.gz
diff --git a/cmd/mbf/internal/pkgserver/api.go b/cmd/mbf/internal/pkgsite/api.go
index 68ccd471..a3094359 100644
--- a/cmd/mbf/internal/pkgserver/api.go
+++ b/cmd/mbf/internal/pkgsite/api.go
@@ -1,5 +1,5 @@
-// Package pkgserver implements the package metadata service backend.
-package pkgserver
+// Package pkgsite implements the package metadata website.
+package pkgsite
import (
"context"
diff --git a/cmd/mbf/internal/pkgserver/api_test.go b/cmd/mbf/internal/pkgsite/api_test.go
index 1552fec9..d2c21d81 100644
--- a/cmd/mbf/internal/pkgserver/api_test.go
+++ b/cmd/mbf/internal/pkgsite/api_test.go
@@ -1,4 +1,4 @@
-package pkgserver
+package pkgsite
import (
"net/http"
diff --git a/cmd/mbf/internal/pkgserver/index.go b/cmd/mbf/internal/pkgsite/index.go
index 2a9b6de5..760806c0 100644
--- a/cmd/mbf/internal/pkgserver/index.go
+++ b/cmd/mbf/internal/pkgsite/index.go
@@ -1,4 +1,4 @@
-package pkgserver
+package pkgsite
import (
"cmp"
diff --git a/cmd/mbf/internal/pkgserver/index_test.go b/cmd/mbf/internal/pkgsite/index_test.go
index 8f3b5530..abf78876 100644
--- a/cmd/mbf/internal/pkgserver/index_test.go
+++ b/cmd/mbf/internal/pkgsite/index_test.go
@@ -1,4 +1,4 @@
-package pkgserver
+package pkgsite
import (
"bytes"
diff --git a/cmd/mbf/internal/pkgserver/search.go b/cmd/mbf/internal/pkgsite/search.go
index 15947804..ef7cd76f 100644
--- a/cmd/mbf/internal/pkgserver/search.go
+++ b/cmd/mbf/internal/pkgsite/search.go
@@ -1,4 +1,4 @@
-package pkgserver
+package pkgsite
import (
"cmp"
diff --git a/cmd/mbf/internal/pkgserver/ui/index.html b/cmd/mbf/internal/pkgsite/ui/index.html
index 6a5d72b4..6a5d72b4 100644
--- a/cmd/mbf/internal/pkgserver/ui/index.html
+++ b/cmd/mbf/internal/pkgsite/ui/index.html
diff --git a/cmd/mbf/internal/pkgserver/ui/index.ts b/cmd/mbf/internal/pkgsite/ui/index.ts
index 0784b81f..0784b81f 100644
--- a/cmd/mbf/internal/pkgserver/ui/index.ts
+++ b/cmd/mbf/internal/pkgsite/ui/index.ts
diff --git a/cmd/mbf/internal/pkgserver/ui/style.css b/cmd/mbf/internal/pkgsite/ui/style.css
index b4f281ac..b4f281ac 100644
--- a/cmd/mbf/internal/pkgserver/ui/style.css
+++ b/cmd/mbf/internal/pkgsite/ui/style.css
diff --git a/cmd/mbf/internal/pkgserver/ui/tsconfig.json b/cmd/mbf/internal/pkgsite/ui/tsconfig.json
index 24df4936..24df4936 100644
--- a/cmd/mbf/internal/pkgserver/ui/tsconfig.json
+++ b/cmd/mbf/internal/pkgsite/ui/tsconfig.json
diff --git a/cmd/mbf/internal/pkgserver/ui/ui.go b/cmd/mbf/internal/pkgsite/ui/ui.go
index 3fc0d89c..3fc0d89c 100644
--- a/cmd/mbf/internal/pkgserver/ui/ui.go
+++ b/cmd/mbf/internal/pkgsite/ui/ui.go
diff --git a/cmd/mbf/internal/pkgserver/ui/ui_full.go b/cmd/mbf/internal/pkgsite/ui/ui_full.go
index 564787dc..564787dc 100644
--- a/cmd/mbf/internal/pkgserver/ui/ui_full.go
+++ b/cmd/mbf/internal/pkgsite/ui/ui_full.go
diff --git a/cmd/mbf/internal/pkgserver/ui/ui_stub.go b/cmd/mbf/internal/pkgsite/ui/ui_stub.go
index daf010f8..daf010f8 100644
--- a/cmd/mbf/internal/pkgserver/ui/ui_stub.go
+++ b/cmd/mbf/internal/pkgsite/ui/ui_stub.go
diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go
index 4f471d6a..22bfbc3e 100644
--- a/cmd/mbf/main.go
+++ b/cmd/mbf/main.go
@@ -43,8 +43,8 @@ import (
"hakurei.app/message"
"hakurei.app/pkg"
- "hakurei.app/cmd/mbf/internal/pkgserver"
- "hakurei.app/cmd/mbf/internal/pkgserver/ui"
+ "hakurei.app/cmd/mbf/internal/pkgsite"
+ "hakurei.app/cmd/mbf/internal/pkgsite/ui"
)
// builtin contains native and embedded [rosa.Artifact] registrations.
@@ -343,7 +343,7 @@ func main() {
var mux http.ServeMux
ui.Register(&mux)
- if err = pkgserver.Register(ctx, &mux, r); err != nil {
+ if err = pkgsite.Register(ctx, &mux, r); err != nil {
return
}
diff --git a/fhs/abs.go b/fhs/abs.go
index 7adde1db..5d061567 100644
--- a/fhs/abs.go
+++ b/fhs/abs.go
@@ -40,6 +40,8 @@ var (
AbsDev = unsafeAbs(Dev)
// AbsDevShm is [DevShm] as [check.Absolute].
AbsDevShm = unsafeAbs(DevShm)
+ // AbsDevKvm is [DevKvm] as [check.Absolute].
+ AbsDevKvm = unsafeAbs(DevKvm)
// AbsProc is [Proc] as [check.Absolute].
AbsProc = unsafeAbs(Proc)
// AbsProcSys is [ProcSys] as [check.Absolute].
diff --git a/fhs/fhs.go b/fhs/fhs.go
index 6d098d0c..b526dc6f 100644
--- a/fhs/fhs.go
+++ b/fhs/fhs.go
@@ -35,6 +35,8 @@ const (
// DevShm is the place for POSIX shared memory segments, as created via
// shm_open(3).
DevShm = "/dev/shm/"
+ // DevKvm is the KVM system device.
+ DevKvm = "/dev/kvm"
// Proc points to a virtual kernel file system exposing the process list and
// other functionality.
Proc = "/proc/"
diff --git a/internal/rosa/package/git.az b/internal/rosa/package/git.az
index 07abe88e..7ebb8113 100644
--- a/internal/rosa/package/git.az
+++ b/internal/rosa/package/git.az
@@ -63,6 +63,7 @@ disable_test t5515-fetch-merge-logic
disable_test t4124-apply-ws-rule
disable_test t3404-rebase-interactive
disable_test t7527-builtin-fsmonitor
+disable_test t5702-protocol-v2
`;
check = [
diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az
index 95e3254e..c57bbeb6 100644
--- a/internal/rosa/package/gnu.az
+++ b/internal/rosa/package/gnu.az
@@ -339,10 +339,10 @@ package coreutils {
website = "https://www.gnu.org/software/coreutils";
anitya = 343;
- version# = "9.11";
+ version# = "9.12";
source = remoteTar {
url = "https://mirrors.kernel.org/gnu/coreutils/coreutils-"+version+".tar.gz";
- checksum = "t8UMed5wpFEoC56aa42_yidfOAaRGzOfj7MRtQkkqgGbpXiskNA8bd-EmVSQkZie";
+ checksum = "MYYday_Pwp2YFSgVHeCQWJBhJCBhqkIkfML4_a_uHvM_FsKbYQ4vbXy60FprcUoo";
compress = gzip;
};
diff --git a/internal/rosa/package/kernel/amd64.config b/internal/rosa/package/kernel/amd64.config
index e96ce422..81601250 100644
--- a/internal/rosa/package/kernel/amd64.config
+++ b/internal/rosa/package/kernel/amd64.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.18.51 Kernel Configuration
+# Linux/x86 6.18.52 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="clang version 23.1.1"
CONFIG_GCC_VERSION=0
@@ -658,7 +658,7 @@ CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_PLATFORM_PROFILE=m
+CONFIG_ACPI_PLATFORM_PROFILE=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TABLE_UPGRADE=y
@@ -730,6 +730,7 @@ CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_AMD_PSTATE=y
CONFIG_X86_AMD_PSTATE_DEFAULT_MODE=3
+CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP=y
CONFIG_X86_AMD_PSTATE_UT=m
CONFIG_X86_ACPI_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ_CPB=y
@@ -1044,6 +1045,7 @@ CONFIG_FUNCTION_ALIGNMENT_16B=y
CONFIG_FUNCTION_ALIGNMENT=16
CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
CONFIG_ARCH_HAS_CPU_ATTACK_VECTORS=y
+CONFIG_HAVE_ARCH_GET_SECUREBOOT=y
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
diff --git a/internal/rosa/package/kernel/arm64.config b/internal/rosa/package/kernel/arm64.config
index 3be357a0..78fc713b 100644
--- a/internal/rosa/package/kernel/arm64.config
+++ b/internal/rosa/package/kernel/arm64.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.18.51 Kernel Configuration
+# Linux/arm64 6.18.52 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="clang version 23.1.1"
CONFIG_GCC_VERSION=0
@@ -575,7 +575,6 @@ CONFIG_ARM64_TLB_RANGE=y
#
CONFIG_AS_HAS_ARMV8_5=y
CONFIG_ARM64_BTI=y
-CONFIG_ARM64_BTI_KERNEL=y
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_AS_HAS_MTE=y
@@ -975,6 +974,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
CONFIG_FUNCTION_ALIGNMENT_4B=y
CONFIG_FUNCTION_ALIGNMENT=4
CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
+CONFIG_HAVE_ARCH_GET_SECUREBOOT=y
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
diff --git a/internal/rosa/package/kernel/package.az b/internal/rosa/package/kernel/package.az
index 56e64bc0..5a0ffae6 100644
--- a/internal/rosa/package/kernel/package.az
+++ b/internal/rosa/package/kernel/package.az
@@ -3,11 +3,11 @@ package kernel-source {
website = "https://kernel.org";
exclude = true;
- version# = "6.18.51";
+ version# = "6.18.52";
output = remoteTar {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/"+
"snapshot/linux-"+version+".tar.gz";
- checksum = "-rC9wcJGdz5t7r7u52IoAkX1Obo1C0BoQQLUayX3udU1JCcZ_MbYYvNpT2BysFfg";
+ checksum = "3OysuyxqFKX0FvKqkwH-Y9t0gB0PpE-ErMb2lITWAJtN0OSDqlHTbeifhgn6VgkV";
compress = gzip;
};
}
@@ -46,8 +46,8 @@ cat \
checksum = arch {
default = "";
- amd64 = "uXu0uJ-5xGef455I7XnmACYygQWS_V_4yPnmDlarO4jT3dJ7A83UroExBzIFEb84";
- arm64 = "l3JQx0n8Nyo1bShVYkv8S1udaJZeJCfHUUuI5Vi74669dPHkmNQA6K9U3q_O4Ust";
+ amd64 = "yLzBQuYIpzbjEglADpiAjDsI5OhsOZejLUG-3w1DlVfmU4LaH44W5KercoxrEuGQ";
+ arm64 = "aah3h8pHdYNrevRBBIkt8DFi6wzRWZe9uxWcrTwEf1l3X-UWxRfnGxCwJdn0VySM";
riscv64 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
};
diff --git a/internal/rosa/package/kernel/version.h b/internal/rosa/package/kernel/version.h
index 767c5637..e8d4316f 100644
--- a/internal/rosa/package/kernel/version.h
+++ b/internal/rosa/package/kernel/version.h
@@ -1,5 +1,5 @@
-#define LINUX_VERSION_CODE 397875
+#define LINUX_VERSION_CODE 397876
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))
#define LINUX_VERSION_MAJOR 6
#define LINUX_VERSION_PATCHLEVEL 18
-#define LINUX_VERSION_SUBLEVEL 51
+#define LINUX_VERSION_SUBLEVEL 52
diff --git a/internal/rosa/package/libglvnd.az b/internal/rosa/package/libglvnd.az
index dbcf198b..9be9e2a9 100644
--- a/internal/rosa/package/libglvnd.az
+++ b/internal/rosa/package/libglvnd.az
@@ -22,6 +22,7 @@ export DISPLAY=':0'
Xvfb &
XVFB_PID="$!"
trap 'kill $XVFB_PID && wait $XVFB_PID' EXIT
+while [ ! -e /tmp/.X11-unix/X0 ]; do sleep 0.1; done
`;
};
diff --git a/internal/rosa/package/python/package.az b/internal/rosa/package/python/package.az
index aef3ecda..8711c82f 100644
--- a/internal/rosa/package/python/package.az
+++ b/internal/rosa/package/python/package.az
@@ -182,12 +182,13 @@ package python-vcs-versioning {
description = "core VCS versioning functionality extracted as a standalone library";
website = "https://setuptools-scm.readthedocs.io/en/latest";
anitya = 389421;
+ block = "frequent ineffectual updates; questionable maintainer decisions";
- version# = "2.3.4";
+ version# = "2.4.0";
source = remoteGitHub {
suffix = "pypa/setuptools-scm";
tag = "vcs-versioning-v"+version;
- checksum = "TljjSQUxo07jMzfaVyieXD8dS_olgwEA2_RndGeIjlsdKWSa2oYZ5laMRjdgnXJS";
+ checksum = "Ziau4BBAwjQVEVe-MlKpA-27nqOm30LlGfHG5SqIrqKbCABWBndCwzpXLxdnZuGn";
};
env = [
@@ -211,12 +212,13 @@ package python-setuptools-scm {
description = "extracts Python package versions from Git or Mercurial metadata";
website = "https://setuptools-scm.readthedocs.io/en/latest";
anitya = 7874;
+ block = "see package python-vcs-versioning";
- version# = "10.2.3";
+ version# = "10.3.2";
source = remoteGitHub {
suffix = "pypa/setuptools-scm";
tag = "setuptools-scm-v"+version;
- checksum = "C76_jiIc_XanEZrpxLb47B3YArtmlt7HcpEOo0wZ5Z4mCFJb2HLIgOSOiRSfttpW";
+ checksum = "wnOU9_VeAiNp881loQiJD3KuWgbufNXhQKqHOGBdt9oEjIMXosHjUseE67fW4ips";
};
env = [
diff --git a/pkg/exec.go b/pkg/exec.go
index b40ae84b..fe099ac9 100644
--- a/pkg/exec.go
+++ b/pkg/exec.go
@@ -601,7 +601,12 @@ func (a *execArtifact) makeContainer(
fhs.AbsTmp,
std.BindWritable|std.BindEnsure,
)
- z.Proc(fhs.AbsProc).Dev(fhs.AbsDev, true)
+ z.
+ Proc(fhs.AbsProc).
+ DevWritable(fhs.AbsDev, true).
+ Tmpfs(fhs.AbsDevShm, 0, 01777).
+ Bind(fhs.AbsDevKvm, fhs.AbsDevKvm, std.BindOptional|std.BindDevice).
+ Remount(fhs.AbsDev, syscall.MS_RDONLY)
return
}
diff --git a/pkg/internal/testtool/main.go b/pkg/internal/testtool/main.go
index edffab7e..80f87435 100644
--- a/pkg/internal/testtool/main.go
+++ b/pkg/internal/testtool/main.go
@@ -259,6 +259,10 @@ func main() {
next()
}
+ if m.Next != nil && m.Next.Root == "/kvm" {
+ next()
+ }
+
if m.Next != nil {
log.Println("unexpected extra mount entries")
for m.Next != nil {
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-15 12:27:26 +0000