From 8d12cc3e791fb413fbed610b8c4f30ceca247a54 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 29 Jun 2017 10:54:29 +0000 Subject: bsp: Fix syslinux build issue with GCC 7 We are stuck with SYSLINUX 4.06 due to design flaws in how deployment works with YBD and Morph. In order to fix compile issues with GCC 7 I have updated the embedded copy of lzo/ in the SYSLINUX source tree from the syslinux.git 'master' branch. --- strata/bsp-x86_32-generic.morph | 4 ++-- strata/bsp-x86_64-generic.morph | 4 ++-- strata/bsp-x86_both-tools.morph | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 9c7df925..8c558dca 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -20,7 +20,7 @@ chunks: - name: syslinux morph: strata/bsp-x86_32-generic/syslinux.morph repo: upstream:syslinux - ref: f92b88bc6c65ba71dad92fe7da7b7085607b439a - unpetrify-ref: baserock/syslinux-4.06-gcc5-glibc2.20 + ref: 02ab5d34ba0a90e3b6dd78034d7c470c77500119 + unpetrify-ref: baserock/syslinux-4.06-gcc7 build-depends: - nasm diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index d5c267a4..ddef23bd 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -20,7 +20,7 @@ chunks: - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux - ref: f92b88bc6c65ba71dad92fe7da7b7085607b439a - unpetrify-ref: baserock/syslinux-4.06-gcc5-glibc2.20 + ref: 02ab5d34ba0a90e3b6dd78034d7c470c77500119 + unpetrify-ref: baserock/syslinux-4.06-gcc7 build-depends: - nasm diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index f5102cc0..5a72caa7 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -15,7 +15,7 @@ chunks: - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux - ref: f92b88bc6c65ba71dad92fe7da7b7085607b439a - unpetrify-ref: baserock/syslinux-4.06-gcc5-glibc2.20 + ref: 02ab5d34ba0a90e3b6dd78034d7c470c77500119 + unpetrify-ref: baserock/syslinux-4.06-gcc7 build-depends: - nasm -- cgit v1.2.1