From 399896b16e276f7c1a43c5c7efc71cf669cabb5f Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 25 Feb 2015 15:58:47 +0000 Subject: Put syslinux header files in syslinux-devel It puts headers for building com32 binaries in a different path, presumably because they're not for building normal libraries, so putting them in the search paths for normal libraries would just cause conflicts. --- strata/bsp-x86_32-generic/syslinux.morph | 8 ++++++-- strata/bsp-x86_64-generic/syslinux.morph | 4 ++++ strata/bsp-x86_both-tools/syslinux.morph | 8 ++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/strata/bsp-x86_32-generic/syslinux.morph b/strata/bsp-x86_32-generic/syslinux.morph index c0f15807..4570865b 100644 --- a/strata/bsp-x86_32-generic/syslinux.morph +++ b/strata/bsp-x86_32-generic/syslinux.morph @@ -1,8 +1,12 @@ name: syslinux kind: chunk +products: +- artifact: syslinux-devel + include: + - (usr/)?share/syslinux/com32.* build-commands: - make clean -- make -- make installer +- make NO_WERROR=1 +- make NO_WERROR=1 installer install-commands: - make INSTALLROOT="$DESTDIR" install diff --git a/strata/bsp-x86_64-generic/syslinux.morph b/strata/bsp-x86_64-generic/syslinux.morph index 43356e36..4570865b 100644 --- a/strata/bsp-x86_64-generic/syslinux.morph +++ b/strata/bsp-x86_64-generic/syslinux.morph @@ -1,5 +1,9 @@ name: syslinux kind: chunk +products: +- artifact: syslinux-devel + include: + - (usr/)?share/syslinux/com32.* build-commands: - make clean - make NO_WERROR=1 diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/bsp-x86_both-tools/syslinux.morph index c0f15807..4570865b 100644 --- a/strata/bsp-x86_both-tools/syslinux.morph +++ b/strata/bsp-x86_both-tools/syslinux.morph @@ -1,8 +1,12 @@ name: syslinux kind: chunk +products: +- artifact: syslinux-devel + include: + - (usr/)?share/syslinux/com32.* build-commands: - make clean -- make -- make installer +- make NO_WERROR=1 +- make NO_WERROR=1 installer install-commands: - make INSTALLROOT="$DESTDIR" install -- cgit v1.2.1