commit: a605d0c755c779373984525cf8aa108493875f82
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 18:28:26 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 6 21:17:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a605d0c7
sys-kernel/gentoo-kernel: Bump to 6.7.9
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 6 +
.../gentoo-kernel/gentoo-kernel-6.7.9.ebuild | 153 +++++++++++++++++++++
2 files changed, 159 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index f6cf875082c3..0c5c5175398b 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B
952e3510f0e76381b0028179599e7b
DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B
a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87
SHA512
5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951
DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B
22ff0e1ae4ab7fe8376b06ded03e482860055afb70b74badac3412376fbc7c8d700e226834f4f966cd187bf0a321a7d194e4d7138ec094188fb4b8ac60e3bb6f
SHA512
fbc948c6b7f1e8ce5c7eb3cfcd4ec65f93b20453751abbde0d02464db0ca1b8515aaddc0e61308c93f6726a41724c42db17dd23ffe7ac023ff07b42910d0a89f
DIST genpatches-6.7-11.extras.tar.xz 3704 BLAKE2B
1afd454ba83299605a573405732f41eda7a261f8cf524bfdaf329b4130849b0ff0895d39902360e3e4351fbf5ff1aeb2e378372d556bdf3c90b330a2195a7c89
SHA512
9d5b52bc1853f5cc41bc762ec023037ec25f22e13f1b098f7e7493b29645cdfbea14ebbac291330ae61a7c1a9b5f8291b7b2f88f61690cfe00a129693b98d035
+DIST genpatches-6.7-13.base.tar.xz 742864 BLAKE2B
63b5326788da244f61d76327c346ec64e7916eb4e6163a4ec7a94f4c51a5ce4fe0a75a58a781f4536811897226213c5ec85dc93b7b63d8d7ca81a0edb8724a98
SHA512
2d283438c2c9c7fec82107455949f6e525d34cd0542cf28594773f1dabc7061034579d71dda4e386f63cf8cd7d7921070a9cdd59c6478077ef87cb4b8064b431
+DIST genpatches-6.7-13.extras.tar.xz 3704 BLAKE2B
3a8af901c0e76fa3fe36d9dea4e8f7d034553c705f608c365cc7d50050b45e5c13b6ff530cd63ffa51054fcc0fa20d9fa45680f24063d73773f1ca407a81e395
SHA512
201a6724e62e6abfe110a6051c5d73e1fcedddba37220916631dcdd470bf3414dd3b6d499058bbf288f8fdc9e87d7a01a667412815521d8489773d17db9a5c67
DIST genpatches-6.7-9.base.tar.xz 503176 BLAKE2B
420c8e40d2abc26201b50197f3cf32f8a3cd2e3d49013e60b215fe567089e88bfeeac8bba1f8d95724c51dc1e72af86ea18c9b5f35133046f9f77059f0de3bb5
SHA512
23b636e3ab4bd81c509533cf76f96b7e5b10d4d9dfe57b5bb162d53991eab57043f3b935882e7643e1f1db39de4e18143785d0f65c65ed71e9b546a147dae4c6
DIST genpatches-6.7-9.extras.tar.xz 3700 BLAKE2B
a535ebb75c26ea320af3ee4523d48c479e38acced934c09e6dd027df2c1ec281c8520d953b238b4a88c1ada82b5fadb77e7ddcade3ee112f50e1ae7b3eff5a79
SHA512
91dd0e05b3b14422d65752e6995858b68b75d155e498b89280cac776f29ef7805c74b9e46505a16d7644cf94b789cba7adf2bf18b453e93122c8c361ee22afcd
DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B
dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8
SHA512
e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e
@@ -46,21 +48,25 @@ DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B
94e59440681535e38137b71
DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B
f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc
SHA512
41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
DIST kernel-aarch64-fedora.config.6.6.12-gentoo 271041 BLAKE2B
5af7c2f57cd6cd9230d9ab1a539a4b12b02cfdd777f5921b2d69329b171060a8085909a60eed9916aea504e8d9c9d1e907a61f0c6681ac75d5c64864052f821e
SHA512
f744444f2840020dce2dc8473e3e562fa53ac1c34a641a9f322c2c7efd8fc4d9b3677479d3a31e705fa60beff0b1beca79ab78ad7dd4b6633d4499bebbfc76bd
DIST kernel-aarch64-fedora.config.6.7.3-gentoo 276151 BLAKE2B
36606d1a802c334b29c545e35451ee95a076b6d8b48abdd2f2b67ca975ea71054096511078c0261448b2755a153abd4fbba3959bf4e64c94402eda0d0d153d12
SHA512
c09945cf51a7f42a377ae7b30ac34e458866145ee3cbd9f90bc398d533c3f54bfd287e7980142545ae148078726e635c07cb96eadf08ce9318a3e7eb0a7734ea
+DIST kernel-aarch64-fedora.config.6.7.8-gentoo 276151 BLAKE2B
36606d1a802c334b29c545e35451ee95a076b6d8b48abdd2f2b67ca975ea71054096511078c0261448b2755a153abd4fbba3959bf4e64c94402eda0d0d153d12
SHA512
c09945cf51a7f42a377ae7b30ac34e458866145ee3cbd9f90bc398d533c3f54bfd287e7980142545ae148078726e635c07cb96eadf08ce9318a3e7eb0a7734ea
DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B
92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b
SHA512
69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B
9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617
SHA512
49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B
1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b
SHA512
1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
DIST kernel-i686-fedora.config.6.6.12-gentoo 242515 BLAKE2B
dbb4df93a5c8ee34d687262cced152a07f412a89ef2e8122429477633424fdac80809ed57a5a6de72de05313ec91f266d37c3494426099621d047c0561ccb57e
SHA512
a65fe3299b6d8f89373937d2a782aa1469ebf18954b00bbf2798cee952b9946d7fead795388c079cb508f6d431e49b2812fb6d845c8a0e3861a4a3bd11e81968
DIST kernel-i686-fedora.config.6.7.3-gentoo 244374 BLAKE2B
257a580a674bbd4f16f47311f1f09d3068a8448d2dcb62a3007dd888037f0f33eaf4f8bea25d3ae117f9913c8053eb43611a03a4cd17d73525ae5de46d042fe5
SHA512
516d7d586f731edafb6749f51cfb42f0ec2d497a5971685cfc82d5bf4bab923f6027458fbf2b9cdfaf5f8f22f4df564cf402452cfe8760737c39248eac456bfc
+DIST kernel-i686-fedora.config.6.7.8-gentoo 244385 BLAKE2B
a5e30eab5f1c3ce8c17c1774a3ad891359c978dd6e2660dd6e224d3365e44a90cc507a42be8fc82d6eb7caae05c8099065c1097d527e0198a77300786d3705fb
SHA512
df656de9a82473409bf67aef0a179f5c8339d30af7eda8fd5fc721f7366f27dbdc7b21f9f19f5298c19eb58ab7ded1492daa96db0998e096e16f52084c036871
DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B
889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9
SHA512
3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B
db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d
SHA512
b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B
f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f
SHA512
a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
DIST kernel-ppc64le-fedora.config.6.6.12-gentoo 232147 BLAKE2B
d67c2ab2d089ecdde3879129d2b1f85a592adae811ed053d00d4ff120e6bb44546bb41d74817be558adb1d669d06f3dd50e6ea542c8a9c2f13672f77f4e4eed5
SHA512
b130b4c57959c0f7be983334b08354640d5e2946bfdd956d6c5b895f816f6177d5fa4bb1c4382cca5c4dd4723aac42e9e89a002b71d86f4eb30f755008f8f9af
DIST kernel-ppc64le-fedora.config.6.7.3-gentoo 233294 BLAKE2B
d14dd35ccd3c481b4c79edca44fc645fa85d5f0f5888fa3b888b7b94e55b6d0881b250c3fa125b0d3c4aa0f56ddf5e903b75fe072e832d475100709f261c3825
SHA512
a132f7aa6e221160b43d24fef230f4aca390142c992ab44162cb39f02e18dd3991055bcefe27908cf88e10de2f71eacae27750b089528d1c05f1f91a4ec06909
+DIST kernel-ppc64le-fedora.config.6.7.8-gentoo 233294 BLAKE2B
d14dd35ccd3c481b4c79edca44fc645fa85d5f0f5888fa3b888b7b94e55b6d0881b250c3fa125b0d3c4aa0f56ddf5e903b75fe072e832d475100709f261c3825
SHA512
a132f7aa6e221160b43d24fef230f4aca390142c992ab44162cb39f02e18dd3991055bcefe27908cf88e10de2f71eacae27750b089528d1c05f1f91a4ec06909
DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B
0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c
SHA512
b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B
239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf
SHA512
9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B
e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124
SHA512
42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B
7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8
SHA512
c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
DIST kernel-x86_64-fedora.config.6.7.3-gentoo 245518 BLAKE2B
95e474477509bae45c63e8fc2ace4fbdf13248bbd5b47728882f25b52923c95f1b26f096769c4c4d717de8af1e6ebc3c7ff6ce8a84f4a3301153d6f9c47a1086
SHA512
b7a23d49904cf9230beeff69456762be24b145cfe2b3cdfc414826b2c7ba6454c60d00ff3269b81fe0eb0c6e40dbe2cd301bdeba1bb43f82fcf2724c77fd3b5f
+DIST kernel-x86_64-fedora.config.6.7.8-gentoo 245529 BLAKE2B
3765cdbb001c0fed398da66ac949572d858ee10d54584387e40ebb325884b6aa1c8dddbbafda0c60cff85bf2d3863db514184c0376d21502b068a616befdea63
SHA512
231fa57809fbc769b325f7d0568c91b1aa1c500bf818b286dde45ff0811c1d8d5ad0adedff8b9a48400aeb9fbd05706445111cdadac277eba86ac95f4f7d18a1
DIST linux-5.10.tar.xz 116606704 BLAKE2B
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
SHA512
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.15.tar.xz 121913744 BLAKE2B
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
SHA512
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-6.1.tar.xz 134728520 BLAKE2B
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
SHA512
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.9.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.9.ebuild
new file mode 100644
index 000000000000..91c0581a412e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.9.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.7.8-gentoo
+GENTOO_CONFIG_VER=g11
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+ https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+ https://www.kernel.org/
+"
+SRC_URI+="
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ amd64? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )
+"
+S=${WORKDIR}/${MY_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+ arm? ( savedconfig )
+ hppa? ( savedconfig )
+ riscv? ( savedconfig )
+ sparc? ( savedconfig )
+"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+ debug? ( dev-util/pahole )
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+ usr/src/linux-.*/scripts/gcc-plugins/.*.so
+ usr/src/linux-.*/vmlinux
+ usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ default
+
+ local biendian=false
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm)
+ return
+ ;;
+ arm64)
+ cp
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ biendian=true
+ ;;
+ hppa)
+ return
+ ;;
+ loong)
+ return
+ ;;
+ ppc)
+ # assume powermac/powerbook defconfig
+ # we still package.use.force savedconfig
+ cp
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+ ;;
+ ppc64)
+ cp
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ biendian=true
+ ;;
+ riscv)
+ return
+ ;;
+ sparc)
+ return
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}"
.config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local myversion="-gentoo-dist"
+ use hardened && myversion+="-hardened"
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config ||
die
+ local
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+ local merge_configs=(
+ "${T}"/version.config
+ "${dist_conf_path}"/base.config
+ )
+ use debug || merge_configs+=(
+ "${dist_conf_path}"/no-debug.config
+ )
+ if use hardened; then
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+ tc-is-gcc && merge_configs+=(
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+ merge_configs+=(
"${dist_conf_path}/hardened-${ARCH}.config" )
+ fi
+ fi
+
+ # this covers ppc64 and aarch64_be only for now
+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+ merge_configs+=( "${dist_conf_path}/big-endian.config" )
+ fi
+
+ use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
