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.

Sign up for GitHub

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

Jump to bottom

Update dtc to 1.7.0 #7754

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Update dtc to 1.7.0 #7754

merged 2 commits into from
Feb 8, 2024

Conversation

rlmenge
Copy link
Contributor

@rlmenge rlmenge commented Feb 7, 2024 •
edited
Loading

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge
Summary

Dtc's latest version is 1.7.0. Therefore, update to this version. To support this version, set the SETUPTOOLS_SCM_PRETEND_VERSION to properly register the version and alter the logic to setting the root directory. Additionally, add check section according to makefile.

Note that the SETUPTOOLS_SCM_PRETEND_VERSION is a workaround as desribed here: pypa/setuptools-scm#357 but will not be needed in future versions thanks to dtc commit cd3e2304f4a9c4f725dcc548082ccc6c89d078a4

Change Log
  • Update to version 1.7.0
  • Add %check section
Does this affect the toolchain?

NO

Test Methodology
  • local build
image image

@rlmenge rlmenge added the 3.0-dev PRs Destined for AzureLinux 3.0 label Feb 7, 2024
@rlmenge rlmenge requested a review from a team as a code owner February 7, 2024 20:41
PawelWMS
PawelWMS reviewed Feb 7, 2024
View reviewed changes
SPECS/dtc/dtc.spec
%make_install \
PREFIX=%{buildroot}%{_prefix} \
LIBDIR=%{_libdir} \
BINDIR=%{_bindir} \
INCLUDEDIR=%{_includedir}

%check
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for adding that!

PawelWMS
PawelWMS reviewed Feb 7, 2024
View reviewed changes
SPECS/dtc/dtc.spec

%build
export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment explaining why this export is needed, so it's easier to understand in the future?

Copy link
Contributor Author

@rlmenge rlmenge Feb 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done! Also while setting this variable is the recommended way for this release (according to dtc), it looks like it will change in future releases so I also mentioned that :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is a link to the referenced commit: https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/setup.py?id=cd3e2304f4a9c4f725dcc548082ccc6c89d078a4

@rlmenge rlmenge force-pushed the rlmenge/3.0/dtc-1.7.0 branch from 63032b0 to 34d8f11 Compare February 8, 2024 00:53
@rlmenge rlmenge merged commit c7872df into 3.0-dev Feb 8, 2024
@rlmenge rlmenge deleted the rlmenge/3.0/dtc-1.7.0 branch February 8, 2024 00:59
Adub17030MS pushed a commit that referenced this pull request Feb 9, 2024
@rlmenge @Adub17030MS
Update dtc to 1.7.0 (#7754)
7580d34 
Dtc's latest version is 1.7.0. Therefore, update to this version. To support this version, set the SETUPTOOLS_SCM_PRETEND_VERSION to properly register the version and alter the logic to setting the root directory. Additionally, add check section according to Makefile.

Note that the SETUPTOOLS_SCM_PRETEND_VERSION is a workaround but will not be needed in future versions thanks to dtc commit cd3e2304f4a9c4f725dcc548082ccc6c89d078a4
anphel31 pushed a commit that referenced this pull request Feb 13, 2024
@rlmenge @anphel31
Update dtc to 1.7.0 (#7754)
40c7e65 
Dtc's latest version is 1.7.0. Therefore, update to this version. To support this version, set the SETUPTOOLS_SCM_PRETEND_VERSION to properly register the version and alter the logic to setting the root directory. Additionally, add check section according to Makefile.

Note that the SETUPTOOLS_SCM_PRETEND_VERSION is a workaround but will not be needed in future versions thanks to dtc commit cd3e2304f4a9c4f725dcc548082ccc6c89d078a4
BettyRain pushed a commit that referenced this pull request Feb 15, 2024
@rlmenge
Update dtc to 1.7.0 (#7754)
efae1d2 
Dtc's latest version is 1.7.0. Therefore, update to this version. To support this version, set the SETUPTOOLS_SCM_PRETEND_VERSION to properly register the version and alter the logic to setting the root directory. Additionally, add check section according to Makefile.

Note that the SETUPTOOLS_SCM_PRETEND_VERSION is a workaround but will not be needed in future versions thanks to dtc commit cd3e2304f4a9c4f725dcc548082ccc6c89d078a4
Camelron pushed a commit that referenced this pull request Mar 1, 2024
@rlmenge @Camelron
Update dtc to 1.7.0 (#7754)
178cb94 
Dtc's latest version is 1.7.0. Therefore, update to this version. To support this version, set the SETUPTOOLS_SCM_PRETEND_VERSION to properly register the version and alter the logic to setting the root directory. Additionally, add check section according to Makefile.

Note that the SETUPTOOLS_SCM_PRETEND_VERSION is a workaround but will not be needed in future versions thanks to dtc commit cd3e2304f4a9c4f725dcc548082ccc6c89d078a4
Xiaohong-Deng pushed a commit to Xiaohong-Deng/azurelinux that referenced this pull request Nov 23, 2024
@rlmenge
Update dtc to 1.7.0 (microsoft#7754)
1f84931 
Dtc's latest version is 1.7.0. Therefore, update to this version. To support this version, set the SETUPTOOLS_SCM_PRETEND_VERSION to properly register the version and alter the logic to setting the root directory. Additionally, add check section according to Makefile.

Note that the SETUPTOOLS_SCM_PRETEND_VERSION is a workaround but will not be needed in future versions thanks to dtc commit cd3e2304f4a9c4f725dcc548082ccc6c89d078a4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nisamson nisamson nisamson approved these changes

@dmcilvaney dmcilvaney dmcilvaney approved these changes

@PawelWMS PawelWMS PawelWMS approved these changes

Assignees
No one assigned
Labels
3.0-dev PRs Destined for AzureLinux 3.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rlmenge @nisamson @dmcilvaney @PawelWMS