sync bananapi4 18/11 #176
Merged
sync bananapi4 18/11 #176
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
Currently the build fails due to the following: mv: cannot stat 'linux-mediatek_filogic/target-dir-7872e783/etc/apk/repositories': No such file or directory as the changes done in the commit e031dab ("base-files: move apk distfeeds into directory") forget to adapt image generation part. While looking into this, I've realized, that we don't need this explicit handling in the image generating code since the feeds are solely configured by `base-files` and `apk` packages, so those should always provide the correct feeds content, so lets simply drop this unnecessary code. Moving away /etc/opkg is done to prevent opkg from picking up the remote feeds defined from base-files and only use the local feeds, but for apk we explicitly pass --repositories-file which disables parsing of /etc/apk/repositories and /etc/apk/repositories.d, so we do not need to backup anything. Fixes: #16981 Fixes: e031dab ("base-files: move apk distfeeds into directory") Reported-by: Chen Minqiang <[email protected]> Signed-off-by: Petr Štetiar <[email protected]> [jonas.gorski: add an explicit explanation where the original mv comes from and why we don't need it for apk]. Signed-off-by: Jonas Gorski <[email protected]>
Note that the old ad-hoc method did not explicitly align backup data to 64 KiB boundaries. Signed-off-by: Rodrigo Balerdi <[email protected]> Link: #16505 Signed-off-by: Robert Marko <[email protected]>
Note that the old ad-hoc method did not explicitly align backup data to 64 KiB boundaries. Also note that the qnap 301w has a 'rootfs_data' partition in the eMMC that is being ignored by fstools during boot, presumably due to a bug. This is why the partition is also ignored in the sysupgrade code and there is no definition of CI_DATAPART="rootfs_data". Signed-off-by: Rodrigo Balerdi <[email protected]> Link: #16505 Signed-off-by: Robert Marko <[email protected]>
Alphabetically sort devices in platform.sh Signed-off-by: Rodrigo Balerdi <[email protected]> Link: #16505 Signed-off-by: Robert Marko <[email protected]>
All ipq807x devices that were using the legacy 'mmc_do_upgrade' eMMC sysupgrade code were ported to the replacement 'emmc_do_upgrade' code. Signed-off-by: Rodrigo Balerdi <[email protected]> Link: #16505 Signed-off-by: Robert Marko <[email protected]>
Disable drm-i915 module for target x86/geode. Fixes: 77cfe8f ("x86: make i915 as a kmod with required firmware") Signed-off-by: Mieczyslaw Nalewaj <[email protected]> Link: #16977 Signed-off-by: Robert Marko <[email protected]>
This tool was build in the phase 2 build, there the TARGET dependencies are probably not meat. Mark it as non shared to build it together with the targets where this option is set. Signed-off-by: Hauke Mehrtens <[email protected]> Link: #16975 Signed-off-by: Robert Marko <[email protected]>
This tool was build in the phase 2 build, there the TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia dependecy was probably not meat. Mark it as non shared to build it together with the target where this option is set. Signed-off-by: Hauke Mehrtens <[email protected]> Link: #16975 Signed-off-by: Robert Marko <[email protected]>
Move settings CONFIG_INTEL_MEI_GSC_PROXY, CONFIG_INTEL_MEI_HDCP and CONFIG_INTEL_MEI_PXP to target generic. Signed-off-by: Mieczyslaw Nalewaj <[email protected]> Link: #16971 Signed-off-by: Robert Marko <[email protected]>
This symbol is no longer present. Signed-off-by: Rosen Penev <[email protected]> Link: #16770 Signed-off-by: Hauke Mehrtens <[email protected]>
These get dynamically set based on compiler version. Not relevant for targets. Signed-off-by: Rosen Penev <[email protected]> Link: #16770 Signed-off-by: Hauke Mehrtens <[email protected]>
C compiler can't parse '#else if'. Fixes: f84a9f7 ("ath79: add support for Huawei AP6010DN") Signed-off-by: Shiji Yang <[email protected]> Link: #16989 Signed-off-by: Hauke Mehrtens <[email protected]>
The config_get_bool also works with on/off, yes/no, true/false. Add 'main' section name. This will make it easier to change settings from uci. Add a link to documentation. Signed-off-by: Sergey Ponomarev <[email protected]> Link: #15579 Signed-off-by: Hauke Mehrtens <[email protected]>
Escape special char for package description for APK mkpkg as the description is passed as an args to mkpkg with --info option and can easily escape from the "". Currently escaped char `, $, ", \. Signed-off-by: Christian Marangi <[email protected]>
CONFIG_FB_INTEL is now visible on x86 since i915 driver is packaged as kmod now and it stops compilation, so add it to the generic config. Signed-off-by: Robert Marko <[email protected]>
Remove the remaining special handling of procd-ujail in a same way as the rest of the packages was handled in the commit 4c65359 ("build: fix including busybox, procd and apk/opkg in imagebuilder"). Fixes: 44598c2 ("build: remove broken dependency of metadata on toplevel .config variables") Signed-off-by: Petr Štetiar <[email protected]> Link: #16986 Signed-off-by: Robert Marko <[email protected]>
It seems, that handling of DEFAULT_PACKAGES is needed in more places, so lets move it into dedicated include file so it can be easily shared. Signed-off-by: Petr Štetiar <[email protected]> Link: #16986 Signed-off-by: Robert Marko <[email protected]>
Robert reported, that in firmware images generated by ASU, there is `apk` package manager missing after the commit 44598c2 ("build: remove broken dependency of metadata on toplevel .config variables"). That is happening, because apk got removed from `default_packages` list in `profiles.json`, which is being generated by `json_overview_image_info` Make target, which uses `scripts/json_overview_image_info.py` helper script, which gets the information from `DEFAULT_PACKAGES` Make variable. So lets fix it by providing `DEFAULT_PACKAGES` variable when its needed. The reason why we didn't added those packages as a dependency to base-files like any other packages, was to allow disabling them (in order to save space). Fixes: #16969 Fixes: openwrt/asu/issues/1084 Fixes: 44598c2 ("build: remove broken dependency of metadata on toplevel .config variables") Reported-by: Robert Marko <[email protected]> Signed-off-by: Petr Štetiar <[email protected]> Link: #16986 Signed-off-by: Robert Marko <[email protected]>
DEFAULT_PACKAGES handling was moved in commit 40be892 ("imagebuilder: move handling of DEFAULT_PACKAGES into shareable place") to `include/default-packages.mk`, but they weren't removed from ImageBuilder's Makefile, so lets remove it now. Once removed, I've noticed, that it stopped working as there is target.mk included later in that file, overriding the DEFAULT_PACKAGES again, so moved it after this target.mk include. Fixes: 40be892 ("imagebuilder: move handling of DEFAULT_PACKAGES into shareable place") Signed-off-by: Petr Štetiar <[email protected]>
Fix various issues, including potential crashes Signed-off-by: Felix Fietkau <[email protected]>
github-actions
bot
added
target/ipq806x
target/lantiq
target/gemini
target/tegra
target/imagebuilder
target/layerscape
target/bcm4908
target/kirkwood
target/mxs
target/sifiveu
target/x86
target/zynq
target/mpc85xx
target/imx
target/apm821xx
target/bcm53xx
target/qoriq
target/bmips
target/malta
target/pistachio
target/omap
target/archs38
target/octeon
target/at91
target/starfive
target/d1
target/ixp4xx
target/loongarch64
target/siflower
labels
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.
Thanks for your contribution to OpenWrt!
To help keep the codebase consistent and readable,
and to help people review your contribution,
we ask you to follow the rules you find in the wiki at this link
https://openwrt.org/submitting-patches
Please remove this message before posting the pull request.