diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
| commit | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch) | |
| tree | 6a5171dd615dfeee62a45044144c66e864738fb0 /sys-fs/zfs-kmod | |
| parent | ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff) | |
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'sys-fs/zfs-kmod')
| -rw-r--r-- | sys-fs/zfs-kmod/Manifest | 3 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch | 27 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild | 7 |
3 files changed, 32 insertions, 5 deletions
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 46f5a1ac2c8c..6105784e505e 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,8 +1,9 @@ +AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322 -EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 7eb6f17543425e7216461bb5813a0933bb672dd5479af661cca233968e8543aa72c5b80c8282e3c0a53374abe1900b5f5530e94823cf6fb8a70c4d91bfc863e8 SHA512 4c591a4b524f140a15eddfb75371dfb03040e1d95c4c25f1d1e6f48115b605ea153348252d2a10849f2c4372c694a6c1252f624e5ab8d8346ecc529f482c2bcb +EBUILD zfs-kmod-0.8.6.ebuild 4636 BLAKE2B b3fb6e9f08bdae9c641e350076c3ca9281428510c696932014a72216b7622176471055a32d629c38941f87b92fffb3f895718f87dba1fe36513542aa68beb551 SHA512 3f7b55b7d9c93222997f5ce4f2d45dba5840799ecdb86e99ec35cff4a5f855230355c79ff3c9b6b7fb47aee2355c73ae38f806a1e5c6c6a49f7df1fdd1e11c51 EBUILD zfs-kmod-2.0.0.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89 EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch new file mode 100644 index 000000000000..2b1ef8582546 --- /dev/null +++ b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch @@ -0,0 +1,27 @@ +From 0ce99b43b339226d62362f624d37f80a921eb197 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Fri, 18 Dec 2020 11:35:07 -0800 +Subject: [PATCH] copy-builtin: handle missing .gitignore + +acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in +release tarballs, because those do not contain .gitignore file. +Adding -f to rm call will make it return 0 even if file does not exist. + +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + copy-builtin | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/copy-builtin b/copy-builtin +index 84f469fef02..6a6eb1f3695 100755 +--- a/copy-builtin ++++ b/copy-builtin +@@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs" + cp --recursive include "$KERNEL_DIR/include/zfs" + cp --recursive module "$KERNEL_DIR/fs/zfs" + cp zfs_config.h "$KERNEL_DIR/include/zfs/" +-rm "$KERNEL_DIR/include/zfs/.gitignore" ++rm -f "$KERNEL_DIR/include/zfs/.gitignore" + + for MODULE in "${MODULES[@]}" + do diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild index cc5f18c90673..9067f3662366 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild @@ -37,6 +37,9 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +# https://github.com/openzfs/zfs/pull/11371 +PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" ) + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC @@ -94,10 +97,6 @@ src_prepare() { # Set module revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi - - # undo https://github.com/openzfs/zfs/commit/acfc4944d0d6db114db9f2bb5401251c5bd767b6 - # we use release tarballs with no gitignore files already - sed -i 's:rm "$KERNEL_DIR/include/zfs/.gitignore"::' copy-builtin || die } src_configure() { |