KolibriOS/kolibrios
15
21
Fork 36
Code Issues 129 Pull Requests 31 Actions 1 Projects 1 Releases Wiki Activity

kernel: Clean up svn-related code and data #146

Merged
Sweetbread merged 1 commits from dunkaist/kolibrios:pr-clean-up-after-svn into main 2025-03-17 19:17:45 +00:00
Conversation 6 Commits 1 Files Changed 9 +177 -68
dunkaist commented 2025-03-15 02:10:55 +00:00
Owner
Copy Link
  • Rearrange sf18.13 version structure to
    • mention git hash and release offset,
    • separate OS release and kernel ABI numbers,
    • include an optional debug tag.
  • Update the boot log and the blue screen to print the new fields.
  • Update docs.
  • No breaking changes.

Resolves #99.

* Rearrange sf18.13 version structure to + mention git hash and release offset, + separate OS release and kernel ABI numbers, + include an optional debug tag. * Update the boot log and the blue screen to print the new fields. * Update docs. * No breaking changes. Resolves #99.
dunkaist added 1 commit 2025-03-15 02:10:58 +00:00
kernel: Clean up svn-related code and data
Some checks failed
Build system / Check kernel codestyle (pull_request) Successful in 30s
Details
Build system / Build (pull_request) Failing after 1m49s
Details
ea9a3f7c6c 
* Rearrange sf18.13 version structure to
  + mention git hash and release offset,
  + separate OS release and kernel ABI numbers,
  + include an optional debug tag.
* Update the boot log and the blue screen to print the new fields.
* Update docs.
* No breaking changes.

Resolves #99.
dunkaist commented 2025-03-15 02:26:00 +00:00
Author
Owner
Copy Link

The CI build has failed because its fasm 1.71.57 is outdated: 69e078cced

The CI build has failed because its fasm 1.71.57 is outdated: https://github.com/tgrysztar/fasm/commit/69e078ccedab073396be01df55868be6f3ad2ca3
mxlgv added a new dependency 2025-03-15 21:16:48 +00:00
#148 programs/shell: Show new fields of sf18.13 struct
mxlgv added the Category/Kernel
Priority
Critical
 labels 2025-03-15 21:17:48 +00:00
dunkaist commented 2025-03-16 03:30:31 +00:00
Author
Owner
Copy Link

I updated these two fasm binaries on the server:

/home/autobuild/tools/bin/fasm
/home/autobuild/tools/win32/bin/fasm

$ whoami
autobuild

$ fasm
flat assembler  version 1.73.32
usage: fasm <source> [output]
optional settings:
 -m <limit>         set the limit in kilobytes for the available memory
 -p <limit>         set the maximum allowed number of passes
 -d <name>=<value>  define symbolic variable
 -s <file>          dump symbolic information for debugging

I don't know if the CI container should be rebuilt somehow, but just triggering the build again produces the same error with the old fasm.

I updated these two fasm binaries on the server: ``` /home/autobuild/tools/bin/fasm /home/autobuild/tools/win32/bin/fasm $ whoami autobuild $ fasm flat assembler version 1.73.32 usage: fasm <source> [output] optional settings: -m <limit> set the limit in kilobytes for the available memory -p <limit> set the maximum allowed number of passes -d <name>=<value> define symbolic variable -s <file> dump symbolic information for debugging ``` I don't know if the CI container should be rebuilt somehow, but just triggering the build again produces the same error with the old fasm.
dunkaist commented 2025-03-16 03:45:04 +00:00
Author
Owner
Copy Link

To use the environment variables mentioned in this PR we need to export them. E.g. by calling such a script just before calling tup:

$ cat /path/to/kos32-export-env_vars
#!/bin/bash

REPO=$1
export KOLIBRIOS_BUILD_CMTID=$(git -C $REPO log -1 --oneline --abbrev=20 kernel/ | cut -c -8 | gawk '{print "0x"$1}')
export KOLIBRIOS_BUILD_OFFSET=$(git -C $REPO rev-list --count $(git -C $REPO tag -l --sort=-creatordate | head -n 1)..HEAD)

@Sweetbread, could you put this script to the CI container and then call it before 'tup' command like this?
source kos32-export-env_vars /path/to/kolibrios_localcopy_git

