chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[release-25.05] xen: 4.19.1 -> 4.19.2 (#406036)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-06-27 19:35:47 +00:00
committed by GitHub
parent 69681daeae 54dadb2a62
commit 0c6f155d56
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/virtualisation/xen-boot-builder.sh
View File

@@ -1,6 +1,8 @@
# This script is called by ./xen-dom0.nix to create the Xen boot entries.
# shellcheck shell=bash
export LC_ALL=C
# Handle input argument and exit if the flag is invalid. See virtualisation.xen.efi.bootBuilderVerbosity below.
[[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1
case "$1" in
@@ -89,7 +91,8 @@ EOF
# https://xenbits.xenproject.org/docs/unstable/misc/efi.html.
[ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m making Xen UKI..."
xenEfi=$(jq -re '."org.xenproject.bootspec.v1".xen' "$bootspecFile")
padding=$(objdump --header --section=".pad" "$xenEfi" | awk '/\.pad/ { printf("0x%016x\n", strtonum("0x"$3) + strtonum("0x"$4))};')
finalSection=$(objdump --header --wide "$xenEfi" | tail -n +6 | sort --key="4,4" | tail -n 1 | grep -Eo '\.[a-z]*')
padding=$(objdump --header --section="$finalSection" "$xenEfi" | awk -v section="$finalSection" '$0 ~ section { printf("0x%016x\n", and(strtonum("0x"$3) + strtonum("0x"$4) + 0xfff, compl(0xfff)))};')
[ "$1" = "debug" ] && echo " - padding: $padding"
objcopy \
--add-section .config="$tmpCfg" \

14
pkgs/by-name/xe/xen/package.nix
View File

@@ -6,16 +6,8 @@
buildXenPackage.override { inherit python3Packages; } {
pname = "xen";
version = "4.19.1";
version = "4.19.2";
patches = [
(fetchpatch {
url = "https://lore.kernel.org/xen-devel/e2caa6648a0b6c429349a9826d8fbc4338222482.1733766758.git.andrii.sultanov@cloud.com/raw";
hash = "sha256-JC1ueXuC1Jdi2gtUsjOHmTeEx56zjotMMLde5vBonxc=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa467.patch";
hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch";
hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw=";
@@ -45,6 +37,6 @@ buildXenPackage.override { inherit python3Packages; } {
hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
})
];
rev = "ccf400846780289ae779c62ef0c94757ff43bb60";
hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY=";
rev = "f3362182e028119e5ca2ab37e5628b9fa6d21254";
hash = "sha256-c6LXYJ61umJb/r5/utwBWLAfy+tIvpK7QLjI3zKfr6Y=";
}