diff options
| -rw-r--r-- | strata/bsp-x86_32-generic.morph | 4 | ||||
| -rw-r--r-- | strata/bsp-x86_32-generic/syslinux.morph | 21 | ||||
| -rw-r--r-- | strata/bsp-x86_64-generic.morph | 4 | ||||
| -rw-r--r-- | strata/bsp-x86_64-generic/syslinux.morph | 21 | ||||
| -rw-r--r-- | strata/bsp-x86_both-tools.morph | 4 | ||||
| -rw-r--r-- | strata/bsp-x86_both-tools/syslinux.morph | 21 |
6 files changed, 54 insertions, 21 deletions
diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 41003643..888f444a 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 4570865b..0808fc02 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 799af9d2..ef238420 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 4570865b..0808fc02 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 f7212054..97553a25 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 4570865b..0808fc02 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 |