Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New package: mstflint-4.13.3 #19569

Closed
wants to merge 1 commit into from
Closed

New package: mstflint-4.13.3 #19569

wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented Feb 26, 2020

Package used to control Infiniband network cards, including firmware updates.

2 Issues:

  • Not sure how to properly handle the upstream versioning properly.
  • The packaging fails to identify that it needs boost_regex1.69. How do I fix this?

srcpkgs/mstflint/template Outdated Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented Mar 3, 2020

Tested working now. Not sure if I got the versioning correct, however.

@ghost ghost changed the title [WIP] New package: mstflint-4.13.3 New package: mstflint-4.13.3 Mar 3, 2020
@sgn
Copy link
Member

sgn commented Mar 4, 2020

I would do this instead:

diff --git a/srcpkgs/mstflint/template b/srcpkgs/mstflint/template
index 7ebe2bcd27..2a449956a4 100644
--- a/srcpkgs/mstflint/template
+++ b/srcpkgs/mstflint/template
@@ -1,8 +1,9 @@
 # Template file for 'mstflint'
 pkgname=mstflint
-version=4.13.3
+version=4.13.3r2
 revision=1
-subvers="-2"
+_version=${version/r/-}
+wrksrc=mstflint-${version%r*}
 build_style=gnu-configure
 configure_args="--enable-cs --enable-fw-mgr --enable-xml2"
 makedepends="boost-devel libcurl-devel libibmad-devel liblzma-devel libxml2-devel zlib-devel"
@@ -10,7 +11,7 @@ short_desc="Open source version of Mellanox Firmware Tools"
 maintainer="Rich Gannon <rich@richgannon.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Mellanox/mstflint"
-distfiles="https://github.com/Mellanox/mstflint/releases/download/v${version}${subvers}/${pkgname}-${version}${subvers}.tar.gz"
+distfiles="https://github.com/Mellanox/mstflint/releases/download/v${_version}/${pkgname}-${_version}.tar.gz"
 checksum=3abc918311fc07e4add7564879bd4a8def8ccfed40962f31682c75f2ee8a58d1
 
 mstflint-devel_package() {

Anyway, cross-compile and musl build are broken.

@sgn
Copy link
Member

sgn commented Mar 4, 2020

This fixup for musl:

 srcpkgs/mstflint/patches/musl.patch | 11 +++++++++++
 srcpkgs/mstflint/template           |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/srcpkgs/mstflint/patches/musl.patch b/srcpkgs/mstflint/patches/musl.patch
new file mode 100644
index 0000000000..524c077438
--- /dev/null
+++ b/srcpkgs/mstflint/patches/musl.patch
@@ -0,0 +1,11 @@
+--- mtcr_ul/mtcr_ul_com.c.orig	2020-03-04 08:19:35.889730972 +0700
++++ mtcr_ul/mtcr_ul_com.c	2020-03-04 08:19:41.690743181 +0700
+@@ -76,7 +76,7 @@
+ 
+ #if CONFIG_ENABLE_MMAP
+ #include <sys/mman.h>
++#include <linux/pci.h>
+-#include <sys/pci.h>
+ #include <sys/ioctl.h>
+ #endif
+ 
diff --git a/srcpkgs/mstflint/template b/srcpkgs/mstflint/template
index 7ebe2bcd27..5dfb7283b9 100644
--- a/srcpkgs/mstflint/template
+++ b/srcpkgs/mstflint/template
@@ -13,6 +13,8 @@ homepage="https://github.com/Mellanox/mstflint"
 distfiles="https://github.com/Mellanox/mstflint/releases/download/v${version}${subvers}/${pkgname}-${version}${subvers}.tar.gz"
 checksum=3abc918311fc07e4add7564879bd4a8def8ccfed40962f31682c75f2ee8a58d1
 
+CFLAGS="-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t"
+
 mstflint-devel_package() {
 	depends="${pkgname}-${version}_${revision}"
 	short_desc+=" - development files"

@ghost
Copy link
Author

ghost commented Mar 4, 2020

Thanks sgn!

I updated with the musl patch and the reversioning.

@ghost ghost closed this Apr 3, 2020
@ghost ghost deleted the mstflint branch April 3, 2020 00:34
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 31, 2021
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant