Bug 255578 - net/isboot-kmod: Update to 0.2.14
Summary: net/isboot-kmod: Update to 0.2.14
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Li-Wen Hsu
URL:
Keywords:
Depends on:
Blocks: 226982
  Show dependency treegraph
 
Reported: 2021-05-03 20:10 UTC by John Nielsen
Modified: 2021-05-25 15:37 UTC (History)
1 user (show)

See Also:


Attachments
Update the port to 0.2.14 (4.06 KB, patch)
2021-05-03 20:10 UTC, John Nielsen
no flags Details | Diff
Update the port to 0.2.14 (tweaked) (4.06 KB, patch)
2021-05-10 22:32 UTC, John Nielsen
no flags Details | Diff
Update the port to 0.2.14 (take 3) (4.86 KB, patch)
2021-05-18 19:09 UTC, John Nielsen
john: maintainer-approval+
Details | Diff
correct port and bump PORTREVISION (1.79 KB, patch)
2021-05-25 14:25 UTC, John Nielsen
john: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Nielsen 2021-05-03 20:10:15 UTC
Created attachment 224642 [details]
Update the port to 0.2.14

This changes the upstream to my github repo where I have incorporated a few patches; most notably one from XigmaNAS, and updates the version to 0.2.14. This should fix the build errors reported by pkg-fallout and in e.g. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226982.

The port-based patch to isboot.c can be removed as it is now incorporated in the (new) upstream.

See also:
https://github.com/jnielsendotnet/isboot
Comment 1 Li-Wen Hsu freebsd_committer freebsd_triage 2021-05-10 18:40:25 UTC
Thanks for the updating. I've just done a test in my poudriere and there are some questions need to be discussed:

- This new version builds fine on 13 and 12, but breaks 11.  I'm not sure how easy to keep the support for all the versions.
  - If it is easy, let's just fix it and update the port.
  - It it is hard, we may:
    - keep the 0.2.13 port (copy to something like net/isboot-fbsd11-kmod), mark it IGNORE on 12+, and other non-x86 platforms. And I suggest marking that port DEPRECATED with the same date as 11 EoL.
    - Mark net/isboot-kmod IGNORE for 11
