Re: LibBSD | Update to 6-freebsd-14 (!17)
Merge request !17 was merged Merge request URL: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 Project:Branches: eagleirony/rtems-libbsd:6-freebsd-14-main to rtems/pkg/rtems-libbsd:main Author: Aaron Nyholm -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114553 Thanks for catching this. This and others are updated. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114553 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm pushed new commits to merge request !17 Merge request URL: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 * c5c85f0d - Update to FreeBSD stable/14 2024-10-26 -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber started a new discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114474 There are some merge markers left, for example: ```diff diff --git a/freebsd/crypto/openssl/engines/e_afalg.c b/freebsd/crypto/openssl/engines/e_afalg.c index f8f655d07..cdd475683 100644 --- a/freebsd/crypto/openssl/engines/e_afalg.c +++ b/freebsd/crypto/openssl/engines/e_afalg.c @@ -1,7 +1,11 @@ #include /* +<<< /opt/work/aaron/rtems/libbsd/rtems-libbsd/freebsd/crypto/openssl/engines/e_afalg.c * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +=== + * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. +>>> /home/aaron/freebsd/crypto/openssl/engines/e_afalg.c * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy ``` -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114474 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114472 Good find thanks, restored. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114472 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114471 Reverted -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114471 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm pushed new commits to merge request !17 Merge request URL: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 * 9e1e384e - Update to FreeBSD stable/14 2024-10-26 -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114468 This file should be moved to `README.md`. It can happen after this is merged. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114468 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114467 Next time unrelated changes should be added through individual commits. This commit contains a lot of stuff which is present as an individual commit on `6-freebsd-12`. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114467 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114466 This file has no copyright and license: `update_all.py`. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114466 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber started a new discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114465 The script `find_licenses_and_unused.sh` is removed. The file `freebsd/COPYRIGHT` is removed. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114465 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber started a new discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114464 Local paths should not be included: ```diff rtemsbsd/rtems/rtems-bsd-regdomain.c: $(FREEBSD_SRC)/lib/lib80211/regdomain.xml - rtems-bin2c -C $< $@ + /opt/work/rtems/6/bin/rtems-bin2c -C $> $@ ``` -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114464 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber started a new discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114463 The commit reverts URL changes: ```diff diff --git a/README.rst b/README.rst index 68da0f7b8..994da5ae3 100644 --- a/README.rst +++ b/README.rst @@ -32,9 +32,9 @@ do this. The individual steps are explained afterwards. sandbox="$PWD/sandbox" mkdir sandbox cd "$sandbox" -git clone https://gitlab.rtems.org/rtems/tools/rtems-source-builder.git -git clone https://gitlab.rtems.org/rtems/rtos/rtems.git -git clone https://gitlab.rtems.org/rtems/pkg/rtems-libbsd.git +git clone git://git.rtems.org/rtems-source-builder.git +git clone git://git.rtems.org/rtems.git +git clone git://git.rtems.org/rtems-libbsd.git cd "$sandbox" cd rtems-source-builder/rtems ../source-builder/sb-set-builder --prefix="$sandbox/rtems/6" 6/rtems-arm @@ -67,9 +67,9 @@ do this. The individual steps are explained afterwards. .. code-block:: none $ cd "$sandbox" - $ git clone https://gitlab.rtems.org/rtems/tools/rtems-source-builder.git - $ git clone https://gitlab.rtems.org/rtems/rtos/rtems.git - $ git clone https://gitlab.rtems.org/rtems/pkg/rtems-libbsd.git + $ git clone git://git.rtems.org/rtems-source-builder.git + $ git clone git://git.rtems.org/rtems.git + $ git clone git://git.rtems.org/rtems-libbsd.git ``` -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114463 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber started a new discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114462 The commit removes `.waf*` from .gitignore. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114462 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114460 Good point. Updated -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114460 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm pushed new commits to merge request !17 Merge request URL: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 * e4d55261 - Update to FreeBSD stable/14 2024-10-26 -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114459 Unintentional. Thanks for spotting this. Restored -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114459 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114439 The commit message could be a bit more detailed. What is an update to 6-freebsd-14? You update to a new FreeBSD baseline, so the subject should be something like `Update to FreeBSD stable/14 2024-10-26`. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114439 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114438 The change removes the `CODEOWNERS` file. Is this intentional? -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114438 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114436 Updated the MR to revert this change. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114436 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Aaron Nyholm pushed new commits to merge request !17 Merge request URL: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 * 9be5e8b5 - Update to 6-freebsd-14 -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114363 A conflict resolution can always produce errors. If they get noticed, they should get fixed. So I would just update the commit and that's it. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114363 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114364 If automated an MR would be created on a clean merge or an issue on a conflict. The CI is about notification of FreeBSD commit changes as they happen. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114364 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114362 Would adding the copyright back on this branch and `current` as a short term measure work until something else is put in place be acceptable? We do this with the understanding it may be accidentally be removed. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114362 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114361 We have no means to track the attribution for the changes and we should. As you say the churn is low so a document could work. My concern in this case is the removal could happen again. I will not remember to check. And add copyright to all the files like this case would not scale across all the changes we have in the FreeBSD sources. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114361 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114359 I am not sure if automating this is worth the cost. The rate of change in the copyright area is really low. Also the SPDX work is mostly done I guess. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114359 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Gedare Bloom commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114356 To enable automation I would think about going a different route and create a mapping between the freebsd filenames (paths) in the RTEMS patches, and their authors. Creating the initial mapping will be a challenge, but once it is done, it can be maintained easily. Then a script can be used to inject the copyright statements during merges. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114356 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114355 We will have CI to handle the updates from FreeBSD. This may generate a MR so there will always be a review. Manual fixing still needs to work within the guards and so I am not what is here works -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114355 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114354 I would not try to fix merge conflicts automatically. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114354 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114346 Yes I agree adding guards in the copyright statement would be unusual. Manual management complicates the process to maintain this code and I do not know how that would be documented. How would this be dealt with this automatically? -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114346 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114345 I am not sure if we should add guards to copyright statements. If you get conflicts in this area you have to resolve them manually. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114345 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114334 There is no standard RTEMS guards around this so I suppose it was assumed this was from upstream and removed there. The more automated we make the update process the more important guards are. I do not know how we are to track changes that are not guarded? -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114334 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114278 ```patch diff --git a/freebsd/sys/kern/subr_sleepqueue.c b/freebsd/sys/kern/subr_sleepqueue.c index 9665c02fe8269aa82348cb1d6bddb665c2579676..26df4b59d39b8b022281f333d996ca437e098415 100644 --- a/freebsd/sys/kern/subr_sleepqueue.c +++ b/freebsd/sys/kern/subr_sleepqueue.c @@ -1,10 +1,9 @@ #include /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 John Baldwin - * Copyright (c) 2015 embedded brains GmbH * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ``` Why was our copyright removed from this file? The RTEMS-specific implementation is still from us. The license change is fine. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114278 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Chris Johns commented on a discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114277 There has been a discussion discord `#networking` channel about the procedure. Can you please make a comment there? Thanks. -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114277 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
Re: LibBSD | Update to 6-freebsd-14 (!17)
Sebastian Huber commented: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114276 The FreeBSD commit 9679df8eea14a5f707aa870328d9bb211f12c570 is not included in the FreeBSD `main` branch, so the target branch of this MR should not be `main`. We have to create a new branch `6-freebsd-14` first. Which branch did you use as the starting point for your work? -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114276 You're receiving this email because of your account on gitlab.rtems.org. ___ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
