[hardknott] audit 2-6: deprecated logic#486
Merged
amstewart merged 6 commits intoni:nilrt/master/hardknottfrom Oct 21, 2022
Merged
[hardknott] audit 2-6: deprecated logic#486amstewart merged 6 commits intoni:nilrt/master/hardknottfrom
amstewart merged 6 commits intoni:nilrt/master/hardknottfrom
Conversation
The hardknott mainline does not support ARM, and the nisdbootconfig recipe has been dropped from the distribution. Remove the unused ARM logic. Signed-off-by: Alex Stewart <alex.stewart@ni.com>
This commit functionally reverts meta-nilrt commit da648a5. The ARCH_ABI_EXT variable extends the OE-native ABIEXTENSION variable to include an `hf` suffix, if the machine is tuned with the hardfloat call convention. base-files-nilrt then uses that expanded ABI to namespace multiarch libs. Hardfloat is only relevant to ARM machines, which hardknott does not support. Remove this logic, as it is no longer needed. Signed-off-by: Alex Stewart <alex.stewart@ni.com>
Signed-off-by: Alex Stewart <alex.stewart@ni.com>
The hardknott mainline currently only supports x64 architectures. Merge the x64-append recipe logic into the default recipe variables. Signed-off-by: Alex Stewart <alex.stewart@ni.com>
`nilrt-nxg` is no longer a supported distro flavor; remove logic which references it. Signed-off-by: Alex Stewart <alex.stewart@ni.com>
The hardknott mainline only supports x64 architectures, so consolidate the pkggrp RDEPENDS for x64 into the default variable. Signed-off-by: Alex Stewart <alex.stewart@ni.com>
shruthi-ravi
approved these changes
Oct 20, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR removes branching logic from recipes which behave differently when the
MACHINEtype is set toarmor theDISTROis set tonilrt-nxg. The former is inappropriate because the hardknott mainline does not support ARM; the later is inappropriate because thenilrt-nxgdistro has been deprecated for years.In a couple recipes (
initscripts-nilrt*andpackagegroup-ni-xfce), when I collapsed the branching logic into a generic variable, I also sorted the variable's elements - which is why some variable diffs show more changes than you would otherwise expect. They're just sorts.Testing