Modify the patch for 1.7 compiler flags.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-core/busybox/busybox-morello_morello-1.5.bb | 2 +- ...1-Remove-elf-patch-append-toolchain-with-relative-path.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb b/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb index 0fdc60c..6f3002e 100644 --- a/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb +++ b/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \ file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"
SRCBRANCH = "morello/master" -SRCREV = "0f2436d16ddbca4467808735b1357b46e67aeddf" +SRCREV = "424ea869b9445be4bbb0ccd9d4007c39d82e4992" diff --git a/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch b/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch index ebac784..ee70cbe 100644 --- a/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch +++ b/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch @@ -15,7 +15,7 @@ index f9d916f98..4c95c8d56 100644 @@ -142,10 +142,9 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) # Morello Settings MORELLO_TARGET := aarch64-linux-musl_purecap - MORELLO_FLAGS := -Wno-cheri-inefficient -march=morello+c64 + MORELLO_FLAGS := -Wno-cheri-inefficient -march=morello -mabi=purecap -ELF_PATCH := morello_elf MUSL_HOME := ../../musl-bin KHEADERS := ../morello-linux-headers/usr/include/