- The BROKEN on non-x86 platforms are removed, have them tested (at least buildable?)
- BTW, it looks all the codes in this kmod are BSDL so maybe we can consider moving the code and development into the src tree?
Comment 2 John Nielsen 2021-05-10 22:05:13 UTC
(In reply to Li-Wen Hsu from comment #1)
I don't know how hard it would be to keep/restore support for 11 either. I didn't worry too much about it because the EoL date is not far off and I'm not sure if or how well the old port works on 11. I maintain the port because I appreciate its functionality but I am not a primary developer of the code. There have not been any updates (or responses to my inquiries) from the original developer in some years. The patch for 0.2.14 landed in my inbox from Michael Zoon at XigmaNAS. He says that Daisuke Aoyama (the original author) is one of the devs on his project.

I created the github repo as a way to bring sanity to managing the patches and to have a place to download the updated tarballs from.

AFAIK 0.2.14 does not have any new functionality, the updates just allow it to build on 12 and 13. If 0.2.13 is functional on FreeBSD 11 I'm open to keeping it around as a deprecated option.

I have not done any (build or other) testing on non-x86 platforms.

I would love for this code to be merged in to FreeBSD's src tree, I'm surprised it or something like it is not already in base.
Comment 3 John Nielsen 2021-05-10 22:32:42 UTC
Created attachment 224824 [details]
Update the port to 0.2.14 (tweaked)

I re-did the (Github) release of 0.2.14 following the merge of some recent pull requests. This new patch has the now-updated distinfo.
Comment 4 John Nielsen 2021-05-10 22:43:11 UTC
It might be possible to use iBFT for iSCSI booting on aarch64, but I don't have any hardware to test. I'm okay adding an arch restriction for now, i.e.
ONLY_FOR_ARCHS=	i386 amd64
Comment 5 John Nielsen 2021-05-18 19:09:02 UTC
Created attachment 225072 [details]
Update the port to 0.2.14 (take 3)

I have revised the upstream release and attached a new port patch to address the concerns above, among others.
 - The port now builds on FreeBSD 11, 12 and 13 (and should work for 14 as well). 
 - It is marked as only for i386 and amd64 architectures
 - The new upstream release includes some other community fixes
 - Updated WWW site to my github project as the old one no longer works
 - The VIMAGE option is selected by default to match GENERIC
 - The new DEBUG option easily enables debug output from the module
Comment 6 Li-Wen Hsu freebsd_committer freebsd_triage 2021-05-19 10:47:14 UTC
(In reply to John Nielsen from comment #5)
Thanks for updating the patch, I've adjusted the Makefile to pet portlint(1), portfmt(1) and portclippy(1) (but not totally following them):

https://github.com/lwhsu/freebsd-ports/commit/09f54f38c56b002cdd4de253e6bda4b3b2f452e2

Note that currently it fails at checksum stage, this is what we fetched:
SHA256 (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 6c5c9d17b97cf6ed977cda5d6f67409d68488cac768ba6202116a28f2decb2a2
SIZE (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 30628

Can you help verify this?
Comment 7 John Nielsen 2021-05-19 13:27:57 UTC
(In reply to Li-Wen Hsu from comment #6)
That is correct. Looks like I forgot to update the distinfo after the latest upstream changes. Here's what it should be (matches what you have):

TIMESTAMP = 1621430647
SHA256 (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 6c5c9d17b97cf6ed977cda5d6f67409d68488cac768ba6202116a28f2decb2a2
SIZE (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 30628
Comment 8 Li-Wen Hsu freebsd_committer freebsd_triage 2021-05-19 15:02:40 UTC
(In reply to John Nielsen from comment #7)
Great, please help me to check the final patch:

https://github.com/lwhsu/freebsd-ports/commit/1382d0a6bde7df90a8c6f6a36a748f9622ee5e80.patch
Comment 9 John Nielsen 2021-05-19 16:26:49 UTC
(In reply to Li-Wen Hsu from comment #8)
The patch looks great, thank you.
Comment 10 commit-hook freebsd_committer freebsd_triage 2021-05-23 06:59:50 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e9f100aa362c0379a4e56a23cba9064b4a4dc90e

commit e9f100aa362c0379a4e56a23cba9064b4a4dc90e
Author:     John Nielsen <john@jnielsen.net>
AuthorDate: 2021-05-11 05:04:29 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-05-23 06:57:08 +0000

    net/isboot-kmod: Update to 0.2.14

    PR:             255578

 net/isboot-kmod/Makefile                    | 19 ++++++-----
 net/isboot-kmod/distinfo                    |  5 +--
 net/isboot-kmod/files/patch-isboot.c (gone) | 50 -----------------------------
 3 files changed, 12 insertions(+), 62 deletions(-)
Comment 11 Li-Wen Hsu freebsd_committer freebsd_triage 2021-05-23 07:02:18 UTC
Committed and pushed.  Please consider to integrate this to the base, let me know if there is anything I can help.  Thanks!
Comment 12 John Nielsen 2021-05-25 14:25:16 UTC
Created attachment 225248 [details]
correct port and bump PORTREVISION

Whatever got pushed was incomplete and did not match any of the patches on this ticket. Here is a new patch correcting the port and bumping PORTREVISION.
Comment 13 John Nielsen 2021-05-25 14:25:30 UTC
Re-opening
Comment 14 Li-Wen Hsu freebsd_committer freebsd_triage 2021-05-25 15:08:27 UTC
(In reply to John Nielsen from comment #12)
Sorry, I must merged wrong branch while doing testing different things. I'll get this fixed soon.
Comment 15 commit-hook freebsd_committer freebsd_triage 2021-05-25 15:37:21 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5d8a19b005545c08058e437eb3e8a5b1106cea0b

commit 5d8a19b005545c08058e437eb3e8a5b1106cea0b
Author:     John Nielsen <john@jnielsen.net>
AuthorDate: 2021-05-25 15:11:27 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-05-25 15:11:27 +0000

    net/isboot-kmod: Fix the incorrect commit in the previous push

    PR:             255578

 net/isboot-kmod/Makefile  | 10 ++++++----
 net/isboot-kmod/distinfo  |  6 +++---
 net/isboot-kmod/pkg-descr |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)