Skip to content

Commit

Permalink
poky: fix unppack errors for poky recipes after upstream renamed branch
Browse files Browse the repository at this point in the history
Previous change fixed only fetch by using MIRRORS variable. This proved
insufficient since branch name is also used during do_unpack.

Instead add bbapppend files replacing SRC_URI for each affectyed recipe.
  • Loading branch information
Josua-SR committed Oct 21, 2024
1 parent e26dd5e commit 833b823
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
8 changes: 2 additions & 6 deletions conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@ LAYERSERIES_COMPAT_solidrun-arm-imx8 = "kirkstone"
BBMASK += "meta-bsp/recipes-kernel/linux-firmware/.*\.bbappend"

BBFILES_DYNAMIC += " \
core:${LAYERDIR}/dynamic-layers/poky/meta/recipes-*/*/*.bb \
core:${LAYERDIR}/dynamic-layers/poky/meta/recipes-*/*/*.bbappend \
meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/recipes-*/*/*.bb \
meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/recipes-*/*/*.bbappend \
meta-hailo-accelerator:${LAYERDIR}/dynamic-layers/meta-hailo-accelerator/recipes-*/*/*.bb \
meta-hailo-accelerator:${LAYERDIR}/dynamic-layers/meta-hailo-accelerator/recipes-*/*/*.bbappend \
"

# upstream project branch name changes
MIRRORS:append = "git://github.com/cracklib/cracklib;protocol=https;branch=master git://github.com/cracklib/cracklib;protocol=https;branch=main \n"
MIRRORS:append = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \n"
MIRRORS:append = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main \n"
MIRRORS:append = "git://github.com/intel/bmap-tools;branch=master;protocol=https git://github.com/intel/bmap-tools;branch=main;protocol=https \n"
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# upstream renamed branch
SRC_URI:remove = " git://github.com/cracklib/cracklib;protocol=https;branch=master"
SRC_URI:append = " git://github.com/cracklib/cracklib;protocol=https;branch=main"
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# upstream renamed branch
SRC_URI:remove = " git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master"
SRC_URI:append = " git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main"
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# upstream renamed branch
SRC_URI:remove = " git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
SRC_URI:append = " git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# upstream renamed branch
SRC_URI:remove = " git://github.com/intel/${BPN};branch=master;protocol=https"
SRC_URI:append = " git://github.com/intel/${BPN};branch=main;protocol=https"

0 comments on commit 833b823

Please sign in to comment.