build: fix profile duplication for imagebuilder #3777
Closed
Conversation
This file contains 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
Dumping device info more than once for alternative device title leads to duplication in `.targetinfo` and `.profiles.mk`, which causes problem in imagebuilder. When this happens, 1. `make info` outputs duplicate/redundent information 2. `make image` does not install DEVICE_PACKAGES as it should 3. manifest filename becomes quirky Remove duplicates to fix above bugs. In `make menuconfig`, users can still press <?> to see alternative device titles during target profile selection. Signed-off-by: Kuan-Yi Li <kyli@abysm.org>
|
Could you please have a look at this patch and see if it resolves the issue? |
Cool! I applied your patch, rebuild the image builder for both of the examples and it worked like a charm! Please feel free to close this PR whenever you see fit. Thanks! |
|
I'll close this as it's superseded via https://patchwork.ozlabs.org/project/openwrt/list/?series=224020 |
adschm
added
the
build/scripts/tools
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Dumping device info more than once for alternative device title leads to
duplication in
.targetinfoand.profiles.mk, which causes problem inimagebuilder.
When this happens,
make infooutputs duplicate/redundent informationmake imagedoes not install DEVICE_PACKAGES as it shouldRemove duplicates to fix above bugs.
In
make menuconfig, users can still press <?> to see alternativedevice titles during target profile selection.
Signed-off-by: Kuan-Yi Li kyli@abysm.org
Cc: @aparcar
Two examples to reproduce the problem:
Imagination Technologies Creator Ci40
make info, profile appeared twice, with exact same infomake image PROFILE="img_creator-ci40"and observe the build message,kmod-tpm-i2c-infineonis not installedopenwrt-pistachio-img_creator-ci40.manifest, manifest filename is nowopenwrt-pistachio-img_creator-ci40-img_creator-ci40.manifestRaspberry Pi 2B/2B 1.2 (32bit)
make info, profile appeared 3 times, with exact same infomake image PROFILE="rpi-2"and observe the build message,kmod-brcmfmacis not installedopenwrt-bcm27xx-bcm2709-rpi-2.manifest, manifest filename is nowopenwrt-bcm27xx-bcm2709-rpi-2-rpi-2-rpi-2.manifest