298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

grub2: bump version

Browse Source
This commit is contained in:
coolsnowwolf 2022-10-28 11:25:34 +08:00
parent 063f51c242
commit a56ccddcb6
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
package/boot/grub2/Makefile
View File

@ -1,16 +1,13 @@
# SPDX-License-Identifier: GPL-2.0-only
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2021 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=grub PKG_NAME:=grub
PKG_VERSION:=2.06 PKG_VERSION:=2.06
PKG_RELEASE:=1 PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/grub PKG_SOURCE_URL:=@GNU/grub
@ -22,8 +19,10 @@ PKG_CPE_ID:=cpe:/a:gnu:grub2
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=grub2/host PKG_BUILD_DEPENDS:=grub2/host
PKG_ASLR_PIE:=0 ifneq ($(BUILD_VARIANT),none)
PKG_SSP:=0 PKG_ASLR_PIE:=0
PKG_SSP:=0
endif
PKG_FLAGS:=nonshared PKG_FLAGS:=nonshared
@ -49,13 +48,27 @@ define Package/grub2-editenv
TITLE:=Grub2 Environment editor TITLE:=Grub2 Environment editor
URL:=http://www.gnu.org/software/grub/ URL:=http://www.gnu.org/software/grub/
DEPENDS:=@TARGET_x86 DEPENDS:=@TARGET_x86
VARIANT:=pc VARIANT:=none
endef endef
define Package/grub2-editenv/description define Package/grub2-editenv/description
Edit grub2 environment files. Edit grub2 environment files.
endef endef
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
VARIANT:=none
endef
define Package/grub2-bios-setup/description
Set up images to bootable.
endef
HOST_BUILD_PREFIX := $(STAGING_DIR_HOST) HOST_BUILD_PREFIX := $(STAGING_DIR_HOST)
CONFIGURE_VARS += \ CONFIGURE_VARS += \
@ -87,7 +100,11 @@ HOST_MAKE_FLAGS += \
TARGET_RANLIB=$(TARGET_RANLIB) \ TARGET_RANLIB=$(TARGET_RANLIB) \
LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a
TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS))
ifneq ($(BUILD_VARIANT),none)
TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS))
MAKE_PATH := grub-core
endif
define Host/Configure define Host/Configure
$(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in $(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in
@ -95,8 +112,6 @@ define Host/Configure
endef endef
define Package/grub2/install define Package/grub2/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-bios-setup $(1)/usr/sbin/
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/grub2 $(INSTALL_DIR) $(STAGING_DIR_IMAGE)/grub2
$(CP) $(PKG_BUILD_DIR)/grub-core/boot.img $(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/ $(CP) $(PKG_BUILD_DIR)/grub-core/cdboot.img $(STAGING_DIR_IMAGE)/grub2/
@ -154,7 +169,13 @@ define Package/grub2-editenv/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/
endef endef
define Package/grub2-bios-setup/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-bios-setup $(1)/usr/sbin/
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))
$(eval $(call BuildPackage,grub2)) $(eval $(call BuildPackage,grub2))
$(eval $(call BuildPackage,grub2-efi)) $(eval $(call BuildPackage,grub2-efi))
$(eval $(call BuildPackage,grub2-editenv)) $(eval $(call BuildPackage,grub2-editenv))
$(eval $(call BuildPackage,grub2-bios-setup))

2
target/linux/silicon/Makefile
View File

@ -9,7 +9,7 @@ BOARDNAME:=Apple Silicon family
FEATURES:=audio boot-part ext4 fpu squashfs usbgadget FEATURES:=audio boot-part ext4 fpu squashfs usbgadget
SUBTARGETS:=armv8 SUBTARGETS:=armv8
KERNEL_PATCHVER:=5.19 KERNEL_PATCHVER:=6.0
define Target/Description define Target/Description
Build firmware image for Apple Silicon family Build firmware image for Apple Silicon family