summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2023-01-12 13:02:00 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2023-01-12 13:02:00 +0000
commit19ff1cbc21466f6058719682f7e68af9db1369a3 (patch)
tree7b49919b7d96a1535508bb21a6f85daf426887bb
parentMerge updates from master (diff)
parentsys-kernel/gentoo-sources: add 6.1.5 (diff)
downloadgentoo-19ff1cbc21466f6058719682f7e68af9db1369a3.tar.gz
gentoo-19ff1cbc21466f6058719682f7e68af9db1369a3.tar.bz2
gentoo-19ff1cbc21466f6058719682f7e68af9db1369a3.zip
Merge updates from master
-rw-r--r--eclass/dune.eclass114
-rw-r--r--sys-kernel/gentoo-sources/Manifest9
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-5.15.87.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-6.0.19.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-6.1.5.ebuild28
5 files changed, 196 insertions, 11 deletions
diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index 4bc73eda852c..655a41be84d6 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: dune.eclass
@@ -29,7 +29,7 @@ _DUNE_ECLASS=1
# Set before inheriting the eclass.
: ${DUNE_PKG_NAME:=${PN}}
-inherit multiprocessing
+inherit edo multiprocessing
# Do not complain about CFLAGS etc since ml projects do not use them.
QA_FLAGS_IGNORED='.*'
@@ -44,16 +44,108 @@ BDEPEND="
dev-ml/dune
"
+# @FUNCTION: edune
+# @USAGE: <arg> ...
+# @DESCRIPTION:
+# A thin wrapper for the `dune` command.
+# Runs `dune` with given arguments and dies on failure.
+#
+# Example use:
+# @CODE
+# edune clean
+# @CODE
+edune() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ edo dune "${@}"
+}
+
+# @FUNCTION: dune-release
+# @USAGE: <subcommand> [--target target] [package] ...
+# @DESCRIPTION:
+# Run a selected subcommand for either all of dune packages in current
+# directory or only the selected packages. In case of all packages the package
+# detection is done via dune itself.
+# The `--target` option specifies a target for the selected subcommand,
+# it is primarily used for `dune build`, for more info see `man dune-build`.
+#
+# Example use:
+# @CODE
+# dune-release build --target @install menhir menhirLib menhirSdk
+# @CODE
+dune-release() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local subcommand
+ local target
+
+ # Get the subcommand.
+ if [[ -z "${1}" ]] ; then
+ die "dune-release: missing subcommand"
+ else
+ subcommand="${1}"
+ shift
+ fi
+
+ # Detect if the target is specified.
+ case "${1}" in
+ --target )
+ target="${2}"
+ shift
+ shift
+ ;;
+ esac
+
+ local -a myduneopts=(
+ --display=short
+ --profile release
+ -j $(makeopts_jobs)
+ )
+
+ # Resolve the package flag.
+ if [[ -n "${1}" ]] ; then
+ myduneopts+=( --for-release-of-packages="$(IFS="," ; echo "${*}")" )
+ fi
+
+ edune ${subcommand} ${target} "${myduneopts[@]}"
+}
+
+# @FUNCTION: dune-compile
+# @USAGE: [package] ...
+# @DESCRIPTION:
+# Builds either all of or selected dune packages in current directory.
+#
+# Example use:
+# @CODE
+# dune-compile menhir menhirLib menhirSdk
+# @CODE
+dune-compile() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ dune-release build --target @install "${@}"
+}
+
+# @FUNCTION: dune-test
+# @USAGE: [package] ...
+# @DESCRIPTION:
+# Tests either all of or selected dune packages in current directory.
+#
+# Example use:
+# @CODE
+# dune-test menhir menhirLib menhirSdk
+# @CODE
+dune-test() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ dune-release runtest "${@}"
+}
+
dune_src_compile() {
- ebegin "Building"
- dune build @install -j $(makeopts_jobs) --profile release
- eend $? || die
+ dune-compile
}
dune_src_test() {
- ebegin "Testing"
- dune runtest -j $(makeopts_jobs) --profile release
- eend $? || die
+ dune-test
}
# @FUNCTION: dune-install
@@ -67,6 +159,8 @@ dune_src_test() {
# dune-install menhir menhirLib menhirSdk
# @CODE
dune-install() {
+ debug-print-function ${FUNCNAME} "${@}"
+
local -a pkgs=( "${@}" )
[[ ${#pkgs[@]} -eq 0 ]] && pkgs=( "${DUNE_PKG_NAME}" )
@@ -79,9 +173,7 @@ dune-install() {
local pkg
for pkg in "${pkgs[@]}" ; do
- ebegin "Installing ${pkg}"
- dune install ${myduneopts[@]} ${pkg}
- eend $? || die
+ edune install ${myduneopts[@]} ${pkg}
# Move docs to the appropriate place.
if [[ -d "${ED}/usr/doc/${pkg}" ]] ; then
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 3ce832fd9e85..5bb6eab96064 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -58,6 +58,9 @@ DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd
DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212
DIST genpatches-5.15-90.experimental.tar.xz 5424 BLAKE2B bd4bf49ca8783eea5bd093e1c8a12481211cc1904cbfed27513a996b182d752719378f6b225b6b650bfa926a970f34446257e232c5fbca9a55c513a9a559b881 SHA512 f66fb915fbf70522adbf3d076c5cc061e9aae6edcafd48e074e63a05d54bab91e578e710dfd30c0812fd389854bde68c964428175bfe357f4b5377e079b82b6b
DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45
+DIST genpatches-5.15-91.base.tar.xz 3838856 BLAKE2B e42746d0b7342cd6e2ab1b6b907a202277365a4fe52df5eae5d3685c68efbcbce58ab1c6d00e0b89c1f581f6818ba830f35af96d40e1bbf80ac824b0be572715 SHA512 37b31c9f878dc1cc4c5446fe7810b6fb9caf556296e99975de1e37bde9e798f5f74e90cd6d825ae1f474bbd8ae31da3f07e5527d3ce6aff42761ce8425634949
+DIST genpatches-5.15-91.experimental.tar.xz 5420 BLAKE2B c946006fa74b472f40a8389832e482cd5c20d5ba620743e0986d62f298e47f2c3fd9b1a4a5232c628de9fc71a7a1ddd6bd29dad3c317507724c082ee29e3795c SHA512 753284d7bab9453de103e87112c8df7eafe7bceb61c42267bf9462aaab636f1d51e017dad6ce2d7885c84449e8d67d0606fd3e53ee0671de7d6c8b130ea3aa26
+DIST genpatches-5.15-91.extras.tar.xz 3932 BLAKE2B 139a9a7876504ce63abf76db63904b3b4330ab101ec7f0c97717ee83ff861595df31a36f5fe4fbaf3b70641e6029e399235a7ec3e26feb98522c57e6b4b5d71b SHA512 9486f83b99c1f0bcd23e556229c7c0947be4fa097d688b510b6d57d94584e6fffcc9a2412c3620ceeffc2b347fad1ea1e12f58b2f0629cf93a2bde19f567ee5d
DIST genpatches-5.4-230.base.tar.xz 5241272 BLAKE2B 59a4ad6f7b2f3380e5521a2d48e7da526bb8dc177d04c147e5699b75efd76e62e94b97a96d7d2f50c70fdd684c57f76f1a0017fafc223f7a31f7d26ef24a5365 SHA512 f69615ad62cef31b53cb89ce072760e17f9f22a40217ca1057e34939ed2fbaadafea2811e68fbbb91f62aeb630d4ca71ed63442efa5448c1e44554a4cbb57b12
DIST genpatches-5.4-230.experimental.tar.xz 16912 BLAKE2B 993d8daee45da9acd7c54828694637c3e154f9df403a5e4c3bbd917d8459b00ec2b1ba2c370aeb69b39b7cca86d8c29305c04a6e619f616424287ee0b50d7f4d SHA512 779078a726e6b247bd84f5c9454473b902204f73bb02e536af4e199b769479ee72319ea9741222849db94bfe8f1e61577d4f884970b9c3b79bb34110e1dd4b81
DIST genpatches-5.4-230.extras.tar.xz 1812 BLAKE2B 62c614ec2f856867ab6e6953fcbe533fba508263a2f0e0f9e422ba9c4f159af9564d8ad57368f4e8a9e645302b3cdc8ef1ac5a626cb8e18380c025f3290ba56a SHA512 911595072c899538d66313d24585df62a9dd4e44e46980b14e1b6d0c61a64d55b6a66e4b30cae49965900bbbe634c2ebb36aac1d084038829da2a1a59b721186
@@ -79,6 +82,9 @@ DIST genpatches-6.0-17.extras.tar.xz 3804 BLAKE2B 46529c32e888478e4542e581837bb5
DIST genpatches-6.0-18.base.tar.xz 1058696 BLAKE2B d196ac73218aba9a040cbb227010f8a698f7073d9c18e59b38dec48f2c86cb013544d66d57f2c2a9a6ad81646d753ece44222426f62348ff0dbf6dde1ea3622a SHA512 55aa267c66bc1baf908b6f1ee4e38c0ec8dbfbeb699635727efccd7d8561459cc49c973bc9a59c61a320550781dcb274d4e70d274bd46f59bbfa4b8cf8117147
DIST genpatches-6.0-18.experimental.tar.xz 71064 BLAKE2B fc47e1edfae7582296ff71f18fae790570a597c7d9e7bc9ce779cf8c2fca5afe3d9e85e1fcc540379266585a011df913ab85f6fcaad1df81af7666d286ea077e SHA512 8dee716fc543cb681ec0e2e630bf91449c3f3f069579d09fbdd97354299c54dfd8cb85c210d90d54ec85c15233a15c132a705f6bbe2c4db135a271c6c0f4d55d
DIST genpatches-6.0-18.extras.tar.xz 3804 BLAKE2B feeb5ba822e8d1fd70fce07f7e3f74b5678ca17fa54c81e64f364d45ee8801edf5d1e88ad237d9944288163b7c776ea0a9d8ab19aef43aa436f814e50c9fd10d SHA512 a40804af99da5f085046a121e2f400229a9c091969d17dcb0ee2f21ee837ad08dcc56dcfd0f826883dfb3f61f36d9277880b9819fc17e8a318f5720853e81b98
+DIST genpatches-6.0-19.base.tar.xz 1107844 BLAKE2B e185f0d47ac23c92668d523a32d56a3b8c7dbb67db40e7cc776b267e6e5ffec4d25d10ec85df396687d96460937eeeb47bb4a9e6213199ee32f0c2a0f5e034a4 SHA512 beb49081cf89405825638cb49eb95fd8fb0d2b59790a663c629b4c4bf5c7c55e424cbf96fe9bc83220c14270ed2fee39481ad79f287aded00c7bd0cbf755c400
+DIST genpatches-6.0-19.experimental.tar.xz 71052 BLAKE2B c56ed25d3ddc56d97264d67a3485df4af701b3ab4a269abd8dfe563d11c2efe6c417e0dcd7e9db94d0c0b03e42e10f4f7f09155e75136116df9655a58e35ee23 SHA512 35021edfe8ce0c49d25b7dbda21df4170a481ea81e0c79b02bcdbb326a8fa6bcc1882695bb11010894133df2b32a7db149845d2eaca29582367489f625e6b70f
+DIST genpatches-6.0-19.extras.tar.xz 3804 BLAKE2B b3111f38985093d7ae6936f7ceedacce53fda92163973d79984a9bf19c127ba7dd203f55bf5c57b69591310851c91127848edec87eb715c4d20ab8051bc8d30e SHA512 2212c66beddfb576e90f8c4015ed64aca1cae44367f5ffca98c949e208e68eba6b357b00a6196671cefd7811a3f1f2e188337dcf10457c8b7955129d096c5bb0
DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1
DIST genpatches-6.1-3.experimental.tar.xz 71516 BLAKE2B 03bc845d4559717e54b63ec659b9b4fc6b088b76da8ff9a762e4da52dc50af5cc646fe3203a23095b759a3ce4d181685c0dbc775c82ad8c01ff2748aa97ccadc SHA512 7456313059a3a8463019536dfe0f6d5f5cdec659f6fb8275c235e20def546ce299a227bec30d3af6655fcdca105ac923f5b2cb1f5751e55666cf60e99e43b034
DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
@@ -88,6 +94,9 @@ DIST genpatches-6.1-4.extras.tar.xz 3808 BLAKE2B af64347e6fd2f640d86b0839feac7c6
DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1ca403efddc3c6b8c3e5d91246448cdc2a3626af200ee62865270f3ea5bb9dff131fed425fa78f6ecbaff08818e7a48022 SHA512 c3b8b2e58e4f6e5c7750d8c2bed54952feac33b319c318f562b8b5a894ff5d25ffe0149f5373f2b1655c1be6757eef8c6890460228f54828a42c59a1f869bf45
DIST genpatches-6.1-5.experimental.tar.xz 71496 BLAKE2B 1b09551e4a4476e8dc95c8fa743fdceb65a8402a58df0e70cb9dbe0f872cccbdf6f0daad00fbe1f292add764d7b73b0c3ed03b6d2f3aea74ee52c78afda3318b SHA512 9cb086ee4fc1e07b6db36291203bc80403a1f437df7feb4dfd408eee6f717f0566381def3eeae27225d0d22b4d96ea363b60961358274625e8bc983ff87aef19
DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
+DIST genpatches-6.1-6.base.tar.xz 469660 BLAKE2B 286af0e2443e6ed0a280af8789532b09f47d497c12da5110b790f3de4a595f574ca1c3f2e4e7471d119d884ae1f594beb7d61fe819e442e54ec42743dde0257d SHA512 8a37f72891f2dfffe3b85e392c5a614e7742b59e4d141338b647fcb1a72881045c79ace3c2233eadf6b86ec4c63045fba51d88086d96a674c4919737bb312cae
+DIST genpatches-6.1-6.experimental.tar.xz 71524 BLAKE2B 3d48b0381748e3459746da4f06637fc01e06e17b4d4124bdb6de34985ac62fd2986c2c4e48acd5a2c4eb4e9de0398fcfd2b902dd79a77afa49a9814e4ec1d9ad SHA512 27719e110a8f94e14c42d333c8df186e3b752895ce3eb799ccbf3adc8947178fd94402c4be03a8e978d196ca0f21288f673fd964774c2e7f2201421d8a5357f0
+DIST genpatches-6.1-6.extras.tar.xz 3808 BLAKE2B 6582711e9e1da279f7befb627037c9f6e7cfd2a6354869972673a9345c2018f4904496e223462e6aaceac7a471b188cf5841f195b68fe420c6b805ec379ce6b2 SHA512 db4f7c2e6daaefaca11a1fe92210a6c629eef77d88b8dc0824016a4aa41a6a6b26e8d948f21a0f6223e4bb655872c65979eb175e4a99198c37be358f06fb5c43
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.87.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.87.ebuild
new file mode 100644
index 000000000000..3f2828556ca2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.87.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="91"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.0.19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.0.19.ebuild
new file mode 100644
index 000000000000..584c402e4889
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.0.19.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.5.ebuild
new file mode 100644
index 000000000000..18ca07c04249
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}