ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 22:23:27 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
48ed07bc0b
openwrt/package/boot/grub2/Makefile

183 lines
5.1 KiB
Makefile
Raw Normal View History

grub2: make grub2-bios-setup as a separate package The grub2 and grub2-efi packages should only contain boot-related code. grub-bios-setup is the same as grub-editenv, they are both grub2 tools and should be placed in a separate package. Signed-off-by: 李国 <uxgood.org@gmail.com> [use AUTORELEASE and update to SPDX] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-07-25 04:04:05 +00:00
# SPDX-License-Identifier: GPL-2.0-only
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
#
grub2: make grub2-bios-setup as a separate package The grub2 and grub2-efi packages should only contain boot-related code. grub-bios-setup is the same as grub-editenv, they are both grub2 tools and should be placed in a separate package. Signed-off-by: 李国 <uxgood.org@gmail.com> [use AUTORELEASE and update to SPDX] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-07-25 04:04:05 +00:00
# Copyright (C) 2006-2021 OpenWrt.org
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=grub
grub2: update to 2.06 -300-CVE-2015-8370.patch is upstreamed with different code (upstream id: 451d80e52d851432e109771bb8febafca7a5f1f2) - fixup OpenWrts setup_root patch compile tested: x86_64,i386 runtime tested: VM x86_64,VM i386 - booted fine - grub-editenv worked Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
2021-06-10 10:15:58 +00:00
PKG_VERSION:=2.06
treewide: replace AUTORELEASE with real PKG_RELEASE Based on Paul Fertser <fercerpav@gmail.com>'s guidance: Change AUTORELEASE in rules.mk to: ``` AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile)) ``` then update all affected packages by: ``` for i in $(git grep -l PKG_RELEASE:=.*AUTORELEASE | sed 's^.*/\([^/]*\)/Makefile^\1^';); do make package/$i/clean done ``` Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2023-05-17 13:08:40 +00:00
PKG_RELEASE:=5
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
grub2: update to 2.02-beta2, fixes mac os x 10.9 support (and many other things) Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39889
2014-03-12 11:21:16 +00:00
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
grub2: update to 2.06 -300-CVE-2015-8370.patch is upstreamed with different code (upstream id: 451d80e52d851432e109771bb8febafca7a5f1f2) - fixup OpenWrts setup_root patch compile tested: x86_64,i386 runtime tested: VM x86_64,VM i386 - booted fine - grub-editenv worked Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
2021-06-10 10:15:58 +00:00
PKG_SOURCE_URL:=@GNU/grub
PKG_HASH:=b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
grub2: add missing license The PKG_LICENSE field was missing. While at it, normalize the Makefile a bit. Signed-off-by: Paul Spooren <mail@aparcar.org>
2022-04-04 11:17:25 +00:00
PKG_LICENSE:=GPL-3.0-or-later
PKG_CPE_ID:=cpe:/a:gnu:grub2
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
HOST_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=grub2/host
grub2: pass compilation parameters more accurately In order for the grub2 boot-related code to compile normally, we have made many adjustments to the compilation parameters. These adjustments are not necessary for tools-related code. We apply these parameter adjustments only to the boot-related code. Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-07-25 05:14:52 +00:00
ifneq ($(BUILD_VARIANT),none)
PKG_ASLR_PIE:=0
PKG_SSP:=0
endif
grub2: disable stack-protector - enabling "-fstack-protector" results in build errors - Upstream explicitly tests & disables it v2: - use override reference: upstream commit baa2a121e004a95a12e2bb7f2419de6625a30c2d Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> SVN-Revision: 46126
2015-06-25 11:20:39 +00:00
packages: mark packages depending on a target as nonshared The packages can't be build as shared packages due to the unmet dependencies. Fixes FS#418. Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-01-19 08:18:57 +00:00
PKG_FLAGS:=nonshared
treewide: opt-out of tree-wide LTO usage These fail to build with LTO enabled or packages depending on them do. Signed-off-by: Andre Heider <a.heider@gmail.com>
2023-01-28 15:04:10 +00:00
PKG_BUILD_FLAGS:=no-lto
packages: mark packages depending on a target as nonshared The packages can't be build as shared packages due to the unmet dependencies. Fixes FS#418. Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-01-19 08:18:57 +00:00
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
define Package/grub2/Default
grub2: add missing SECTION variable and remove non breaking space Fix metadata scan failure in the grub2 package by removing an unexpected invisible space character and by adding back the missing SECTION variable which was removed with d140648. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-26 15:51:44 +00:00
CATEGORY:=Boot Loaders
SECTION:=boot
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
TITLE:=GRand Unified Bootloader ($(1))
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
URL:=http://www.gnu.org/software/grub/
build: remove leftovers from previous x86 commits VBoxManage is not used and the image is created with proper permisions: 0f5d0f6 image: use internal qemu-img for vmdk and vdi images drop host dependencies on qemu-utils and VirtualBox Unreachable config symbols: 9e0759e x86: merge all geode based subtargets into one No need to define those symbols since x86_64 is subtarget of x86: 196fb76 x86: make x86_64 a subtarget instead of a standalone target Unreachable config symbols, so remove GRUB_ROOT: 371b382 x86: remove the xen_domu subtarget Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2019-01-13 20:37:47 +00:00
DEPENDS:=@TARGET_x86
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
VARIANT:=$(1)
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
endef
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
Package/grub2=$(call Package/grub2/Default,pc)
Package/grub2-efi=$(call Package/grub2/Default,efi)
grub2: Add sub package grub-editenv for target installation grub-editenv allows to modify grub2 environment files. Add a new package that build grub2 for the target and packs up grub-editenv. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 36574
2013-05-07 12:35:07 +00:00
define Package/grub2-editenv
CATEGORY:=Utilities
SECTION:=utils
grub2: move to Boot Loaders category because boot loaders are in Boot Loaders, not in Utilities -> Boot Loaders Also moved brub2-editenv in Utilities -> Boot Loaders Part of a wider housekeeping effort on the packages repository. Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2016-10-23 19:04:49 +00:00
SUBMENU:=Boot Loaders
grub2: Add sub package grub-editenv for target installation grub-editenv allows to modify grub2 environment files. Add a new package that build grub2 for the target and packs up grub-editenv. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 36574
2013-05-07 12:35:07 +00:00
TITLE:=Grub2 Environment editor
URL:=http://www.gnu.org/software/grub/
build: remove leftovers from previous x86 commits VBoxManage is not used and the image is created with proper permisions: 0f5d0f6 image: use internal qemu-img for vmdk and vdi images drop host dependencies on qemu-utils and VirtualBox Unreachable config symbols: 9e0759e x86: merge all geode based subtargets into one No need to define those symbols since x86_64 is subtarget of x86: 196fb76 x86: make x86_64 a subtarget instead of a standalone target Unreachable config symbols, so remove GRUB_ROOT: 371b382 x86: remove the xen_domu subtarget Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2019-01-13 20:37:47 +00:00
DEPENDS:=@TARGET_x86
grub2: make grub2 tools built in a separate variant grub2 boot-related code and tools-related code may require different compilation parameters. We split them into different variants for compilation, so that we can accurately pass the required parameters and avoid causing problems. Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-07-25 04:48:36 +00:00
VARIANT:=none
grub2: Add sub package grub-editenv for target installation grub-editenv allows to modify grub2 environment files. Add a new package that build grub2 for the target and packs up grub-editenv. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 36574
2013-05-07 12:35:07 +00:00
endef
define Package/grub2-editenv/description
Edit grub2 environment files.
endef
grub2: make grub2-bios-setup as a separate package The grub2 and grub2-efi packages should only contain boot-related code. grub-bios-setup is the same as grub-editenv, they are both grub2 tools and should be placed in a separate package. Signed-off-by: 李国 <uxgood.org@gmail.com> [use AUTORELEASE and update to SPDX] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-07-25 04:04:05 +00:00
define Package/grub2-bios-setup
CATEGORY:=Utilities
SECTION:=utils
SUBMENU:=Boot Loaders
TITLE:=Grub2 BIOS boot setup tool
URL:=http://www.gnu.org/software/grub/
DEPENDS:=@TARGET_x86
grub2: make grub2 tools built in a separate variant grub2 boot-related code and tools-related code may require different compilation parameters. We split them into different variants for compilation, so that we can accurately pass the required parameters and avoid causing problems. Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-07-25 04:48:36 +00:00
VARIANT:=none
grub2: make grub2-bios-setup as a separate package The grub2 and grub2-efi packages should only contain boot-related code. grub-bios-setup is the same as grub-editenv, they are both grub2 tools and should be placed in a separate package. Signed-off-by: 李国 <uxgood.org@gmail.com> [use AUTORELEASE and update to SPDX] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-07-25 04:04:05 +00:00
endef
define Package/grub2-bios-setup/description
Set up images to bootable.
endef
grub2: switch back to installing to STAGING_DIR_HOST Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48424
2016-01-21 11:46:18 +00:00
HOST_BUILD_PREFIX := $(STAGING_DIR_HOST)
grub2: do not generate mkfonts at build time Even though these fonts may not be installed, they seem to be generated at build time. Seems that the configure script re-generated from configure.ac is a bit more annoying than it has to be. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-21 15:36:56 +00:00
CONFIGURE_VARS += \
grub_build_mkfont_excuse="don't want fonts"
grub2: Add sub package grub-editenv for target installation grub-editenv allows to modify grub2 environment files. Add a new package that build grub2 for the target and packs up grub-editenv. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 36574
2013-05-07 12:35:07 +00:00
CONFIGURE_ARGS += \
--target=$(REAL_GNU_TARGET_NAME) \
--disable-werror \
grub2: disable libdevmapper - fix build when it's available Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 40349
2014-03-30 19:55:39 +00:00
--disable-nls \
grub2: disable mkfont - fix build on Archlinux Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 40350
2014-03-30 19:55:43 +00:00
--disable-device-mapper \
package:grub2: fix build error on linux missing libzfs configure enables libzfs support on default. This will break the build, on systems without libzfs. Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com> SVN-Revision: 41935
2014-08-01 11:19:46 +00:00
--disable-libzfs \
grub2: disable liblzma dependency Florian Ekert reported: "I have build a fresh master branch recently, Since your last change [1] on grub2, I have now a new dependency on liblzma for the install package grub2-editenv. root@st-dev-07 /usr/lib # ldd /root/grub-editenv /lib/ld-musl-x86_64.so.1 (0x7f684b088000) liblzma.so.5 => /usr/lib/liblzma.so.5 (0x7f684b06d000) libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x7f684b059000) libc.so => /lib/ld-musl-x86_64.so.1 (0x7f684b088000) This was not the case before your update. root@st-dev-07 /usr/sbin # ldd /usr/sbin/grub-editenv /lib/ld-musl-x86_64.so.1 (0x7fd970176000) libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x7fd970162000) libc.so => /lib/ld-musl-x86_64.so.1 (0x7fd970176000) My build complains that it cannot satisfy the runtime package dependency for grub2-editenv. install -d -m0755 /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/ipkg-x86_64/grub2-editenv/usr/sbin install -m0755 /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/grub-editenv /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/ipkg-x86_64/grub2-editenv/usr/sbin/ find /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/ipkg-x86_64/grub2-editenv -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| xargs -r rm -rf Package grub2-editenv is missing dependencies for the following libraries: liblzma.so.5 make[2]: *** [Makefile:166: /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/bin/APOS/feckert/master/master-Maggie-455-ga5edc0e8e/x86_64/targets/x86/64/packages/grub2-editenv_2.06~rc1-1_x86_64.ipk] Error 1 make[2]: Leaving directory '/home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/package/boot/grub2' time: package/boot/grub2/pc/compile#78.64#9.79#83.88 ERROR: package/boot/grub2 failed to build (build variant: pc). make[1]: *** [package/Makefile:116: package/boot/grub2/compile] Error 1 make[1]: Leaving directory '/home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt' make: *** [/home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/include/toplevel.mk:230: package/boot/grub2/compile] Error 2 If I add the following changes to the package all works as expected. <snip> - DEPENDS:=@TARGET_x86 + DEPENDS:=@TARGET_x86 +liblzma VARIANT:=pc endef This is a hotfix but I dont´t think this is the final solution, because lzma is provided by the package xz. And This is maintained in the package feed [not the core]" Dirk stated & offered his patch to disable liblzma and thus resolve the 'out of core dependency' problem: "LZMA is used in mkimage.c disabling it prints Without liblzma (no support for XZ-compressed mips images) (explicitly disabled) (see configure.ac) liblzma is autodetected so this issue was present but hidden somehow [unsure: grep/image generation does not use grub with that option] OpenWrt does not use that feature currently [!] some scripts and examples use --compression=xz or -C xz and those will break grub has an internal xzlib for different "lzma" functionality (ext. LIBLZMA from XZ (GRUB_COMPRESSION_XZ) vs. GRUB_COMPRESSION_LZMA)" Hopefully fixes e74d81ece2e2932a4f370d8e6d180061a6a2c229 and doesn't break anything else. Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name> [include Florian's description of how problem 1st encountered] [bump package release] Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2021-05-20 08:39:35 +00:00
--disable-liblzma \
grub2: disable building platform code for target utility It is not used and it was causing a build error with GCC 7.3 Signed-off-by: Felix Fietkau <nbd@nbd.name>
2018-02-22 08:29:54 +00:00
--disable-grub-mkfont \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
--with-platform=$(BUILD_VARIANT)
grub2: Add sub package grub-editenv for target installation grub-editenv allows to modify grub2 environment files. Add a new package that build grub2 for the target and packs up grub-editenv. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 36574
2013-05-07 12:35:07 +00:00
grub2: do not generate mkfonts at build time Even though these fonts may not be installed, they seem to be generated at build time. Seems that the configure script re-generated from configure.ac is a bit more annoying than it has to be. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-21 15:36:56 +00:00
HOST_CONFIGURE_VARS += \
grub_build_mkfont_excuse="don't want fonts"
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
HOST_CONFIGURE_ARGS += \
grub2: do not generate mkfonts at build time Even though these fonts may not be installed, they seem to be generated at build time. Seems that the configure script re-generated from configure.ac is a bit more annoying than it has to be. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-21 15:36:56 +00:00
--disable-grub-mkfont \
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
--target=$(REAL_GNU_TARGET_NAME) \
--sbindir="$(STAGING_DIR_HOST)/bin" \
grub2: disable nls to fix build failure when libintl/host is built SVN-Revision: 33522
2012-09-23 09:49:56 +00:00
--disable-werror \
package:grub2: fix build error on linux missing libzfs configure enables libzfs support on default. This will break the build, on systems without libzfs. Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com> SVN-Revision: 41935
2014-08-01 11:19:46 +00:00
--disable-libzfs \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
--disable-nls \
--with-platform=none
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
HOST_MAKE_FLAGS += \
grub2: use the static lzma lib instead of the dynamic one SVN-Revision: 33526
2012-09-23 10:38:06 +00:00
TARGET_RANLIB=$(TARGET_RANLIB) \
LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
grub2: make grub2 tools built in a separate variant grub2 boot-related code and tools-related code may require different compilation parameters. We split them into different variants for compilation, so that we can accurately pass the required parameters and avoid causing problems. Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-07-25 04:48:36 +00:00
ifneq ($(BUILD_VARIANT),none)
grub2: pass compilation parameters more accurately In order for the grub2 boot-related code to compile normally, we have made many adjustments to the compilation parameters. These adjustments are not necessary for tools-related code. We apply these parameter adjustments only to the boot-related code. Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-07-25 05:14:52 +00:00
TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS))
grub2: make grub2 tools built in a separate variant grub2 boot-related code and tools-related code may require different compilation parameters. We split them into different variants for compilation, so that we can accurately pass the required parameters and avoid causing problems. Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-07-25 04:48:36 +00:00
MAKE_PATH := grub-core
endif
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
define Host/Configure
$(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in
$(Host/Configure/Default)
endef
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
define Package/grub2/install
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/grub2
$(CP) $(PKG_BUILD_DIR)/grub-core/boot.img $(STAGING_DIR_IMAGE)/grub2/
$(CP) $(PKG_BUILD_DIR)/grub-core/cdboot.img $(STAGING_DIR_IMAGE)/grub2/
sed 's#msdos1#gpt1#g' ./files/grub-early.cfg >$(PKG_BUILD_DIR)/grub-early.cfg
$(STAGING_DIR_HOST)/bin/grub-mkimage \
-d $(PKG_BUILD_DIR)/grub-core \
-p /boot/grub \
-O i386-pc \
-c $(PKG_BUILD_DIR)/grub-early.cfg \
-o $(STAGING_DIR_IMAGE)/grub2/gpt-core.img \
grub2: re-add test module It seems more hardware needs early load of firmware when initialised to work properly (at least Intel hardware). One of previous case is CPU microcode, which this series[1] tried to change. The second one is Intel graphics IC, which needs firmware for controlling DMC circuit (switch conncted display to DC6 power state). As it stands, the i915 module is built-in and it seems the hardware can't cope with firmware loaded later from rootfs, it needs to be supplied when the module is loaded. Unfortunately we need bootloader to handle the load of firmware in this case, but as previously mentioned series[1], there was an error when initrd was hardcoded, instead of testing existence for it and then loading. To remedy this in later the 55b808e0c4be ('x86: image: add test module to bootloader') was commited. Which was later accidentally dropped when grub2 image creation was moved to packages. Therefore bring back test module, so we can test for cases of existing firmware in grub.cfg. 1. https://patchwork.ozlabs.org/project/openwrt/cover/20181120162044.16371-1-tomek_n@o2.pl Fixes: 5a5df62d95f5 ("x86/grub2: move grub2 image creation to package") Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
2023-01-23 13:44:50 +00:00
at_keyboard biosdisk boot chain configfile fat linux ls part_gpt reboot search serial test vga
x86/grub2: move grub2 image creation to package Let the grub2 package take care of creating installable grub2 images, this will allow creating grub2 images without first calling x86 image generation recipe. Also as side effect, since those images are now shared, it'll reduce the number of calling grub-mkimage. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> [rebase, adjusted commit title] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-03-20 10:10:54 +00:00
$(STAGING_DIR_HOST)/bin/grub-mkimage \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
-d $(PKG_BUILD_DIR)/grub-core \
x86/grub2: move grub2 image creation to package Let the grub2 package take care of creating installable grub2 images, this will allow creating grub2 images without first calling x86 image generation recipe. Also as side effect, since those images are now shared, it'll reduce the number of calling grub-mkimage. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> [rebase, adjusted commit title] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-03-20 10:10:54 +00:00
-p /boot/grub \
-O i386-pc \
-c ./files/grub-early.cfg \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
-o $(STAGING_DIR_IMAGE)/grub2/generic-core.img \
grub2: re-add test module It seems more hardware needs early load of firmware when initialised to work properly (at least Intel hardware). One of previous case is CPU microcode, which this series[1] tried to change. The second one is Intel graphics IC, which needs firmware for controlling DMC circuit (switch conncted display to DC6 power state). As it stands, the i915 module is built-in and it seems the hardware can't cope with firmware loaded later from rootfs, it needs to be supplied when the module is loaded. Unfortunately we need bootloader to handle the load of firmware in this case, but as previously mentioned series[1], there was an error when initrd was hardcoded, instead of testing existence for it and then loading. To remedy this in later the 55b808e0c4be ('x86: image: add test module to bootloader') was commited. Which was later accidentally dropped when grub2 image creation was moved to packages. Therefore bring back test module, so we can test for cases of existing firmware in grub.cfg. 1. https://patchwork.ozlabs.org/project/openwrt/cover/20181120162044.16371-1-tomek_n@o2.pl Fixes: 5a5df62d95f5 ("x86/grub2: move grub2 image creation to package") Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
2023-01-23 13:44:50 +00:00
at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot search serial test vga
x86/grub2: move grub2 image creation to package Let the grub2 package take care of creating installable grub2 images, this will allow creating grub2 images without first calling x86 image generation recipe. Also as side effect, since those images are now shared, it'll reduce the number of calling grub-mkimage. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> [rebase, adjusted commit title] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-03-20 10:10:54 +00:00
$(STAGING_DIR_HOST)/bin/grub-mkimage \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
-d $(PKG_BUILD_DIR)/grub-core \
x86/grub2: move grub2 image creation to package Let the grub2 package take care of creating installable grub2 images, this will allow creating grub2 images without first calling x86 image generation recipe. Also as side effect, since those images are now shared, it'll reduce the number of calling grub-mkimage. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> [rebase, adjusted commit title] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-03-20 10:10:54 +00:00
-p /boot/grub \
-O i386-pc \
-c ./files/grub-early.cfg \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
-o $(STAGING_DIR_IMAGE)/grub2/eltorito.img \
x86: grub2: search for the "kernel" filesystem on all disks Previously, grub2 was hardcoded to always look on "hd0" for the kernel. This works well when the system only had a single disk. But if there was a second disk/stick present, it may have look on the wrong drive because of enumeration races. This patch utilizes grub2 search function to look for a filesystem with the label "kernel". This works thanks to existing setup in scripts/gen_image_generic.sh. Which sets the "kernel" label on both the fat and ext4 filesystem variants. Signed-off-by: Jax Jiang <jax.jiang.007@gmail.com> Suggested-by: Alberto Bursi <bobafetthotmail@gmail.com> (MX100 WA) (word wrapped, slightly rewritten commit message, removed MX100 WA) Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
2022-02-10 17:46:55 +00:00
at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot search serial test vga
x86/grub2: move grub2 image creation to package Let the grub2 package take care of creating installable grub2 images, this will allow creating grub2 images without first calling x86 image generation recipe. Also as side effect, since those images are now shared, it'll reduce the number of calling grub-mkimage. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> [rebase, adjusted commit title] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-03-20 10:10:54 +00:00
$(STAGING_DIR_HOST)/bin/grub-mkimage \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
-d $(PKG_BUILD_DIR)/grub-core \
x86/grub2: move grub2 image creation to package Let the grub2 package take care of creating installable grub2 images, this will allow creating grub2 images without first calling x86 image generation recipe. Also as side effect, since those images are now shared, it'll reduce the number of calling grub-mkimage. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> [rebase, adjusted commit title] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-03-20 10:10:54 +00:00
-p /boot/grub \
-O i386-pc \
-c ./files/grub-early.cfg \
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
-o $(STAGING_DIR_IMAGE)/grub2/legacy-core.img \
x86: grub2: search for the "kernel" filesystem on all disks Previously, grub2 was hardcoded to always look on "hd0" for the kernel. This works well when the system only had a single disk. But if there was a second disk/stick present, it may have look on the wrong drive because of enumeration races. This patch utilizes grub2 search function to look for a filesystem with the label "kernel". This works thanks to existing setup in scripts/gen_image_generic.sh. Which sets the "kernel" label on both the fat and ext4 filesystem variants. Signed-off-by: Jax Jiang <jax.jiang.007@gmail.com> Suggested-by: Alberto Bursi <bobafetthotmail@gmail.com> (MX100 WA) (word wrapped, slightly rewritten commit message, removed MX100 WA) Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
2022-02-10 17:46:55 +00:00
biosdisk boot chain configfile ext2 linux ls part_msdos reboot search serial vga
x86/grub2: move grub2 image creation to package Let the grub2 package take care of creating installable grub2 images, this will allow creating grub2 images without first calling x86 image generation recipe. Also as side effect, since those images are now shared, it'll reduce the number of calling grub-mkimage. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> [rebase, adjusted commit title] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-03-20 10:10:54 +00:00
endef
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
define Package/grub2-efi/install
sed 's#msdos1#gpt1#g' ./files/grub-early.cfg >$(PKG_BUILD_DIR)/grub-early.cfg
$(STAGING_DIR_HOST)/bin/grub-mkimage \
-d $(PKG_BUILD_DIR)/grub-core \
-p /boot/grub \
-O $(CONFIG_ARCH)-efi \
-c $(PKG_BUILD_DIR)/grub-early.cfg \
-o $(STAGING_DIR_IMAGE)/grub2/boot$(if $(CONFIG_x86_64),x64,ia32).efi \
grub2: re-add test module It seems more hardware needs early load of firmware when initialised to work properly (at least Intel hardware). One of previous case is CPU microcode, which this series[1] tried to change. The second one is Intel graphics IC, which needs firmware for controlling DMC circuit (switch conncted display to DC6 power state). As it stands, the i915 module is built-in and it seems the hardware can't cope with firmware loaded later from rootfs, it needs to be supplied when the module is loaded. Unfortunately we need bootloader to handle the load of firmware in this case, but as previously mentioned series[1], there was an error when initrd was hardcoded, instead of testing existence for it and then loading. To remedy this in later the 55b808e0c4be ('x86: image: add test module to bootloader') was commited. Which was later accidentally dropped when grub2 image creation was moved to packages. Therefore bring back test module, so we can test for cases of existing firmware in grub.cfg. 1. https://patchwork.ozlabs.org/project/openwrt/cover/20181120162044.16371-1-tomek_n@o2.pl Fixes: 5a5df62d95f5 ("x86/grub2: move grub2 image creation to package") Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
2023-01-23 13:44:50 +00:00
at_keyboard boot chain configfile fat linux ls part_gpt reboot serial test efi_gop efi_uga
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
$(STAGING_DIR_HOST)/bin/grub-mkimage \
-d $(PKG_BUILD_DIR)/grub-core \
-p /boot/grub \
-O $(CONFIG_ARCH)-efi \
-c ./files/grub-early.cfg \
-o $(STAGING_DIR_IMAGE)/grub2/iso-boot$(if $(CONFIG_x86_64),x64,ia32).efi \
at_keyboard boot chain configfile fat iso9660 linux ls part_msdos part_gpt reboot serial test efi_gop efi_uga
x86: add bootloader upgrade on sysupgrade Currently bootloader always stays on the same version as when first written to boot medium (not true if partition layout changed, which will trigger sysupgrade process to write full disk image). That creates inconveniences as it always stays with same features or/and bugs. Users wishing to add support to additional modules or new version, would need to write the whole image, potentially destroying previous system configuration. To fix these, this commit adds additional routine to sysupgrade which upgrades unconditionally the bootloader to the latest state provided by OpenWrt. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2020-01-14 17:45:44 +00:00
endef
grub2: Add sub package grub-editenv for target installation grub-editenv allows to modify grub2 environment files. Add a new package that build grub2 for the target and packs up grub-editenv. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 36574
2013-05-07 12:35:07 +00:00
define Package/grub2-editenv/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/
endef
grub2: make grub2-bios-setup as a separate package The grub2 and grub2-efi packages should only contain boot-related code. grub-bios-setup is the same as grub-editenv, they are both grub2 tools and should be placed in a separate package. Signed-off-by: 李国 <uxgood.org@gmail.com> [use AUTORELEASE and update to SPDX] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-07-25 04:04:05 +00:00
define Package/grub2-bios-setup/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-bios-setup $(1)/usr/sbin/
endef
add a package for grub2 SVN-Revision: 33512
2012-09-22 20:10:38 +00:00
$(eval $(call HostBuild))
$(eval $(call BuildPackage,grub2))
grub2: make some change to add efi platform support 1.generate boot image at Package/install section 2.move boot image to $(STAGING_DIR_IMAGE)/grub2/ 3.add efi variant to support efi platform Signed-off-by: 李国 <uxgood.org@gmail.com>
2020-03-26 05:51:32 +00:00
$(eval $(call BuildPackage,grub2-efi))
grub2: Add sub package grub-editenv for target installation grub-editenv allows to modify grub2 environment files. Add a new package that build grub2 for the target and packs up grub-editenv. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 36574
2013-05-07 12:35:07 +00:00
$(eval $(call BuildPackage,grub2-editenv))
grub2: make grub2-bios-setup as a separate package The grub2 and grub2-efi packages should only contain boot-related code. grub-bios-setup is the same as grub-editenv, they are both grub2 tools and should be placed in a separate package. Signed-off-by: 李国 <uxgood.org@gmail.com> [use AUTORELEASE and update to SPDX] Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-07-25 04:04:05 +00:00
$(eval $(call BuildPackage,grub2-bios-setup))
Reference in New Issue Copy Permalink