gentoo auto-resync : 22:01:2024 - 10:49:19

5 files changed, 87 insertions, 17 deletions

diff --git a/metadata/news/2024-01-18-installkernel-merge/2024-01-18-installkernel-merge.en.txt b/metadata/news/2024-01-18-installkernel-merge/2024-01-18-installkernel-merge.en.txt
new file mode 100644
index 000000000000..3b36c7362543
--- /dev/null
+++ b/metadata/news/2024-01-18-installkernel-merge/2024-01-18-installkernel-merge.en.txt
@@ -0,0 +1,70 @@
+Title: Merging of installkernel-gentoo and installkernel-systemd
+Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+Posted: 2024-01-18
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-kernel/installkernel
+Display-If-Installed: sys-kernel/installkernel-gentoo
+Display-If-Installed: sys-kernel/installkernel-systemd
+Display-If-Installed: sys-kernel/installkernel-systemd-boot
+
+The functionalities of sys-kernel/installkernel-gentoo and
+sys-kernel/installkernel-systemd have been merged into sys-kernel/installkernel.
+
+sys-kernel/installkernel now provides the systemd USE flag to switch between
+the traditional installkernel (formerly sys-kernel/installkernel-gentoo) and
+systemd's kernel-install (formerly sys-kernel/installkernel-systemd(-boot)).
+
+Additionally, the new sys-kernel/installkernel with the systemd flag enabled
+now provides a default install.conf configuration file which ensures that it
+will work out-of-the-box with no configuration (other then USE flag
+configuration) required for most setups.
+
+Details on configuration and customization can be found on the installkernel
+wiki page [1]. Below we provide the most important migration notes.
+
+
+User Action Required (GRUB users)
+====================
+
+Previously sys-kernel/installkernel-gentoo provided kernel installation
+automation for users of GRUB via USE=grub. The new sys-kernel/installkernel
+provides the same functionality, which now works with both the traditional
+installkernel and systemd's kernel-install. In principle no user action is
+required unless users wish to explicitly choose either the traditional
+installkernel or systemd's kernel-install, in which case they may do so
+via USE=-/+systemd.
+
+sys-kernel/installkernel is renamed from sys-kernel/installkernel-gentoo,
+therefore no user action is required to upgrade.
+
+
+User Action Required (systemd-boot users)
+====================
+
+Previously sys-kernel/installkernel-systemd provided kernel installation
+automation for users of systemd-boot. sys-kernel/installkernel provides
+the same functionality but only via systemd's kernel-install. Users
+of systemd-boot should therefore ensure that the systemd USE flag is enabled
+when upgrading to >=sys-kernel/installkernel-14.
+
+This upgrade path is enforced by sys-kernel/installkernel-systemd-4, which is
+just a wrapper pulling in >=sys-kernel/installkernel-14 with the systemd flag
+enabled. sys-kernel/installkernel-systemd may be removed after installing
+>=sys-kernel/installkernel-14.
+
+emerge --noreplace sys-kernel/installkernel
+emerge --depclean sys-kernel/installkernel-systemd
+
+
+User Action Required (users of other bootloaders and custom scripts)
+====================
+
+Users who have previously relied on custom installkernel or kernel-install
+plugins should either ensure that the same kernel installation method will be
+used after upgrading to >=sys-kernel/installkernel-14 (via USE=+/-systemd) or
+migrate these custom plugins (details are on the wiki [1]).
+
+
+[1] https://wiki.gentoo.org/wiki/Installkernel
+
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index dab3389d69dc..2720193fcb6e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 16406 BLAKE2B 831dc046ea406344dbd9b591c255d828ca04da7c452f7b4a63f8a58504ddc325c6724ae02796dd39c5d2e9e24c95b59fa4c581422c416b448d20859db6c8b728 SHA512 cb96126e3ee8e1077dc15f453e8dc01ee546de8fa380c05ab4dd76adcda8cf6375c2ce86b50de95976012ea5e4584c099fb16f7c6439eededbf93235a12f77e3
-TIMESTAMP 2024-01-22T04:10:02Z
+MANIFEST Manifest.files.gz 16584 BLAKE2B 1f4c74912734d7fc787eab18783ca631722fb5cf9c23529fc738c27c85da28122fe92992c4acb8e0adf4cde7e9e2a520022704248fe9968d3eaa0e5699667b84 SHA512 163d7749e766b6a873881fa2e48f2e45a7e62b454fd39f6e4160eb50651a141e8484a95fa15016c3d3dcf924de0bd36c2ad195f8c5121e8ca55c3fa414e7a662
+TIMESTAMP 2024-01-22T10:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWt6ptfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWuPvxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBp+hAAmdEXs1MEJjg7X9RllMrsUn7LNVVqpxfGWxJn2HiJv1WesT9AsIcLeJGL
-uVwZCToE/gARRvwNiDeHldQUnpxG7fS4Oo+b+nWLWmmAyuLXJJTdRcyXXAFmPSM6
-Po0yzIFHl4MsJRbjWK10Rl8SQtgEqirjqrGZnRyzeDXWQDdjN2d7uYNP5azkl7Gr
-BTSw9BhhnGp+k1aSz6Yd6r+F0SvLLiT8KeSAavxsOIl9+dGODC5tmRm90JPXvS3H
-6OOzldH1kykwDNmTG8zlKSTwmn8acL7TiJryF5vYbjxhUAY1Bxq9H2l+Bl8t6EyT
-7bZ8QFp+8gDHQDsPZEn9XpRB/LzLKmaxWS2JTJ63xFrB2EVFcMKT8OQdnHZzo9PS
-0Uh22U4Xh4tZNeCCvPrLjTDtsNQjdL2wjWpmOYlS3Bzf7ZWwzjHDL3jnNd2akTu1
-fj3Tw9J1QkILrV1zLeL8ridfIs0IK1HiLKO1r8qzS/Vtb7hCPzX9x4oL1GFxGWx4
-Qkoj2uUJceRW48jvYj7G7FsfKwLLBTPsPvli0HbTrhySk4cVg8dOAOg9M9VxeajS
-qVh/wBPRjPb4n2UwkN4z6fbk4I3xX6odaNU9VIMhaxzCvOke8XKuv9sdywZwOMDt
-H1iWjHDBFIyuR+pfMIlWzwmSksjDe4l1tKCIQN8BPNiOKiVbtyo=
-=5/FV
+klDBUw//d9icyo0rXkpcTR0tRFAui7f89RKmVzRkfQapLh4MYKScx+iF+3QsAqQC
+qhuAfUIuYKA3+m4BuKTcaFCaKrgqBgJeJY8cDSlVAkzNgfpH3ozCewLGgwk0gtE7
+srAlxgg3fMwPYT8oR5uffHtOOoPfO7PiFQeCZKyqOXmTkkO+m6/g1mSkC37zffbo
+RnXJpc+Q1hWqtsPpx/1HAACFjyMSlnmwb39SnO0gMa2iZ+qpupKtVgyeAxBpQrHM
+9ZHB/g0CMk0Us3iTCG6g7zkwkbzt9WNxsUWT8AE+hGoHBvuNlwZpFamlnoSrzgHW
+l/N6H2SnRu62kAhb4LobtNarFetD/+i+S5ViShu7V4f4sIYXo9hpq31xtVvHunkG
+oV/qcWZM5c9ENY5rbXZfIAm/43P3CdnudrsW1wGqP0JlDbZACN4qi9XhjZLm3D7m
+SwhQnpilMj1TxrGjpC1Ju8wpUUo1BpskRmYYY6NhCQFDoCmJm+8a0O0JtbFtXI7F
+997trf/lJQh9LMi0Pydkpp8boEkmtuQvk1ixIhjPq7IkODP58dLE0cqR9Y6nX9+k
+fJ7IbHNcCwsZ1iIlKmjCgL9Y4aUODGnnpiLLZhyAzhD3eea/TmhPsu/IzQvViUv+
+7kwc45bEJuy2WJ7lE17E4+8mlWxpm+tZRj/GX+8xKXWnoumS2e8=
+=pqWu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 3ca31129310e..a7e47d9b1894 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0c2c97d526b4..40aa1e17f608 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Jan 2024 04:10:00 +0000
+Mon, 22 Jan 2024 10:10:00 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index b02ec42fef32..de35937d8fce 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-114a15884faf88f202073de48812613b264f49e0 1704427837 2024-01-05T04:10:37+00:00
+201e8195c272a70afa8270f2ee300355344626ec 1705913166 2024-01-22T08:46:06+00:00