pomfi/balena-allwinner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

u-boot_2019.04.bbappend: Fix applying of patches

Browse source 
The eMMC patch has been removed because it applies
from meta-sunxi.
The resin-kconfig-integration patch has been removed
and a re-worked version of it has been applied.

Changelog-entry: U-boot patches fixup
Signed-off-by: Vicentiu Galanopulo <vicentiu@balena.io>
This commit is contained in:
Vicentiu Galanopulo 2019-10-30 14:42:52 +01:00
parent 7954383391
commit e32f34f65b
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2019.04.bbappend
View file

@ -3,17 +3,15 @@ inherit resin-u-boot pythonnative
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
#remove the resin-specific-env-integration-kconfig.patch patch from meta-resin # remove the resin-specific-env-integration-kconfig.patch patch from meta-resin
#and the 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch patch from # because it fails to apply
#meta-sunxi because these fail to apply SRC_URI_remove = "file://resin-specific-env-integration-kconfig.patch"
SRC_URI_remove = "file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://resin-specific-env-integration-kconfig.patch"
#Add updated patches for 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch # Add re-worked patch which was previously removed
#and for 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch SRC_URI_append = " \
SRC_URI += "file://0001-Add-Resin-specific-boot-command.patch \ file://0001-Add-Resin-specific-boot-command.patch \
file://resin-specific-env-integration-kconfig.patch \ file://resin-specific-env-integration-kconfig_reworked.patch \
" "
do_deploy_append() { do_deploy_append() {
install -m 0644 ${WORKDIR}/armbianEnv.txt ${DEPLOYDIR}/armbianEnv.txt install -m 0644 ${WORKDIR}/armbianEnv.txt ${DEPLOYDIR}/armbianEnv.txt