To use the environment variables mentioned in this PR we need to export them. E.g. by calling such a script just before calling tup: ``` $ cat /path/to/kos32-export-env_vars #!/bin/bash REPO=$1 export KOLIBRIOS_BUILD_CMTID=$(git -C $REPO log -1 --oneline --abbrev=20 kernel/ | cut -c -8 | gawk '{print "0x"$1}') export KOLIBRIOS_BUILD_OFFSET=$(git -C $REPO rev-list --count $(git -C $REPO tag -l --sort=-creatordate | head -n 1)..HEAD) ``` @Sweetbread, could you put this script to the CI container and then call it before 'tup' command like this? `source kos32-export-env_vars /path/to/kolibrios_localcopy_git`
Sweetbread force-pushed pr-clean-up-after-svn from ea9a3f7c6c to b6c850c47c 2025-03-17 11:43:29 +00:00 Compare
Sweetbread added 2 commits 2025-03-17 11:47:29 +00:00
ci: show environment variables de3332d6aa
ci: Change PATH var
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 29s
Details
Build system / Build (pull_request) Successful in 4m59s
Details
9813144f6d 
Due to update of toolchain container, fasm in /home/autobuild/... folder
mxlgv was assigned by Sweetbread 2025-03-17 13:37:38 +00:00
Sweetbread added 1 commit 2025-03-17 14:22:07 +00:00
ci: setup variables
Some checks failed
Build system / Check kernel codestyle (pull_request) Successful in 1m8s
Details
Build system / Build (pull_request) Failing after 1m3s
Details
0db08f2364
Sweetbread force-pushed pr-clean-up-after-svn from 0db08f2364 to a910af190c 2025-03-17 14:24:28 +00:00 Compare
Sweetbread added 1 commit 2025-03-17 14:56:18 +00:00
tmp
Some checks failed
Build system / Check kernel codestyle (pull_request) Successful in 29s
Details
Build system / Build (pull_request) Has been cancelled
Details
ad7a703fb6
Sweetbread force-pushed pr-clean-up-after-svn from ad7a703fb6 to 739c6a2faf 2025-03-17 14:59:07 +00:00 Compare
Sweetbread added a new dependency 2025-03-17 18:25:22 +00:00
#161 CI: Setup environment variables
Sweetbread removed a dependency 2025-03-17 18:25:48 +00:00
#161 CI: Setup environment variables
Sweetbread added a new dependency 2025-03-17 18:26:12 +00:00
#161 CI: Setup environment variables
dunkaist commented 2025-03-17 18:30:25 +00:00
Author
Owner
Copy Link

I have checked the CI build, it has both the git-hash and release offset in it. The kernel ABI is printed to the log too. Looks good to me.

I have checked the CI build, it has both the git-hash and release offset in it. The kernel ABI is printed to the log too. Looks good to me.
Sweetbread force-pushed pr-clean-up-after-svn from 739c6a2faf to b6c850c47c 2025-03-17 19:07:35 +00:00 Compare
Sweetbread force-pushed pr-clean-up-after-svn from b6c850c47c to 55d641b0da 2025-03-17 19:07:52 +00:00 Compare
Sweetbread approved these changes 2025-03-17 19:14:22 +00:00
Sweetbread left a comment
Owner
Copy Link

image.png

![image.png](/attachments/6d47bf67-550b-42af-aac7-958e9771aaff)
image.png
13 KiB
❤️ 1
Sweetbread requested review from mxlgv 2025-03-17 19:14:44 +00:00
Sweetbread added the
PR
Review required
 label 2025-03-17 19:14:54 +00:00
mxlgv approved these changes 2025-03-17 19:17:05 +00:00
Sweetbread scheduled this pull request to auto merge when all checks succeed 2025-03-17 19:17:35 +00:00
Sweetbread merged commit 55d641b0da into main 2025-03-17 19:17:45 +00:00
Sweetbread deleted branch pr-clean-up-after-svn 2025-03-17 19:18:05 +00:00
Sweetbread added
PR
Ready to merge
 and removed
PR
Review required
 labels 2025-03-17 19:18:21 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Sweetbread
mxlgv
Labels
Clear labels
C
Category/Applications
Category/Drivers
Category/General
Category/Kernel
Category/Libraries
Eolite
FASM
FS
GSoC
This issue in GSoC program
 HardwareTested
HLL
Influence/Settings
Influence/Text/TYPO
IRCC
Kernel
Kind
Breaking
Breaking change that won't be backward compatible
Kind
Bug
Something is not working
Kind
Build
Kind
Documentation
Documentation changes
Kind
Enhancement
Improve existing functionality
Kind
Feature
New functionality
Kind
Security
This is security issue
Kind
Testing
Issue or pull request related to testing
Pay for the code
Paid task
PR
Conflicts
PR conflicts with main
PR
Dependent
This PR is dependent on another PR
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
PR
Ready to merge
Pull request is ready for merge
PR
Request changes
Changes requested in pull request
PR
Review required
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
No Label Category/Kernel
Priority
Critical
PR
Ready to merge
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ace-dent Burer Doczom dunkaist IgorA Leency mxlgv ramenu rgimad sdongles Sweetbread
No Assignees mxlgv
3 Participants
Notifications
Due Date
No due date set.
Blocks
#148 programs/shell: Show new fields of sf18.13 struct
KolibriOS/kolibrios
Depends on
#161 CI: Setup environment variables
KolibriOS/kolibrios
Reference: KolibriOS/kolibrios#146
Delete Branch "dunkaist/kolibrios:pr-clean-up-after-svn"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?