diff options
| author | 李国 <uxgood.org@gmail.com> | 2020-07-25 04:04:05 +0000 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-06-20 13:23:42 -1000 |
| commit | 5876d6a62fc0ae5799e7d9c896356f75c99a6f0a (patch) | |
| tree | 51f39f05fe386ff931120417dbe86b68436c6fdd | |
| parent | 881fdb811f39d445fb00b4c1f38427fada883fe2 (diff) | |
| download | openwrt-5876d6a62fc0ae5799e7d9c896356f75c99a6f0a.tar.gz openwrt-5876d6a62fc0ae5799e7d9c896356f75c99a6f0a.tar.bz2 openwrt-5876d6a62fc0ae5799e7d9c896356f75c99a6f0a.zip | |
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>
| -rw-r--r-- | config/Config-images.in | 2 | ||||
| -rw-r--r-- | package/boot/grub2/Makefile | 31 |
2 files changed, 25 insertions, 8 deletions
diff --git a/config/Config-images.in b/config/Config-images.in index 715ba21284..4a7f08824b 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -200,6 +200,7 @@ menu "Target Images" depends on TARGET_x86 depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS select PACKAGE_grub2 + select PACKAGE_grub2-bios-setup default y config GRUB_EFI_IMAGES @@ -208,6 +209,7 @@ menu "Target Images" depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS select PACKAGE_grub2 select PACKAGE_grub2-efi + select PACKAGE_grub2-bios-setup select PACKAGE_kmod-fs-vfat default y diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile index a57486b91d..709253a935 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/Makefile @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2021 OpenWrt.org include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk @@ -11,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=grub PKG_CPE_ID:=cpe:/a:gnu:grub2 PKG_VERSION:=2.06~rc1 -PKG_RELEASE:=2 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://alpha.gnu.org/gnu/grub @@ -54,6 +51,20 @@ define Package/grub2-editenv/description Edit grub2 environment files. 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:=pc +endef + +define Package/grub2-bios-setup/description + Set up images to bootable. +endef + HOST_BUILD_PREFIX := $(STAGING_DIR_HOST) CONFIGURE_VARS += \ @@ -93,8 +104,6 @@ define Host/Configure endef 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 $(CP) $(PKG_BUILD_DIR)/grub-core/boot.img $(STAGING_DIR_IMAGE)/grub2/ $(CP) $(PKG_BUILD_DIR)/grub-core/cdboot.img $(STAGING_DIR_IMAGE)/grub2/ @@ -152,7 +161,13 @@ define Package/grub2-editenv/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ 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 BuildPackage,grub2)) $(eval $(call BuildPackage,grub2-efi)) $(eval $(call BuildPackage,grub2-editenv)) +$(eval $(call BuildPackage,grub2-bios-setup)) |