From 354183c4fca1a44e3ba0eefb34ede27c2d9af28c Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 5 Nov 2019 12:19:16 -0500 Subject: [PATCH] pentoo-sources: bump, introduce pentoo-experimental flag --- sys-kernel/pentoo-sources/Manifest | 8 +++-- ...3.6.ebuild => pentoo-sources-5.3.8.ebuild} | 29 ++++++++++++++----- 2 files changed, 27 insertions(+), 10 deletions(-) rename sys-kernel/pentoo-sources/{pentoo-sources-5.3.6.ebuild => pentoo-sources-5.3.8.ebuild} (66%) diff --git a/sys-kernel/pentoo-sources/Manifest b/sys-kernel/pentoo-sources/Manifest index 7ad38eb53..3770a2f64 100644 --- a/sys-kernel/pentoo-sources/Manifest +++ b/sys-kernel/pentoo-sources/Manifest @@ -4,13 +4,15 @@ DIST genpatches-5.1-15.extras.tar.xz 1720 BLAKE2B 20f11d3d74fd03108247b8f8ebc6e6 DIST genpatches-5.2-14.base.tar.xz 517244 BLAKE2B b2601a8ad8d035142881cdd1dcb5c07ffe96d861fcce8b11ff4520468919767c3df2b3b943f99bea160e9d43370f76aec7be8f3ea0cc7942f11b288e671836bf SHA512 c5e4751fe7f8f239ec1087a8986ae12377d041f82bbfd2299df88835288ca063a618155a84516942f99c9d3148b4abb363f7fab8cc8e4eb6c01ab5a8a0d6f794 DIST genpatches-5.2-14.experimental.tar.xz 6148 BLAKE2B 05017cfdda21711a13a12c2cf31afb8780a005c8fcef63b9a8a665b09bd10d649c72c1c2e85e193b747033eb739d3734400c8c32bfcd3bbc1b85bbc7aff81fad SHA512 86f298e3ff0782e651e24853d73fa5cc686c8f978645233127cf3c35f603f0c46d34d75f0b8fb145a094d74192c36b3032c38ba36a74f358e971593a5d7320d6 DIST genpatches-5.2-14.extras.tar.xz 1724 BLAKE2B bdf4f9b0c6ec641ee1dc5daa3552022bac3ad22d6def9604013b3d8ee0475f9bc3c823a5c5135c0031410281f13d6657f1dd9239bdd3b7433d6960334eb55d5e SHA512 282e43f0873af088574ffbdd3538e4ea9e82902b73d4ff565b32c5814b0c2a441e7095213db12df5512e5a42785b03d5bca0b02391c0a3bd738f8d9481f69cb7 -DIST genpatches-5.3-8.base.tar.xz 225528 BLAKE2B 7e27a1e15306bf117e2efe4dc2c9f88abd1be274c883d6d51c9b7b74bab8d7c19f6eca86882d6d41ff94c61717b9c0370113408cfe7a1e4ab8056745177a4713 SHA512 e19dfd54cc83a4a02408efa7b92dab0bc98c997925e02fffa83bf1cda1e14f600dc361507d62ace013e1c2ac62f6ab6773ea402f723558aa995350a9546ff89a -DIST genpatches-5.3-8.experimental.tar.xz 6144 BLAKE2B f2ce5a10d2a3972984eab541e13177717bc7585c59e75a2d387aa59fea3612a3bad00c0983d326bb370b3e1069b3bfab1e962c80fd6089b16ad776fcb911432b SHA512 bb8f4324c3b63efd8a0c7ffb189fd28c60c27b3224fb5e8af6ac8fd0b106de8cd3321cf2b4b4da50947311d5823620aa2234c92c59a05331d0c3a71cfcdb0f65 -DIST genpatches-5.3-8.extras.tar.xz 1728 BLAKE2B f189263c727078a3a0a767af509b844b15bd05362825b8e2dda85947dcfb11469e961999c90a340daea7782aef0622dd3bbdf1fb92d3244ec769f01db350f1fa SHA512 1bf4c988f0352195c0f3861dd2c9fce786428c362d1a3238059f1b17867e2c4408839ae4af33b2a3254a725cb20b37223a81c8765c5e303c82599b2be0d2e64f +DIST genpatches-5.3-10.base.tar.xz 316072 BLAKE2B 741a8fd2521e8864769cb85ebfea80ee8a15c13f0b7e2011a1e46bd35f5e34f3172d39700e0e4f214e5f32d1940fbe7abbe46e6c6eb99986d8b7141a54f70658 SHA512 3fe07ea3d905464c43e58bc4f13596c7ab9f9eb73b25c8d1f550cad534e6659901e09e9716bae048f41dc01d992832d0b105af87b25b6020936b60a102bf833b +DIST genpatches-5.3-10.experimental.tar.xz 6144 BLAKE2B 8f182a7c9a64020edd2a59db60467395f8abafacc2f6cc07ab0f587b2e595eb9c0ba762e8bac238cbad03f8831712417a019c0272b82b5f26aef84057aef3ec6 SHA512 ae33f0975affa27eab98af872fc6200297827f60cf5a63152c95d5e36f179dfa8423c44e2497c9f2be1127621856514e17dd0fd15876d4cc6979533acc1a4471 +DIST genpatches-5.3-10.extras.tar.xz 1736 BLAKE2B 2274a8fd0a697367633f2281af657ce8a5dfc892e6ff338a39185bc28a8ddad3b667a8f5fe466eeae08b16edfa5832474eb3857109960529406ca80c5ef8d59d SHA512 4c4caeaadc406a2b202f302683f343d49e9469af9667021b663dbcfccdaa6869287393e03ab39d38202d5e140cde68122d7005124e61e63957a119218d0b4384 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236 DIST linux-5.2.tar.xz 107029708 BLAKE2B f0cf6e3a15a4bd019edbfa33cb4556d0672e807f7d139eff3ab053d0ad7649198b229475955a1f51eb90d0e9f8268cafb782f6312793fdf38472f3c6d7c2d7ee SHA512 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d DIST penpatches-4.13.8-1.tar.xz 16424 BLAKE2B 005e83f5e667bd851c21a52929fd6ffa9458692eda285fd82fd145f91de7a49f1a7ed750b08979be230349435d07e23939b804b509849bb545de3a7631e11ee7 SHA512 b6d83edc0e97202dd4332eedf734a2024057fa9acd111394cc95a85d648bcc9d4f4d9ae9d84f3a63265146d9ba45f2470c0962c06c911be86da4dc7034b03dda DIST penpatches-5.2.1-1.tar.xz 16748 BLAKE2B 69f72d23eefd1e54ed27d0fdbabd558e3d7811941f04fd0970465ddcf612cdb3286e3c515399e325cd78fe883effe1ba27ae305753c69fc0469d477054b2b705 SHA512 27027697dcc2d9af18bfe0fc0280edaae124a0827103b7199d04a578c0682252222cad3489b995613959a58afef953dfb95871b97f4634b77bd73abb1b9d01f6 DIST penpatches-5.2.5-1.tar.xz 25688 BLAKE2B dc76328cfcdea87e07393720a7fe423afc1d02b23e6b75282bc14c81cf35353a240e4f01a02c127994839f209504cd84f8176812ad9feb5efb981873b7c3c970 SHA512 383aee114ffaadf9234516207ec8c4c916caf8f085a10745933c0415f404d6ad4fead911962a457604b888e99fcaefe0a89ac7cc2c2a0232e7919705eae3187b +DIST penpatches-5.3.8-1.tar.xz 19384 BLAKE2B 77317f4eeb6813bd0c5e517c4af4e3c2d9705019feb3ee64a8f3f4f4de148b0313db91273da5495020b6dbf2d9ca9031447568060a66c033b207be36dc067a1b SHA512 d1b0888f3c73afed2e188277846144368a4a49069d4fc9143c5322af4020c6942b56f92e0ccef9f6835551c21a460d4090d96ce5154684e1f441fea332f99455 +DIST penpatches-experimental-5.3.8-1.tar.xz 11900 BLAKE2B a7ae9b5729492af2ca3e8fcc8b851cb87e5ac79453648bf4971d35e7ae7aa19dd11b3a473d0089afc9bde7f3001d90000a0f395db4deda31fe57ca37518144d7 SHA512 d543ce6273a0e09443591027ddf03f9d35782e586d6cf92241f93f1e0672ec6ec7889ec308da65140f155973c749fd4c51fa99ddcf8b24af228cb3d558edccdf DIST v2-kconfig-add-hardened-defconfig-helpers.patch 42021 BLAKE2B 4d0c1707a9d7e1c04411645c0cd6e8ebbb7fd88a477af5de67752bdd508c91e9bdfbff0831d1ace291e6e6b539617febbb56d11960a5d7c5411ed69fb92bfac2 SHA512 199cbfc7b6f96442c14f2c480bc7d2d3714edd0888e5d2aadbb3665a7da24b87822647cf93cc3b0900b225cbfd2e0b2b92db936107c49831b00b8df859ba109e diff --git a/sys-kernel/pentoo-sources/pentoo-sources-5.3.6.ebuild b/sys-kernel/pentoo-sources/pentoo-sources-5.3.8.ebuild similarity index 66% rename from sys-kernel/pentoo-sources/pentoo-sources-5.3.6.ebuild rename to sys-kernel/pentoo-sources/pentoo-sources-5.3.8.ebuild index e38a3350f..5beccda55 100644 --- a/sys-kernel/pentoo-sources/pentoo-sources-5.3.6.ebuild +++ b/sys-kernel/pentoo-sources/pentoo-sources-5.3.8.ebuild @@ -4,7 +4,7 @@ EAPI="6" ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="8" +K_GENPATCHES_VER="10" inherit kernel-2 detect_version @@ -13,17 +13,34 @@ detect_arch #nvidia doesn't have a release for x86 that supports >4.17 yet, so now we give up on them #keywords removed until my kernel modules build KEYWORDS="amd64 x86" -HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/4.13.8" -IUSE="experimental pax_kernel" +HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/" +IUSE="experimental pax_kernel pentoo-experimental" DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" + +#normal penpatches PENPATCHES_VER="1" -PENPATCHES="penpatches-5.2.1-${PENPATCHES_VER}.tar.xz" +PENPATCHES="penpatches-5.3.8-${PENPATCHES_VER}.tar.xz" PENPATCHES_URI="https://dev.pentoo.ch/~zero/distfiles/${PENPATCHES}" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${PENPATCHES_URI}" +#experimental penpatches +PENPATCHES_EXP_VER="1" +PENPATCHES_EXP="penpatches-experimental-5.3.8-${PENPATCHES_EXP_VER}.tar.xz" +PENPATCHES_EXP_URI="https://dev.pentoo.ch/~zero/distfiles/${PENPATCHES_EXP}" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${PENPATCHES_URI} ${PENPATCHES_EXP_URI}" UNIPATCH_LIST="${DISTDIR}/${PENPATCHES}" +pkg_setup() { + if use pax_kernel; then + die "pax_kernel is no longer available, you MUST ensure the use flag is no longer set" + fi +} + +src_unpack() { + use pentoo-experimental && UNIPATCH_LIST+=" ${DISTDIR}/${PENPATCHES_EXP}" + kernel-2_src_unpack +} pkg_postinst() { kernel-2_pkg_postinst einfo "For more info on this patchset, and how to report problems, see:" @@ -36,8 +53,6 @@ pkg_postinst() { if use x86; then ewarn "https://raw.githubusercontent.com/pentoo/pentoo-livecd/master/livecd/x86/kernel/config-${PV}" fi - - use pax_kernel && ewarn "pax_kernel is no longer available, you MUST ensure the use flag is no longer set" } pkg_postrm() {