Skip to content

Commit

Permalink
linux_cachyos: 6.9.8 -> 6.9.9, fix update script bug (#799)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnRTitor
JohnRTitor authored Jul 12, 2024
1 parent 47ee77f commit 3dee707
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 40 deletions.
11 changes: 6 additions & 5 deletions pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
14 changes: 7 additions & 7 deletions pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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";
Expand Down
4 changes: 0 additions & 4 deletions pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
10 changes: 5 additions & 5 deletions pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
10 changes: 5 additions & 5 deletions pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
16 changes: 8 additions & 8 deletions pkgs/linux-cachyos/update.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions pkgs/linux-cachyos/versions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
"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",
"hash": "sha256-M7MupqhPAWsv4HfDH4zhgRBI+Oxdk/RrXgnltXX7xg0="
},
"_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": {
Expand Down

2 comments on commit 3dee707

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failed to build 31 packages:

31 packages failed
  • linuxPackages_cachyos.kernel
  • linuxPackages_cachyos.systemtap
  • linuxPackages_cachyos-hardened.gasket
  • linuxPackages_cachyos-hardened.ipu6-drivers
  • linuxPackages_cachyos-hardened.isgx
  • linuxPackages_cachyos-hardened.ivsc-driver
  • linuxPackages_cachyos-hardened.kvdo
  • linuxPackages_cachyos-hardened.mba6x_bl
  • linuxPackages_cachyos-hardened.mbp2018-bridge-drv
  • linuxPackages_cachyos-hardened.openafs
  • linuxPackages_cachyos-hardened.rtl8189es
  • linuxPackages_cachyos-hardened.rtl8189fs
  • linuxPackages_cachyos-hardened.rtl8192eu
  • linuxPackages_cachyos-hardened.rtl8812au
  • linuxPackages_cachyos-hardened.rtl8821au
  • linuxPackages_cachyos-hardened.rtl8852au
  • linuxPackages_cachyos-hardened.rtl8852bu
  • linuxPackages_cachyos-hardened.shufflecake
  • linuxPackages_cachyos-hardened.sysdig
  • linuxPackages_cachyos-hardened.system76-acpi
  • linuxPackages_cachyos-hardened.vendor-reset
  • linuxPackages_cachyos-hardened.vmm_clock
  • linuxPackages_cachyos-hardened.vmware
  • linuxPackages_cachyos-lto.kernel
  • linuxPackages_cachyos-lto.perf
  • linuxPackages_cachyos-lto.systemtap
  • linuxPackages_cachyos-lto.turbostat
  • linuxPackages_cachyos-lto.x86_energy_perf_policy
  • linuxPackages_cachyos-server.kernel
  • linuxPackages_cachyos-server.systemtap
  • linux_cachyos-rc
New build failures found! Consider adding failed builds to devshells/failures.nix @PedroHLC

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failed to build 112 packages:

112 packages failed
  • linuxPackages_cachyos.gasket
  • linuxPackages_cachyos.ipu6-drivers
  • linuxPackages_cachyos.isgx
  • linuxPackages_cachyos.ivsc-driver
  • linuxPackages_cachyos.kvdo
  • linuxPackages_cachyos.mba6x_bl
  • linuxPackages_cachyos.mbp2018-bridge-drv
  • linuxPackages_cachyos.openafs
  • linuxPackages_cachyos.rtl8189es
  • linuxPackages_cachyos.rtl8189fs
  • linuxPackages_cachyos.rtl8192eu
  • linuxPackages_cachyos.rtl8812au
  • linuxPackages_cachyos.rtl8821au
  • linuxPackages_cachyos.shufflecake
  • linuxPackages_cachyos.sysdig
  • linuxPackages_cachyos.system76-acpi
  • linuxPackages_cachyos.vendor-reset
  • linuxPackages_cachyos.vmware
  • linuxPackages_cachyos-hardened.gasket
  • linuxPackages_cachyos-hardened.ipu6-drivers
  • linuxPackages_cachyos-hardened.isgx
  • linuxPackages_cachyos-hardened.ivsc-driver
  • linuxPackages_cachyos-hardened.kvdo
  • linuxPackages_cachyos-hardened.mba6x_bl
  • linuxPackages_cachyos-hardened.mbp2018-bridge-drv
  • linuxPackages_cachyos-hardened.openafs
  • linuxPackages_cachyos-hardened.rtl8189es
  • linuxPackages_cachyos-hardened.rtl8189fs
  • linuxPackages_cachyos-hardened.rtl8192eu
  • linuxPackages_cachyos-hardened.rtl8812au
  • linuxPackages_cachyos-hardened.rtl8821au
  • linuxPackages_cachyos-hardened.rtl8852au
  • linuxPackages_cachyos-hardened.rtl8852bu
  • linuxPackages_cachyos-hardened.shufflecake
  • linuxPackages_cachyos-hardened.sysdig
  • linuxPackages_cachyos-hardened.system76-acpi
  • linuxPackages_cachyos-hardened.vendor-reset
  • linuxPackages_cachyos-hardened.vmm_clock
  • linuxPackages_cachyos-hardened.vmware
  • linuxPackages_cachyos-lto.asus-ec-sensors
  • linuxPackages_cachyos-lto.asus-wmi-sensors
  • linuxPackages_cachyos-lto.ax99100
  • linuxPackages_cachyos-lto.broadcom_sta
  • linuxPackages_cachyos-lto.chipsec
  • linuxPackages_cachyos-lto.deepin-anything-module
  • linuxPackages_cachyos-lto.evdi
  • linuxPackages_cachyos-lto.facetimehd
  • linuxPackages_cachyos-lto.gasket
  • linuxPackages_cachyos-lto.ipu6-drivers
  • linuxPackages_cachyos-lto.isgx
  • linuxPackages_cachyos-lto.it87
  • linuxPackages_cachyos-lto.ivsc-driver
  • linuxPackages_cachyos-lto.kvdo
  • linuxPackages_cachyos-lto.kvmfr
  • linuxPackages_cachyos-lto.linux-gpib
  • linuxPackages_cachyos-lto.liquidtux
  • linuxPackages_cachyos-lto.mba6x_bl
  • linuxPackages_cachyos-lto.mbp2018-bridge-drv
  • linuxPackages_cachyos-lto.mwprocapture
  • linuxPackages_cachyos-lto.netatop
  • linuxPackages_cachyos-lto.new-lg4ff
  • linuxPackages_cachyos-lto.nvidia_x11_legacy470
  • linuxPackages_cachyos-lto.openafs
  • linuxPackages_cachyos-lto.perf
  • linuxPackages_cachyos-lto.rr-zen_workaround
  • linuxPackages_cachyos-lto.rtl8189es
  • linuxPackages_cachyos-lto.rtl8189fs
  • linuxPackages_cachyos-lto.rtl8192eu
  • linuxPackages_cachyos-lto.rtl8723ds
  • linuxPackages_cachyos-lto.rtl8812au
  • linuxPackages_cachyos-lto.rtl8814au
  • linuxPackages_cachyos-lto.rtl8821au
  • linuxPackages_cachyos-lto.rtl8821cu
  • linuxPackages_cachyos-lto.rtl8852au
  • linuxPackages_cachyos-lto.rtl8852bu
  • linuxPackages_cachyos-lto.rtl88x2bu
  • linuxPackages_cachyos-lto.rtl88xxau-aircrack
  • linuxPackages_cachyos-lto.ryzen-smu
  • linuxPackages_cachyos-lto.shufflecake
  • linuxPackages_cachyos-lto.sysdig
  • linuxPackages_cachyos-lto.system76
  • linuxPackages_cachyos-lto.system76-acpi
  • linuxPackages_cachyos-lto.system76-io
  • linuxPackages_cachyos-lto.systemtap
  • linuxPackages_cachyos-lto.tp_smapi
  • linuxPackages_cachyos-lto.turbostat
  • linuxPackages_cachyos-lto.tuxedo-keyboard
  • linuxPackages_cachyos-lto.vendor-reset
  • linuxPackages_cachyos-lto.virtualboxGuestAdditions
  • linuxPackages_cachyos-lto.vmware
  • linuxPackages_cachyos-lto.x86_energy_perf_policy
  • linuxPackages_cachyos-lto.xone
  • linuxPackages_cachyos-lto.zfs_cachyos
  • linuxPackages_cachyos-server.gasket
  • linuxPackages_cachyos-server.ipu6-drivers
  • linuxPackages_cachyos-server.isgx
  • linuxPackages_cachyos-server.ivsc-driver
  • linuxPackages_cachyos-server.kvdo
  • linuxPackages_cachyos-server.mba6x_bl
  • linuxPackages_cachyos-server.mbp2018-bridge-drv
  • linuxPackages_cachyos-server.openafs
  • linuxPackages_cachyos-server.rtl8189es
  • linuxPackages_cachyos-server.rtl8189fs
  • linuxPackages_cachyos-server.rtl8192eu
  • linuxPackages_cachyos-server.rtl8812au
  • linuxPackages_cachyos-server.rtl8821au
  • linuxPackages_cachyos-server.shufflecake
  • linuxPackages_cachyos-server.sysdig
  • linuxPackages_cachyos-server.system76-acpi
  • linuxPackages_cachyos-server.vendor-reset
  • linuxPackages_cachyos-server.vmm_clock
  • linuxPackages_cachyos-server.vmware
New build failures found! @PedroHLC

Please sign in to comment.