From 6c8986ef30c39ceb74e43a6efb7982fc0e7a1384 Mon Sep 17 00:00:00 2001 From: hedmo Date: Fri, 4 Sep 2020 23:17:46 +0200 Subject: [PATCH 1/6] sys-kernel/xanmod-sources fix Manifest --- sys-kernel/xanmod-sources/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest index 1de04bf..9dcb30d 100644 --- a/sys-kernel/xanmod-sources/Manifest +++ b/sys-kernel/xanmod-sources/Manifest @@ -1,4 +1,4 @@ -DIST 0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch 287677 BLAKE2B ac74298043f43f74c780dd63e5abcf86294e831145c653eedd28a1b39959bdcfdbcdbee0071da47ad9e6bb6f837e04fbc0e93c232c82995731f957ce27d09361 SHA512 bdad88da6cf16722b0cd4f9c162ccdef83a2a92ee8767e35eb973b0c988dcd761146df5121e3202fdb68cfac03804dfa3ad44dc6fed50cb0794e0ea9fc389b90 +DIST 0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch 221951 BLAKE2B 79bc812e632e944ac544a3d04f95e79c95cec7229cecb58ce28719257f66da2eb709465d6a4bba261a0d59ebebf7418e45f78f00075a1234f183482b15c4bb88 SHA512 3b54541ecbdfea390f39231765a54620179961b5e0b9c0cdcc2c89a311265e1ac00f0c691cf9c69f21c14f92dbad75c35904dd9498e8be09634e20c11260237d DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 DIST patch-5.8.0-xanmod1.xz 89780 BLAKE2B 93cfbc072d9b9ca8b1c492edd36aee878a4cfc6d560c4b3f43156bf9102e4d8b6ab93c4c776547aec85d46e0f807824190cbfac7417d91990e6e2a4a09b0a1b8 SHA512 5829efc80b97f258b8e39ba9323a827cdfc4cfc894541e510c63cc9344ae95c7b5bb22200782d340d959685d2f952ccf24c3ca8cec64496d4434bc7bcd76e0e0 DIST patch-5.8.1-xanmod1.xz 103008 BLAKE2B f5503463f85c5f5fb7ce113d1dc79cbf17b1385d17392f1423e92987bf57e475b6488e5e86673d743e385dd8b278949da388d0ae13bda2c34b2dd430a85b7b27 SHA512 b58f664b1c2b819ab450f25160bde8059be56bf1d92a45a059829d3755035c44c71531546124a9d1cfad8a5465570e2253aad7852e842fd29451328f2c292e03 From fb69a36c3d23771ee22eaa79e5c82c835feddeda Mon Sep 17 00:00:00 2001 From: hedmo Date: Fri, 4 Sep 2020 23:26:12 +0200 Subject: [PATCH 2/6] sys-kernel/xanmod-sources change CACHY_URI --- sys-kernel/xanmod-sources/Manifest | 1 + sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest index 9dcb30d..fe9b5ca 100644 --- a/sys-kernel/xanmod-sources/Manifest +++ b/sys-kernel/xanmod-sources/Manifest @@ -1,4 +1,5 @@ DIST 0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch 221951 BLAKE2B 79bc812e632e944ac544a3d04f95e79c95cec7229cecb58ce28719257f66da2eb709465d6a4bba261a0d59ebebf7418e45f78f00075a1234f183482b15c4bb88 SHA512 3b54541ecbdfea390f39231765a54620179961b5e0b9c0cdcc2c89a311265e1ac00f0c691cf9c69f21c14f92dbad75c35904dd9498e8be09634e20c11260237d +DIST cachy-5.8.patch 48929 BLAKE2B b3d460a29deed4d324c350bb08d14c22a655d54cb7a3d7997b6c2a9a8ebc55a0e073b7be7a6b77e339848b341ae871af0fd1b62d5e7ea7c1a62b9c7996bfaf9b SHA512 e38e2fcc533a63b4bfd85ca61a0f9bbf186ebcf2a42a4559aa8e8c1915123677fb1ff6249e78bdb93b22cda685008a1442608996636c7bf3bcff7ebfd5c49b45 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 DIST patch-5.8.0-xanmod1.xz 89780 BLAKE2B 93cfbc072d9b9ca8b1c492edd36aee878a4cfc6d560c4b3f43156bf9102e4d8b6ab93c4c776547aec85d46e0f807824190cbfac7417d91990e6e2a4a09b0a1b8 SHA512 5829efc80b97f258b8e39ba9323a827cdfc4cfc894541e510c63cc9344ae95c7b5bb22200782d340d959685d2f952ccf24c3ca8cec64496d4434bc7bcd76e0e0 DIST patch-5.8.1-xanmod1.xz 103008 BLAKE2B f5503463f85c5f5fb7ce113d1dc79cbf17b1385d17392f1423e92987bf57e475b6488e5e86673d743e385dd8b278949da388d0ae13bda2c34b2dd430a85b7b27 SHA512 b58f664b1c2b819ab450f25160bde8059be56bf1d92a45a059829d3755035c44c71531546124a9d1cfad8a5465570e2253aad7852e842fd29451328f2c292e03 diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild index 38288a3..8123802 100644 --- a/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild +++ b/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A general-purpose kernel with custom settings and new features" HOMEPAGE="https://xanmod.org" LICENSE+=" CDDL" KEYWORDS="~amd64" -CACHY_URI="https://dl.xanmod.org/experimental/cachy_cpu_sched/0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch" +CACHY_URI="https://raw.githubusercontent.com/hamadmarri/cachy-sched/master/patches/cachy/cachy-5.8.patch" IUSE="cachy" SRC_URI="${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz https://github.com/xanmod/linux/releases/download/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz ( ${CACHY_URI} ) From 680b8e3addcc269591a9d3b33c46a5fd12bc15d0 Mon Sep 17 00:00:00 2001 From: hedmo Date: Fri, 4 Sep 2020 23:28:39 +0200 Subject: [PATCH 3/6] sys-kernel/xanmod-sources more fixes --- sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild index 8123802..edf67de 100644 --- a/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild +++ b/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild @@ -25,7 +25,7 @@ UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz" src_prepare() { if use cachy; then - eapply "${DISTDIR}/0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch" + eapply "${DISTDIR}/cachy-5.8.patch" fi kernel-2-src-prepare-overlay_src_prepare From c43190a6f1b0d57e34d8ceda68c35cf3dff64752 Mon Sep 17 00:00:00 2001 From: hedmo Date: Fri, 4 Sep 2020 23:39:37 +0200 Subject: [PATCH 4/6] sys-kernel/xanmod-sources more fixes --- sys-kernel/xanmod-sources/Manifest | 1 - .../xanmod-sources/xanmod-sources-5.8.5.ebuild | 4 ++-- .../xanmod-sources/xanmod-sources-5.8.6.ebuild | 13 +++---------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest index fe9b5ca..d0e21c6 100644 --- a/sys-kernel/xanmod-sources/Manifest +++ b/sys-kernel/xanmod-sources/Manifest @@ -1,4 +1,3 @@ -DIST 0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch 221951 BLAKE2B 79bc812e632e944ac544a3d04f95e79c95cec7229cecb58ce28719257f66da2eb709465d6a4bba261a0d59ebebf7418e45f78f00075a1234f183482b15c4bb88 SHA512 3b54541ecbdfea390f39231765a54620179961b5e0b9c0cdcc2c89a311265e1ac00f0c691cf9c69f21c14f92dbad75c35904dd9498e8be09634e20c11260237d DIST cachy-5.8.patch 48929 BLAKE2B b3d460a29deed4d324c350bb08d14c22a655d54cb7a3d7997b6c2a9a8ebc55a0e073b7be7a6b77e339848b341ae871af0fd1b62d5e7ea7c1a62b9c7996bfaf9b SHA512 e38e2fcc533a63b4bfd85ca61a0f9bbf186ebcf2a42a4559aa8e8c1915123677fb1ff6249e78bdb93b22cda685008a1442608996636c7bf3bcff7ebfd5c49b45 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 DIST patch-5.8.0-xanmod1.xz 89780 BLAKE2B 93cfbc072d9b9ca8b1c492edd36aee878a4cfc6d560c4b3f43156bf9102e4d8b6ab93c4c776547aec85d46e0f807824190cbfac7417d91990e6e2a4a09b0a1b8 SHA512 5829efc80b97f258b8e39ba9323a827cdfc4cfc894541e510c63cc9344ae95c7b5bb22200782d340d959685d2f952ccf24c3ca8cec64496d4434bc7bcd76e0e0 diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild index 38288a3..edf67de 100644 --- a/sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild +++ b/sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A general-purpose kernel with custom settings and new features" HOMEPAGE="https://xanmod.org" LICENSE+=" CDDL" KEYWORDS="~amd64" -CACHY_URI="https://dl.xanmod.org/experimental/cachy_cpu_sched/0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch" +CACHY_URI="https://raw.githubusercontent.com/hamadmarri/cachy-sched/master/patches/cachy/cachy-5.8.patch" IUSE="cachy" SRC_URI="${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz https://github.com/xanmod/linux/releases/download/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz ( ${CACHY_URI} ) @@ -25,7 +25,7 @@ UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz" src_prepare() { if use cachy; then - eapply "${DISTDIR}/0001-sched-Introduce-the-Cachy-CPU-scheduler-v5.8.patch" + eapply "${DISTDIR}/cachy-5.8.patch" fi kernel-2-src-prepare-overlay_src_prepare diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild index edf67de..945d327 100644 --- a/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild +++ b/sys-kernel/xanmod-sources/xanmod-sources-5.8.6.ebuild @@ -12,21 +12,14 @@ detect_version DESCRIPTION="A general-purpose kernel with custom settings and new features" HOMEPAGE="https://xanmod.org" LICENSE+=" CDDL" -KEYWORDS="~amd64" -CACHY_URI="https://raw.githubusercontent.com/hamadmarri/cachy-sched/master/patches/cachy/cachy-5.8.patch" -IUSE="cachy" -SRC_URI="${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz https://github.com/xanmod/linux/releases/download/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz -( ${CACHY_URI} ) -" +SRC_URI="${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz https://github.com/xanmod/linux/releases/download/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz" UNIPATCH_LIST_DEFAULT="" UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz" -src_prepare() { +KEYWORDS="~amd64" - if use cachy; then - eapply "${DISTDIR}/cachy-5.8.patch" - fi +src_prepare() { kernel-2-src-prepare-overlay_src_prepare From 52cbe726e4c34574f6c46a62bbf21579ae025567 Mon Sep 17 00:00:00 2001 From: hedmo Date: Fri, 4 Sep 2020 23:43:12 +0200 Subject: [PATCH 5/6] sys-kernel/xanmod-sources clean up --- sys-kernel/xanmod-sources/Manifest | 2 -- .../xanmod-sources-5.8.5.ebuild | 35 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest index d0e21c6..e75bb52 100644 --- a/sys-kernel/xanmod-sources/Manifest +++ b/sys-kernel/xanmod-sources/Manifest @@ -1,8 +1,6 @@ -DIST cachy-5.8.patch 48929 BLAKE2B b3d460a29deed4d324c350bb08d14c22a655d54cb7a3d7997b6c2a9a8ebc55a0e073b7be7a6b77e339848b341ae871af0fd1b62d5e7ea7c1a62b9c7996bfaf9b SHA512 e38e2fcc533a63b4bfd85ca61a0f9bbf186ebcf2a42a4559aa8e8c1915123677fb1ff6249e78bdb93b22cda685008a1442608996636c7bf3bcff7ebfd5c49b45 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 DIST patch-5.8.0-xanmod1.xz 89780 BLAKE2B 93cfbc072d9b9ca8b1c492edd36aee878a4cfc6d560c4b3f43156bf9102e4d8b6ab93c4c776547aec85d46e0f807824190cbfac7417d91990e6e2a4a09b0a1b8 SHA512 5829efc80b97f258b8e39ba9323a827cdfc4cfc894541e510c63cc9344ae95c7b5bb22200782d340d959685d2f952ccf24c3ca8cec64496d4434bc7bcd76e0e0 DIST patch-5.8.1-xanmod1.xz 103008 BLAKE2B f5503463f85c5f5fb7ce113d1dc79cbf17b1385d17392f1423e92987bf57e475b6488e5e86673d743e385dd8b278949da388d0ae13bda2c34b2dd430a85b7b27 SHA512 b58f664b1c2b819ab450f25160bde8059be56bf1d92a45a059829d3755035c44c71531546124a9d1cfad8a5465570e2253aad7852e842fd29451328f2c292e03 DIST patch-5.8.2-xanmod2.xz 243308 BLAKE2B 83bf4b1032bc34a9a0c207d3430b9adf8192dfed09fec7e0c4bd2a4b562b5902b3d8675074d81fbe7e5fb83cceb4543537b55061555bccf971d77d9b9b0777ff SHA512 f79ade1fda3082df4294711d366388b10a88f5236c188a3101cb502667c3e16d2ec204705c650b98a2474ab6f621ce99a9a2317d161959316c5baab9a9e88263 DIST patch-5.8.3-xanmod1.xz 306424 BLAKE2B f2cc9c6c41c4b38faca91d890517f56227d443e4395c3ff4376003a6c73fdb2df188c0529557b35915eeedd9299840c7699ddbaddfa8ef1e01ed8118b7e78bee SHA512 74648df38d547e82c99969cf820b91043000b02f7747207dca1fc37b0cc12ed24e72c0560740640ea5af441e752633922fcf063707f0bb5203fe753a94e623b1 -DIST patch-5.8.5-xanmod1.xz 344112 BLAKE2B e194cc63c627f3a523964672cf08048a6398744c63d08759d4b81656300874923012794b1ce6a44f1f5994367dc71a6d0583e6b3d04bd44d49db16ec957628a8 SHA512 84ad203ef66eb22b2a2c9da977d2581da6a6b2047d917477a4fd4d34fa544d31ca97fc77d200faffa5b6b01d50d136da604443aa02c55ac64c42c70167f5258d DIST patch-5.8.6-xanmod1.xz 424240 BLAKE2B 4a203811163092f80d7588af73d3598f09092037a5df3c467734f4eb2de2e21b43c9883a52c860f609f8a65e6340f97269cc32f4ecb7c3e27cd4de7d6caac850 SHA512 fb1ace6702188ac3d773f6c5d450a7385e5dd65c0ae2215b6e7b30b742d4051326f3c87594194e5b474f0dee95b2f6f92df7012f627622c53395b7b788bbbd65 diff --git a/sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild deleted file mode 100644 index edf67de..0000000 --- a/sys-kernel/xanmod-sources/xanmod-sources-5.8.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -K_SECURITY_UNSUPPORTED="1" -K_NOSETEXTRAVERSION="1" -XANMOD_VERSION="1" -ETYPE="sources" -inherit kernel-2-src-prepare-overlay -detect_version - -DESCRIPTION="A general-purpose kernel with custom settings and new features" -HOMEPAGE="https://xanmod.org" -LICENSE+=" CDDL" -KEYWORDS="~amd64" -CACHY_URI="https://raw.githubusercontent.com/hamadmarri/cachy-sched/master/patches/cachy/cachy-5.8.patch" -IUSE="cachy" -SRC_URI="${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz https://github.com/xanmod/linux/releases/download/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz -( ${CACHY_URI} ) -" - -UNIPATCH_LIST_DEFAULT="" -UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz" - -src_prepare() { - - if use cachy; then - eapply "${DISTDIR}/cachy-5.8.patch" - fi - - kernel-2-src-prepare-overlay_src_prepare - - rm "${S}"/.config || die - -} From 7d02cec1a03ca6b4ef787efc5d0374bbc8937dbd Mon Sep 17 00:00:00 2001 From: hedmo Date: Fri, 4 Sep 2020 23:56:46 +0200 Subject: [PATCH 6/6] sys-kernel/xanmod-sources fix metadata --- sys-kernel/xanmod-sources/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-kernel/xanmod-sources/metadata.xml b/sys-kernel/xanmod-sources/metadata.xml index 3f75cf2..247ee7e 100644 --- a/sys-kernel/xanmod-sources/metadata.xml +++ b/sys-kernel/xanmod-sources/metadata.xml @@ -1,9 +1,6 @@ - - Enable cachy as a new cpu scheduler experimental patch. - xanmod/linux