gentoo auto-resync : 04:12:2022 - 03:01:24

3 files changed, 40 insertions, 1 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2fae7bb95c9c..bf88b9b5ab2b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 84cabb6428a5..986cc752ec83 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -9,5 +9,5 @@ DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48
 EBUILD zfs-kmod-2.1.5-r1.ebuild 5589 BLAKE2B af311875852b88a403852c40cc2caaf505ff5eabc4fa95a30e92f8509fe5bc0e7d51c829bc0ac931837be1cdf2f614133ab1b59d9cf3b7a17cd782dd7a9fbc18 SHA512 975cc02ccac60b30db4b6ea7d70397d0612e2610ae08b8c8b5205290a606a833923148e2291766d5c03e884d87e9c8fd96378f2f07285848190f1942aff74432
 EBUILD zfs-kmod-2.1.6.ebuild 5488 BLAKE2B b8e0b564c994d5034da2e376e3fef5560df68303b7dbe36a301f9de463757560d41f374f970813cba09fb59907b37a2ac6fd7f9bdbca5f9b17392bf3e7c3ef8b SHA512 4c6064ef3dd45abb7a0af4f06f65e5787962f5021d5d633270cb50585fff58ba50c63b13593248428d04c07da30c8353a6d63d6fd383749fff4f665ac48d2392
 EBUILD zfs-kmod-2.1.7.ebuild 5486 BLAKE2B 868c40b68975985de91c41bac5df5ba82c618ae7f63d82ba4ff2694dfaad63b6b9c16c513a0606439a14f3bc02ba0c11d34559b140226e9960509d54d195b208 SHA512 ac2b8c78c986a8a38163df62a71cc2e4f36a957299dedde38b1bba962d8cc197e3da4f8d57338bc95c7c4cdaa84ca114d680b76b7210aab2d09dc8d67db101a9
-EBUILD zfs-kmod-9999.ebuild 5240 BLAKE2B 06699e035d43037703e7a336fbd2b1f1ef03840f04ddf80a15c3c2419970b556174a0e09feafc9f3f2932269999c0b84571c67286948212505ea833a61126782 SHA512 734c3b8c596596ca748e97cf474a1623fd64db20e0d469270a46cb0290376aebb04f73bc31aafd2b7b665ec2dda90a4d589fa3d92588be73d14e6879f0e0b843
+EBUILD zfs-kmod-9999.ebuild 6568 BLAKE2B 19b6a02b5d3f5b9de4b5d82a0e8331cab4a766ba2b0c193191a545dec6b03bfb8af83058857c613f083caab7f92fdf2272322749777c80a55b970e39867f4cb0 SHA512 19120be3b021a082d1db5ddd2567e04cf60d916a603916f7f7d9fbfec660153dd9c65104a07ea62a932e7ea1432b8dbfaaa366d6d0b7c1174d38022a67f042aa
 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index b2fa04c9966a..b31dd845873c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -174,7 +174,46 @@ src_install() {
 	einstalldocs
 }
 
+_old_layout_cleanup() {
+	# new files are just extra/{spl,zfs}.ko with no subdirs.
+	local olddir=(
+		avl/zavl
+		icp/icp
+		lua/zlua
+		nvpair/znvpair
+		spl/spl
+		unicode/zunicode
+		zcommon/zcommon
+		zfs/zfs
+		zstd/zzstd
+	)
+
+	# kernel/module/Kconfig contains possible compressed extentions.
+	local kext kextfiles
+	for kext in .ko{,.{gz,xz,zst}}; do
+		kextfiles+=( "${olddir[@]/%/${kext}}" )
+	done
+
+	local oldfile oldpath
+	for oldfile in "${kextfiles[@]}"; do
+		oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
+		if [[ -f "${oldpath}" ]]; then
+			ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
+			rm -rv "${oldpath}" || die
+			# we do not remove non-empty directories just for safety in case there's something else.
+			# also it may fail if there are both compressed and uncompressed modules installed.
+			rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
+		fi
+	done
+}
+
 pkg_postinst() {
+	# check for old module layout before doing anything else.
+	# only attempt layout cleanup if new .ko location is used.
+	local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
+	# we check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
+	# if glob expanded -f will do correct file precense check.
+	[[ -f ${newko[0]} ]] && _old_layout_cleanup
 	linux-mod_pkg_postinst
 
 	if [[ -z ${ROOT} ]] && use dist-kernel; then