diff --git a/packages/linux-lava/repatch.patch b/packages/linux-lava/repatch.patch deleted file mode 100644 index bd52fe3..0000000 --- a/packages/linux-lava/repatch.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/arch/parisc/install.sh 2022-01-05 21:26:01.042463247 +0700 -+++ b/arch/parisc/install.sh 2022-01-05 21:26:08.467328153 +0700 -@@ -37,9 +37,8 @@ - # User may have a custom install script - - if [ -n "${INSTALLKERNEL}" ]; then -- if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi -- if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi -- if [ -x /usr/sbin/${INSTALLKERNEL} ]; then exec /usr/sbin/${INSTALLKERNEL} "$@"; fi -+ if [ -x ~${INSTALLKERNEL} ]; then exec ~${INSTALLKERNEL} "$@"; fi -+ if [ -x ${INSTALLKERNEL} ]; then exec ${INSTALLKERNEL} "$@"; fi - fi - - # Default install diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index cc79801..2f2cbe6 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,9 +1,8 @@ { fetchFromGitHub, inputs, lib }: let - rc = "-rc5"; - version = "5.17.0${rc}"; - kernelHash = "0cy1m2ylvay4ai2ivy92cpxvck8ra4i99i65zsvfyjp3gbvy13gm"; - #kernelPatchHash = "044y7mmla0f73mky24vpvl8ba3warfr6im97s1231gjxican40v6"; + version = "5.17.2"; + kernelHash = "1cdi43x4c3l4chznh57gm55szycj4wjlxl1dss1ilnfvvmhyypsm"; + kernelPatchHash = "0rsril9dpvxy4afc6agx8gsyhmbicww43dzmjhmxa8c4h6wdj8bx"; tkgPatches = [ "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" @@ -22,27 +21,28 @@ let name = "patch-${path}"; patch = path; }; - # kernelPatchSrc = { - # name = "patch"; - # patch = builtins.fetchurl { - # url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz"; - # sha256 = kernelPatchHash; - # }; - # }; + kernelPatchSrc = { + name = "patch"; + patch = builtins.fetchurl { + url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz"; + sha256 = kernelPatchHash; + }; + }; mm = lib.versions.majorMinor version; in { inherit version; - src = builtins.fetchurl { - url = "https://git.kernel.org/torvalds/t/linux-${mm}${rc}.tar.gz"; - sha256 = kernelHash; - }; # src = builtins.fetchurl { - # url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${mm}.tar.xz"; + # url = "https://git.kernel.org/torvalds/t/linux-${mm}${rc}.tar.gz"; # sha256 = kernelHash; # }; + src = builtins.fetchurl { + url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${mm}.tar.xz"; + sha256 = kernelHash; + }; kernelPatches = [ + kernelPatchSrc (patch ./si-manual-clocking.patch) ] ++ builtins.map (name: { diff --git a/packages/linux-lava/unpatch.patch b/packages/linux-lava/unpatch.patch deleted file mode 100644 index 7d9e795..0000000 --- a/packages/linux-lava/unpatch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/parisc/install.sh 2022-01-05 21:19:53.405768910 +0700 -+++ b/arch/parisc/install.sh 2022-01-05 21:22:05.079800743 +0700 -@@ -37,8 +37,8 @@ - # User may have a custom install script - - if [ -n "${INSTALLKERNEL}" ]; then -- if [ -x ~${INSTALLKERNEL} ]; then exec ~${INSTALLKERNEL} "$@"; fi -- if [ -x ${INSTALLKERNEL} ]; then exec ${INSTALLKERNEL} "$@"; fi -+ if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi -+ if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi - fi - - # Default install