diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-16 12:25:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-16 12:25:29 +0100 |
| commit | bb61464b053b94e4f30dd329ecb7b2b89767e97c (patch) | |
| tree | 14ebd24dd751c64329b48182cfd2bf3e1cad8fd9 | |
| parent | f48e707939dd1ce37ed39cc0886f2aafe5f2fbbc (diff) | |
small adjustments
| -rw-r--r-- | packages/sys-boot/grub/grub.exlib | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/packages/sys-boot/grub/grub.exlib b/packages/sys-boot/grub/grub.exlib index 6d7edea..702f066 100644 --- a/packages/sys-boot/grub/grub.exlib +++ b/packages/sys-boot/grub/grub.exlib @@ -77,11 +77,11 @@ grub_src_prepare() { grub_src_multibuild_prepare() { if option efi; then - cp -ax ${WORK} ${WORK}-efi + cp -ax "${WORK}" "${WORK}"-efi fi if option pc; then - cp -ax ${WORK} ${WORK}-pc + cp -ax "${WORK}" "${WORK}"-pc fi } @@ -93,7 +93,7 @@ grub_src_configure() { grub_src_multibuild_prepare if option efi; then - pushd ${WORK}-efi + pushd "${WORK}"-efi myconf=( "CPP=${CC} -E" @@ -122,7 +122,7 @@ grub_src_configure() { fi if option pc; then - pushd ${WORK}-pc + pushd "${WORK}"-pc myconf=( "CPP=${CC} -E" @@ -153,19 +153,29 @@ grub_src_configure() { grub_src_compile() { if option efi; then - pushd ${WORK}-efi - emake && emake DESTDIR="${IMAGE}" install - rm -rf ${WORK}-efi + pushd "${WORK}"-efi + emake fi if option pc; then - pushd ${WORK}-pc - emake && emake DESTDIR="${IMAGE}" install - rm -rf ${WORK}-pc + pushd "${WORK}"-pc + emake fi } grub_src_install() { + if option efi; then + pushd "${WORK}"-efi + emake DESTDIR="${IMAGE}" install + edo rm -rf "${WORK}"-efi + fi + + if option pc; then + pushd "${WORK}"-pc + emake DESTDIR="${IMAGE}" install + edo rm -rf "${WORK}"-pc + fi + dodoc "${WORK}"/docs/grub.cfg edo rm -f "${IMAGE}"/usr/$(exhost --target)/lib/charset.alias |