From 3dee707e8b330529e0d4f6dc41505ace310728e5 Mon Sep 17 00:00:00 2001 From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 13 Jul 2024 01:45:29 +0530 Subject: [PATCH] linux_cachyos: 6.9.8 -> 6.9.9, fix update script bug (#799) --- .../config-nix/cachyos-hardened.x86_64-linux.nix | 11 ++++++----- .../config-nix/cachyos-lto.x86_64-linux.nix | 14 +++++++------- .../config-nix/cachyos-rc.x86_64-linux.nix | 4 ---- .../config-nix/cachyos-server.x86_64-linux.nix | 10 +++++----- .../config-nix/cachyos.x86_64-linux.nix | 10 +++++----- pkgs/linux-cachyos/update.nix | 16 ++++++++-------- pkgs/linux-cachyos/versions.json | 12 ++++++------ 7 files changed, 37 insertions(+), 40 deletions(-) diff --git a/pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix index cce536aba..f146d53f0 100644 --- a/pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix +++ b/pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix @@ -4,9 +4,9 @@ "CONFIG_GCC_VERSION" = "130300"; "CONFIG_CLANG_VERSION" = "0"; "CONFIG_AS_IS_GNU" = "y"; - "CONFIG_AS_VERSION" = "24100"; + "CONFIG_AS_VERSION" = "24200"; "CONFIG_LD_IS_BFD" = "y"; - "CONFIG_LD_VERSION" = "24100"; + "CONFIG_LD_VERSION" = "24200"; "CONFIG_LLD_VERSION" = "0"; "CONFIG_CC_CAN_LINK" = "y"; "CONFIG_CC_HAS_ASM_GOTO_OUTPUT" = "y"; @@ -374,6 +374,7 @@ "CONFIG_HZ_500" = "y"; "CONFIG_HZ_1000" = "y"; "CONFIG_HZ" = "500"; + "CONFIG_MIN_BASE_SLICE_NS" = "2000000"; "CONFIG_SCHED_HRTICK" = "y"; "CONFIG_ARCH_SUPPORTS_KEXEC" = "y"; "CONFIG_ARCH_SUPPORTS_KEXEC_FILE" = "y"; @@ -6952,10 +6953,10 @@ "CONFIG_TDX_GUEST_DRIVER" = "m"; "CONFIG_VIRTIO_ANCHOR" = "y"; "CONFIG_VIRTIO" = "y"; - "CONFIG_VIRTIO_PCI_LIB" = "m"; - "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "m"; + "CONFIG_VIRTIO_PCI_LIB" = "y"; + "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "y"; "CONFIG_VIRTIO_MENU" = "y"; - "CONFIG_VIRTIO_PCI" = "m"; + "CONFIG_VIRTIO_PCI" = "y"; "CONFIG_VIRTIO_PCI_ADMIN_LEGACY" = "y"; "CONFIG_VIRTIO_PCI_LEGACY" = "y"; "CONFIG_VIRTIO_VDPA" = "m"; diff --git a/pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix index 67d0af7be..39cffc7a1 100644 --- a/pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix +++ b/pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix @@ -1,13 +1,13 @@ { - "CONFIG_CC_VERSION_TEXT" = "clang version 18.1.7"; + "CONFIG_CC_VERSION_TEXT" = "clang version 18.1.8"; "CONFIG_GCC_VERSION" = "0"; "CONFIG_CC_IS_CLANG" = "y"; - "CONFIG_CLANG_VERSION" = "180107"; + "CONFIG_CLANG_VERSION" = "180108"; "CONFIG_AS_IS_LLVM" = "y"; - "CONFIG_AS_VERSION" = "180107"; + "CONFIG_AS_VERSION" = "180108"; "CONFIG_LD_VERSION" = "0"; "CONFIG_LD_IS_LLD" = "y"; - "CONFIG_LLD_VERSION" = "180107"; + "CONFIG_LLD_VERSION" = "180108"; "CONFIG_CC_CAN_LINK" = "y"; "CONFIG_CC_HAS_ASM_GOTO_OUTPUT" = "y"; "CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT" = "y"; @@ -7163,10 +7163,10 @@ "CONFIG_TDX_GUEST_DRIVER" = "m"; "CONFIG_VIRTIO_ANCHOR" = "y"; "CONFIG_VIRTIO" = "y"; - "CONFIG_VIRTIO_PCI_LIB" = "m"; - "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "m"; + "CONFIG_VIRTIO_PCI_LIB" = "y"; + "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "y"; "CONFIG_VIRTIO_MENU" = "y"; - "CONFIG_VIRTIO_PCI" = "m"; + "CONFIG_VIRTIO_PCI" = "y"; "CONFIG_VIRTIO_PCI_ADMIN_LEGACY" = "y"; "CONFIG_VIRTIO_PCI_LEGACY" = "y"; "CONFIG_VIRTIO_VDPA" = "m"; diff --git a/pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix index 945ce01d8..4583e42ab 100644 --- a/pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix +++ b/pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix @@ -4436,7 +4436,6 @@ "CONFIG_SENSORS_SCH56XX_COMMON" = "m"; "CONFIG_SENSORS_SCH5627" = "m"; "CONFIG_SENSORS_SCH5636" = "m"; - "CONFIG_SENSORS_STEAMDECK" = "m"; "CONFIG_SENSORS_STTS751" = "m"; "CONFIG_SENSORS_SURFACE_FAN" = "m"; "CONFIG_SENSORS_ADC128D818" = "m"; @@ -4734,7 +4733,6 @@ "CONFIG_MFD_INTEL_M10_BMC_CORE" = "m"; "CONFIG_MFD_INTEL_M10_BMC_SPI" = "m"; "CONFIG_MFD_INTEL_M10_BMC_PMCI" = "m"; - "CONFIG_MFD_STEAMDECK" = "m"; "CONFIG_REGULATOR" = "y"; "CONFIG_REGULATOR_FIXED_VOLTAGE" = "m"; "CONFIG_REGULATOR_VIRTUAL_CONSUMER" = "m"; @@ -6912,7 +6910,6 @@ "CONFIG_LEDS_TI_LMU_COMMON" = "m"; "CONFIG_LEDS_LM36274" = "m"; "CONFIG_LEDS_TPS6105X" = "m"; - "CONFIG_LEDS_STEAMDECK" = "m"; "CONFIG_LEDS_AS3645A" = "m"; "CONFIG_LEDS_LM3601X" = "m"; "CONFIG_LEDS_MT6370_FLASH" = "m"; @@ -7584,7 +7581,6 @@ "CONFIG_EXTCON_USB_GPIO" = "m"; "CONFIG_EXTCON_USBC_CROS_EC" = "m"; "CONFIG_EXTCON_USBC_TUSB320" = "m"; - "CONFIG_EXTCON_STEAMDECK" = "m"; "CONFIG_MEMORY" = "y"; "CONFIG_FPGA_DFL_EMIF" = "m"; "CONFIG_IIO" = "m"; diff --git a/pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix index b01afc8c1..7dbf9d453 100644 --- a/pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix +++ b/pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix @@ -4,9 +4,9 @@ "CONFIG_GCC_VERSION" = "130300"; "CONFIG_CLANG_VERSION" = "0"; "CONFIG_AS_IS_GNU" = "y"; - "CONFIG_AS_VERSION" = "24100"; + "CONFIG_AS_VERSION" = "24200"; "CONFIG_LD_IS_BFD" = "y"; - "CONFIG_LD_VERSION" = "24100"; + "CONFIG_LD_VERSION" = "24200"; "CONFIG_LLD_VERSION" = "0"; "CONFIG_CC_CAN_LINK" = "y"; "CONFIG_CC_HAS_ASM_GOTO_OUTPUT" = "y"; @@ -7165,10 +7165,10 @@ "CONFIG_TDX_GUEST_DRIVER" = "m"; "CONFIG_VIRTIO_ANCHOR" = "y"; "CONFIG_VIRTIO" = "y"; - "CONFIG_VIRTIO_PCI_LIB" = "m"; - "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "m"; + "CONFIG_VIRTIO_PCI_LIB" = "y"; + "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "y"; "CONFIG_VIRTIO_MENU" = "y"; - "CONFIG_VIRTIO_PCI" = "m"; + "CONFIG_VIRTIO_PCI" = "y"; "CONFIG_VIRTIO_PCI_ADMIN_LEGACY" = "y"; "CONFIG_VIRTIO_PCI_LEGACY" = "y"; "CONFIG_VIRTIO_VDPA" = "m"; diff --git a/pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix index 18c6ab338..704b058c8 100644 --- a/pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix +++ b/pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix @@ -4,9 +4,9 @@ "CONFIG_GCC_VERSION" = "130300"; "CONFIG_CLANG_VERSION" = "0"; "CONFIG_AS_IS_GNU" = "y"; - "CONFIG_AS_VERSION" = "24100"; + "CONFIG_AS_VERSION" = "24200"; "CONFIG_LD_IS_BFD" = "y"; - "CONFIG_LD_VERSION" = "24100"; + "CONFIG_LD_VERSION" = "24200"; "CONFIG_LLD_VERSION" = "0"; "CONFIG_CC_CAN_LINK" = "y"; "CONFIG_CC_HAS_ASM_GOTO_OUTPUT" = "y"; @@ -7168,10 +7168,10 @@ "CONFIG_TDX_GUEST_DRIVER" = "m"; "CONFIG_VIRTIO_ANCHOR" = "y"; "CONFIG_VIRTIO" = "y"; - "CONFIG_VIRTIO_PCI_LIB" = "m"; - "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "m"; + "CONFIG_VIRTIO_PCI_LIB" = "y"; + "CONFIG_VIRTIO_PCI_LIB_LEGACY" = "y"; "CONFIG_VIRTIO_MENU" = "y"; - "CONFIG_VIRTIO_PCI" = "m"; + "CONFIG_VIRTIO_PCI" = "y"; "CONFIG_VIRTIO_PCI_ADMIN_LEGACY" = "y"; "CONFIG_VIRTIO_PCI_LEGACY" = "y"; "CONFIG_VIRTIO_VDPA" = "m"; diff --git a/pkgs/linux-cachyos/update.nix b/pkgs/linux-cachyos/update.nix index 12011259e..6692f3276 100644 --- a/pkgs/linux-cachyos/update.nix +++ b/pkgs/linux-cachyos/update.nix @@ -56,14 +56,14 @@ writeShellScript "update-cachyos" '' url="https://git.kernel.org/torvalds/t/linux-''${latestVer%.0}.tar.gz" latestHash=$(update_kernel $latestVer $url) - cat "$(nix build '.#packages.x86_64-linux.linuxPackages_cachyos-rc.kernel.kconfigToNix' --no-link --print-out-paths)" \ - > pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix - jq \ --arg latestRcVer "$latestVer" --arg latestRcHash "$latestHash" \ ".linuxRc.version = \$latestRcVer | .linuxRc.hash = \$latestRcHash " \ "$srcJson" | sponge "$srcJson" + cat "$(nix build '.#packages.x86_64-linux.linuxPackages_cachyos-rc.kernel.kconfigToNix' --no-link --print-out-paths)" \ + > pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix + message="linux_cachyos-rc: $localVer -> $latestVer" elif [[ "${withUpdateScript}" == "stable" ]]; then localVer=$(jq -r .linux.version < $srcJson) @@ -75,6 +75,11 @@ writeShellScript "update-cachyos" '' url="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-''${latestVer%.0}.tar.xz" latestHash=$(update_kernel $latestVer $url) + jq \ + --arg latestVer "$latestVer" --arg latestHash "$latestHash" \ + ".linux.version = \$latestVer | .linux.hash = \$latestHash " \ + "$srcJson" | sponge "$srcJson" + cat "$(nix build '.#packages.x86_64-linux.linuxPackages_cachyos.kernel.kconfigToNix' --no-link --print-out-paths)" \ > pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix @@ -87,11 +92,6 @@ writeShellScript "update-cachyos" '' cat "$(nix build '.#packages.x86_64-linux.linuxPackages_cachyos-hardened.kernel.kconfigToNix' --no-link --print-out-paths)" \ > pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix - jq \ - --arg latestVer "$latestVer" --arg latestHash "$latestHash" \ - ".linux.version = \$latestVer | .linux.hash = \$latestHash " \ - "$srcJson" | sponge "$srcJson" - message="linux_cachyos: $localVer -> $latestVer" else echo "Error, wrong kernel selected, please either update linux_cachyos or linux_cachyos-rc" diff --git a/pkgs/linux-cachyos/versions.json b/pkgs/linux-cachyos/versions.json index 2d27b3277..290a9624c 100644 --- a/pkgs/linux-cachyos/versions.json +++ b/pkgs/linux-cachyos/versions.json @@ -3,8 +3,8 @@ "suffix": "-cachyos", "_linux": "pkgver from config's PKGBUILD", "linux": { - "version": "6.9.8", - "hash": "sha256-8Egme3uIMWycpwjGjRWproAtz8lDwxiMEnPrlYxDMoE=" + "version": "6.9.9", + "hash": "sha256-K+BbSH6yOaO/aH1iio8QQXfQnDEPALzCpeUPFzNCHrk=" }, "linuxRc": { "version": "6.10-rc7", @@ -12,13 +12,13 @@ }, "_config": "latest commit from https://github.com/CachyOS/linux-cachyos/commits/master/linux-cachyos", "config": { - "rev": "7804c31e2f30fa3f5a357d3882ab163d428d49c3", - "hash": "sha256-M0BGuFQRlpeIq41596jvqlZ8E8oeBv+4aCUlK8AOUb0=" + "rev": "7e519722851e815372c88d11282f1214b19f5187", + "hash": "sha256-9dOuuIbMrYw40fNEqJ+w2pi5EhHyePViS/90xzPnUPM=" }, "_patches": "latest commit from https://github.com/CachyOS/kernel-patches/commits/master/x.y", "patches": { - "rev": "5ff0d450bd3c9d6d0f6facaa1357797be1fcf5e4", - "hash": "sha256-pTdpeiP+9Y1NrDhxt5qcWrTb2IdGDBIsDPSD4qr4WHc=" + "rev": "2bafea190705c6b5c94d738891d654a83b25d468", + "hash": "sha256-HDSIvbUIZTJwAodcA1gmdocVMWoCNSirpV3zn01NS9E=" }, "_zfs": "search for `git+https://github.com/cachyos/zfs.git` in config's PKGBUILD", "zfs": {