diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/Manifest.gz | bin | 22233 -> 22231 bytes | |||
| -rw-r--r-- | sys-fs/bcachefs-tools/Manifest | 1 | ||||
| -rw-r--r-- | sys-fs/bcachefs-tools/files/bcachefs-tools-1.13.0-rustc-default-libs.patch | 36 | ||||
| -rw-r--r-- | sys-fs/vhba/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/vhba/vhba-20250329.ebuild | 58 |
5 files changed, 60 insertions, 37 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex f3bfe284f0c5..d84e1182253d 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest index ec4374876b24..360d3e0ced56 100644 --- a/sys-fs/bcachefs-tools/Manifest +++ b/sys-fs/bcachefs-tools/Manifest @@ -1,4 +1,3 @@ -AUX bcachefs-tools-1.13.0-rustc-default-libs.patch 1614 BLAKE2B 4202ccb981d57fcd2ae762ccb2748e2c56f3ab20ead8b8996402632cffcf7167fd8260b3350860d59ab3bca2eab1549dd18a959616102edd2a6e60770b9dbc64 SHA512 7b53c9e2e8239a80562bd718a53ef6784161e0b8b719164bfacc4ec9ed230a9aa40903e3579bedd66f4b46a05834e74e1108cb28f8c0c3aaaa03b0751f1ba5ad DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92 DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69 diff --git a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.13.0-rustc-default-libs.patch b/sys-fs/bcachefs-tools/files/bcachefs-tools-1.13.0-rustc-default-libs.patch deleted file mode 100644 index dad793cbe5e3..000000000000 --- a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.13.0-rustc-default-libs.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/koverstreet/bcachefs-tools/commit/10dc29d5b9a44e7bb8aff657e73c0c68dccc32b9 -From: Alyssa Ross <hi@alyssa.is> -Date: Sat, 12 Oct 2024 18:13:19 +0200 -Subject: [PATCH] Pass -C default-linker-libraries to rustc - -By default, rustc passes -nodefaultlibs to the linker. In some cases, -this can cause compiler builtins (e.g. __cpu_model, used by -__builtin_cpu_supports) not to be linked in: - -= note: /nix/store/s2cjhni3s6shh0n35ay1hpj8d85k44qk-x86_64-unknown-linux-musl-binutils-2.43.1/bin/x86_64-unknown-linux-musl-ld: ./libbcachefs.a(tools-util.o): in function `resolve_crc32c': - /build/source/c_src/tools-util.c:457:(.text+0x1023): undefined reference to `__cpu_model' - collect2: error: ld returned 1 exit status - -I saw this with static musl GCC builds, and others have reported it with -Clang. - -Link: https://github.com/koverstreet/bcachefs-tools/issues/300 -Signed-off-by: Alyssa Ross <hi@alyssa.is> -Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev> ---- a/Makefile -+++ b/Makefile -@@ -73,12 +73,13 @@ CFLAGS+=$(call cc-disable-warning, zero-length-array) - CFLAGS+=$(call cc-disable-warning, shift-overflow) - CFLAGS+=$(call cc-disable-warning, enum-conversion) - CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end) -+export RUSTFLAGS=-C default-linker-libraries - - PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils" - ifdef BCACHEFS_FUSE - PKGCONFIG_LIBS+="fuse3 >= 3.7" - CFLAGS+=-DBCACHEFS_FUSE -- export RUSTFLAGS=--cfg fuse -+ RUSTFLAGS+=--cfg fuse - endif - - PKGCONFIG_CFLAGS:=$(shell $(PKG_CONFIG) --cflags $(PKGCONFIG_LIBS)) diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest index 44f2bc1d1d28..fed2d06fe9ab 100644 --- a/sys-fs/vhba/Manifest +++ b/sys-fs/vhba/Manifest @@ -1,5 +1,7 @@ DIST vhba-module-20240202.tar.xz 16168 BLAKE2B 7974f60b73c634528afdd44e94c6da34bdc481d874f19845efc0464435a7e560494dd703b0fb1df34c96fce5f1afb300a1e6e2b3b9730e91c956816905eb2f44 SHA512 fdb9b79feb870bb22ed2182216103c8b87d1b5a471d02def24bdf5782cc2bee2333f1d78e1428b042c3df5a33ff8e07b1d61cbe11414a27db18034f3fbbe2612 DIST vhba-module-20240917.tar.xz 16204 BLAKE2B 1e6dd176d40e86363eacddf3f97231b07b7428178b6e1792cf3abd15e42f2350db66557b3499c204c47678b4967955670a8839f8b50549614bd6a8ba204b9bb7 SHA512 aa94f88e501f11fe1de9dc9eb315f720947fafa23a12789c8b674b1f7d578cc351c2c1524ea1165b893cb50c7188d016da548006e7a1795c99eeacc92e1ab0de +DIST vhba-module-20250329.tar.xz 17212 BLAKE2B b154ec69acae31155303150f66dffd7adecc16af1ee556e88d15edc24e476249d2ea5dd7b0c49df9d0ba34aa5620694f75f96d258065d396ba5ef745dc2d12da SHA512 8fba91c646ea52b23649cda23689e3b7cc136eb0652406cb1406da021488f261f57ebd72a10fcb3ec2f70eeffa202a50eb9a6361caf2992ed24f0ec6d4c434ef EBUILD vhba-20240202.ebuild 1086 BLAKE2B d473e5deb1503059962c9ea2e806805577bbb3aae95996b19a0bf3350c3d4b8c07ff105558762eba2cfcdd7c38ddd33c447ef98060cbb10ae9d962ae1d73a681 SHA512 67133950d564026373ad288bd5e8bf841e538b40320ba5c9da08d36a3db9bd5dd72a575242bebc53c8feb952ef70e598ee08388aca29414a0aafe00d9d6a9fcf EBUILD vhba-20240917.ebuild 1087 BLAKE2B 19ce3547d9bd5d4cc4798713304b296b855142adaa53a8cc52ab2cce623e41f446d245935075211d149a80e6bc7057ea0ebd82cb5dc694e0426f3fdc20f29301 SHA512 d4876de8f6d6a5d26b0344d48329c5ce0ff0bbb9f0afce4d1fcff5e1cda6a4f36800b5e45ecd60cb49191b681c9607cfb39d723c539dd780fe4914618691c414 +EBUILD vhba-20250329.ebuild 1088 BLAKE2B ec0f09a58c5512427a0e07b3e65ca9bcf0a00192070907dbfcf629f0885311d0949790c1ce80d1dacb8be3e9b4f09d4948ba350917d64366f6e8f8dc7e373f85 SHA512 1f77840d7430a75e2060d0b8cfc24157f6dc933bd57bb200568566e1cd35249a1c8e28217ee30d39cecc1e7072c4713afef76b2f0d8f72e6a3a0c49b36ad2ba8 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129 diff --git a/sys-fs/vhba/vhba-20250329.ebuild b/sys-fs/vhba/vhba-20250329.ebuild new file mode 100644 index 000000000000..eef3c374d341 --- /dev/null +++ b/sys-fs/vhba/vhba-20250329.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 udev + +MY_P=vhba-module-${PV} +DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite" +HOMEPAGE="https://cdemu.sourceforge.io/" +SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.xz" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + virtual/udev +" +DEPEND=" + ${RDEPEND} +" + +CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG" + +src_compile() { + local modlist=( vhba ) + local modargs=( KDIR="${KV_OUT_DIR}" ) + + linux-mod-r1_src_compile +} + +src_prepare() { + default + # Avoid -Werror problems + sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed" +} + +src_install() { + linux-mod-r1_src_install + + einfo "Generating udev rules ..." + udev_newrules - 69-vhba.rules <<-EOF + # do not edit this file, it will be overwritten on update + # + KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess" + EOF +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + udev_reload +} + +pkg_postrm() { + udev_reload +} |