Skip to content

Remove ZFS and update GRUB to 2.04 without ZFS support #2117

Merged
merged 1 commit into from
May 3, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions grub.be0
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
#!/usr/bin/env beesh

# BEE_VERSION grub-2.02_p167_61ec2e300-0
# BEE_VERSION grub-2.04-1

SRCURL[0]="/src/mariux/beeroot/downloads/grub-${PKGVERSION}_p167_61ec2e300.tar.bz2"
# SRCURL[0]="/src/mariux/beeroot/downloads/grub-2.02_p167_61ec2e300.tar.bz2"
# https://ftp.gnu.org/gnu/grub/grub-2.04.tar.gz
SRCURL[0]="https://beehive.molgen.mpg.de/5ce674ca6b2612d8939b9e6abed32934/grub-2.04.tar.gz"

# PATCHURL+=()

# EXCLUDE+=()

# build_in_sourcedir

# sourcesubdir_append src


#mee_extract() {
# bee_extract "${@}"
#}
Expand All @@ -22,25 +21,26 @@ mee_patch() {
./autogen.sh
}

#mee_configure() {
# bee_configure
#}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}
## by default this may be 'make install DESTDIR="${D}"'
mee_configure() {
bee_configure \
--disable-libzfs \
--disable-efiemu \
--disable-nls
}

# Install x86_64-efi
mee_install_post() {
start_cmd make clean
mee_build() {
bee_build
bee_install
make clean
bee_configure \
--with-platform=efi \
--target=x86_64
--target=x86_64 \
--disable-libzfs \
--disable-nls
bee_build
bee_install

}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was needed to build for BIOS and UEFI, but not sure.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm it did not build some i386-PC files afair, but I think we should just test this. as long as mxgrub works and the systems reboot that'll be fine.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, 386 is needed. i'll fix this.


#mee_install() {
# bee_install
#}