diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-10 16:37:59 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-10 16:37:59 +0000 |
| commit | a6611f9bc959724ec73dbaa6f1c608698c387a8c (patch) | |
| tree | 8ff7cd805082a09f072c81e91670cb075fe81ce3 /eclass | |
| parent | 1b26473bc67c6bcd775f96cdd7ee9824b97d7ee8 (diff) | |
gentoo auto-resync : 10:11:2023 - 16:37:59
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38803 -> 38802 bytes | |||
| -rw-r--r-- | eclass/dist-kernel-utils.eclass | 14 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 10 | ||||
| -rw-r--r-- | eclass/kernel-install.eclass | 2 |
4 files changed, 11 insertions, 15 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 686a40a40b4d..66478b630d5d 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index 67ae2f7b510d..d455c88ebee1 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -125,20 +125,6 @@ dist-kernel_install_kernel() { # install the combined executable in place of kernel image=${initrd%/*}/uki.efi mv "${initrd}" "${image}" || die - # We moved the generated initrd, prevent dracut from running again - # https://github.com/dracutdevs/dracut/pull/2405 - shopt -s nullglob - local plugins=() - for file in "${EROOT}"/etc/kernel/install.d/*.install; do - plugins+=( "${file}" ) - done - for file in "${EROOT}"/usr/lib/kernel/install.d/*.install; do - if ! has "${file##*/}" 50-dracut.install 51-dracut-rescue.install "${plugins[@]##*/}"; then - plugins+=( "${file}" ) - fi - done - shopt -u nullglob - export KERNEL_INSTALL_PLUGINS="${KERNEL_INSTALL_PLUGINS} ${plugins[@]}" if [[ ${KERNEL_IUSE_SECUREBOOT} ]]; then # Ensure the uki is signed if dracut hasn't already done so. diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 83c5ab590c39..a08845364296 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -120,6 +120,14 @@ fi # usage. : "${EGIT_LFS_CLONE_TYPE:=shallow}" +# @ECLASS_VARIABLE: EVCS_STORE_DIRS +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# Record of names of all the repositories directories being cloned in the git3_src. +# This is useful in the case of ebuild that fetch multiple repos and +# it would be used by eclean to clean them up. +EVCS_STORE_DIRS=() + # @ECLASS_VARIABLE: EGIT3_STORE_DIR # @USER_VARIABLE # @DEFAULT_UNSET @@ -360,6 +368,8 @@ _git-r3_set_gitdir() { GIT_DIR=${EGIT3_STORE_DIR}/${repo_name} + EVCS_STORE_DIRS+=( "${GIT_DIR}" ) + if [[ ! -d ${EGIT3_STORE_DIR} && ! ${EVCS_OFFLINE} ]]; then ( addwrite / diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index 03638cd2c57b..ea6ba3569a17 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -52,7 +52,7 @@ IDEPEND=" sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd ) - initramfs? ( >=sys-kernel/dracut-049-r3 )" + initramfs? ( >=sys-kernel/dracut-059-r4 )" # needed by objtool that is installed along with the kernel and used # to build external modules # NB: linux-mod.eclass also adds this dep but it's cleaner to have |