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

Integration Candidate: 2020-06-24 #47

Merged
merged 10 commits into from
Jul 25, 2020
Merged

Integration Candidate: 2020-06-24 #47

merged 10 commits into from
Jul 25, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jul 1, 2020

Describe the contribution
Fix #45
Fix #48
Resolve #6
Resolve #50

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/108/checks

Expected behavior changes
PR #46 - Adds a null to the end of SrcFilename and DstFilename when using strncpy.

PR #49 - Support ELF files that have all strings, including ELF section names, in one single ".strtab" section in the ELF file.

PR #51 - Version reporting now uses the version numbers defined in elf_version.h and reports build number.

System(s) tested on
Ubuntu - CI

Additional context
Part of nasa/cFS#108

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Christopher D. Knight, NASA-ARC
Joseph Hickey, Vantage Systems, Inc.
Gerardo E. Cruz-Ortiz, NASA-GSFC

Support ELF files that have all strings, including ELF section names,
in one single ".strtab" section in the ELF file.

This gives preferential treatment to a section named ".strtab" as this
should always be the section which contains the names for the ".symtab"
section.

This should also be true of ELF files that contain other strtab sections,
such as a ".dynstr" section.
@astrogeco astrogeco marked this pull request as ready for review July 6, 2020 14:06
astrogeco and others added 5 commits July 8, 2020 10:58
Fix #48, string table identification.
Create version file and macros to match implementation in other cFS repositories
Reformat string output for "elf2cfetbl -V"
Add string helper macro
Add macros for buildnumber, elf2cfetbl version, and version string
Set buildnumber
Resolve #50, Add baseline and build number to version.h
@astrogeco astrogeco merged commit 7a3d1ca into master Jul 25, 2020
@skliper skliper added this to the 3.2.0 milestone Aug 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants