summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-07 10:33:05 (GMT)
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-07 10:38:10 (GMT)
commit72b6ce5a15eae20c932ac3eb816dad39d1be48cd (patch)
tree468871a140e06bf610c35743b18ffaf4bfe59d17
parent8d242b1f97ce7a6866ee3f49ce482ee3d35d120f (diff)
downloaddefinitions-baserock/tiagogomes/syslinux-6.03.tar.gz
Update syslinux.morph to 6.03baserock/tiagogomes/syslinux-6.03
Change-Id: I09d408e3f4f7c67416097700974b0a6d0d2ab8e3
-rw-r--r--strata/bsp-x86_32-generic.morph4
-rw-r--r--strata/bsp-x86_32-generic/syslinux.morph21
-rw-r--r--strata/bsp-x86_64-generic.morph4
-rw-r--r--strata/bsp-x86_64-generic/syslinux.morph21
-rw-r--r--strata/bsp-x86_both-tools.morph4
-rw-r--r--strata/bsp-x86_both-tools/syslinux.morph21
6 files changed, 54 insertions, 21 deletions
diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph
index 4100364..888f444 100644
--- a/strata/bsp-x86_32-generic.morph
+++ b/strata/bsp-x86_32-generic.morph
@@ -18,7 +18,7 @@ chunks:
- name: syslinux
morph: strata/bsp-x86_32-generic/syslinux.morph
repo: upstream:syslinux
- ref: 2aab8555987b547b617cbb887e61083fece01541
- unpetrify-ref: baserock/morph
+ ref: 81ad566f155fac31089fde69c87059b217e7e9b6
+ unpetrify-ref: syslinux-6.03
build-depends:
- nasm
diff --git a/strata/bsp-x86_32-generic/syslinux.morph b/strata/bsp-x86_32-generic/syslinux.morph
index 4570865..0808fc0 100644
--- a/strata/bsp-x86_32-generic/syslinux.morph
+++ b/strata/bsp-x86_32-generic/syslinux.morph
@@ -3,10 +3,21 @@ kind: chunk
products:
- artifact: syslinux-devel
include:
- - (usr/)?share/syslinux/com32.*
+ - (usr/)?lib/syslinux/com32.*
+ - (usr/)?lib/syslinux/bios.*
build-commands:
-- make clean
-- make NO_WERROR=1
-- make NO_WERROR=1 installer
+- make bios
install-commands:
-- make INSTALLROOT="$DESTDIR" install
+- make INSTALLROOT="$DESTDIR" AUXDIR=/usr/lib/syslinux SBINDIR=/usr/bin MANDIR=/usr/share/man bios install
+post-install-commands:
+- |
+ # remove ms-dos executables
+ rm -rf "$DESTDIR"/usr/lib/syslinux/*.com
+ rm -rf "$DESTDIR"/usr/lib/syslinux/dosutil
+
+ # move syslinux modules file location
+ install -d "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.bin "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.c32 "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.0 "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/memdisk "$DESTDIR"/usr/lib/syslinux/bios
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index 799af9d..ef23842 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -18,7 +18,7 @@ chunks:
- name: syslinux
morph: strata/bsp-x86_64-generic/syslinux.morph
repo: upstream:syslinux
- ref: 2aab8555987b547b617cbb887e61083fece01541
- unpetrify-ref: baserock/morph
+ ref: 81ad566f155fac31089fde69c87059b217e7e9b6
+ unpetrify-ref: syslinux-6.03
build-depends:
- nasm
diff --git a/strata/bsp-x86_64-generic/syslinux.morph b/strata/bsp-x86_64-generic/syslinux.morph
index 4570865..0808fc0 100644
--- a/strata/bsp-x86_64-generic/syslinux.morph
+++ b/strata/bsp-x86_64-generic/syslinux.morph
@@ -3,10 +3,21 @@ kind: chunk
products:
- artifact: syslinux-devel
include:
- - (usr/)?share/syslinux/com32.*
+ - (usr/)?lib/syslinux/com32.*
+ - (usr/)?lib/syslinux/bios.*
build-commands:
-- make clean
-- make NO_WERROR=1
-- make NO_WERROR=1 installer
+- make bios
install-commands:
-- make INSTALLROOT="$DESTDIR" install
+- make INSTALLROOT="$DESTDIR" AUXDIR=/usr/lib/syslinux SBINDIR=/usr/bin MANDIR=/usr/share/man bios install
+post-install-commands:
+- |
+ # remove ms-dos executables
+ rm -rf "$DESTDIR"/usr/lib/syslinux/*.com
+ rm -rf "$DESTDIR"/usr/lib/syslinux/dosutil
+
+ # move syslinux modules file location
+ install -d "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.bin "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.c32 "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.0 "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/memdisk "$DESTDIR"/usr/lib/syslinux/bios
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index f721205..97553a2 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -13,7 +13,7 @@ chunks:
- name: syslinux
morph: strata/bsp-x86_both-tools/syslinux.morph
repo: upstream:syslinux
- ref: d715b39c0801ecea5e52f9029cea7c76320f93cf
- unpetrify-ref: baserock/morph
+ ref: 81ad566f155fac31089fde69c87059b217e7e9b6
+ unpetrify-ref: syslinux-6.03
build-depends:
- nasm
diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/bsp-x86_both-tools/syslinux.morph
index 4570865..0808fc0 100644
--- a/strata/bsp-x86_both-tools/syslinux.morph
+++ b/strata/bsp-x86_both-tools/syslinux.morph
@@ -3,10 +3,21 @@ kind: chunk
products:
- artifact: syslinux-devel
include:
- - (usr/)?share/syslinux/com32.*
+ - (usr/)?lib/syslinux/com32.*
+ - (usr/)?lib/syslinux/bios.*
build-commands:
-- make clean
-- make NO_WERROR=1
-- make NO_WERROR=1 installer
+- make bios
install-commands:
-- make INSTALLROOT="$DESTDIR" install
+- make INSTALLROOT="$DESTDIR" AUXDIR=/usr/lib/syslinux SBINDIR=/usr/bin MANDIR=/usr/share/man bios install
+post-install-commands:
+- |
+ # remove ms-dos executables
+ rm -rf "$DESTDIR"/usr/lib/syslinux/*.com
+ rm -rf "$DESTDIR"/usr/lib/syslinux/dosutil
+
+ # move syslinux modules file location
+ install -d "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.bin "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.c32 "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/*.0 "$DESTDIR"/usr/lib/syslinux/bios
+ mv "$DESTDIR"/usr/lib/syslinux/memdisk "$DESTDIR"/usr/lib/syslinux/bios