projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
package/grub2: update to 2.02
[openwrt/openwrt.git]
/
package
/
boot
/
grub2
/
Makefile
diff --git
a/package/boot/grub2/Makefile
b/package/boot/grub2/Makefile
index 20dced94801b9c9f78530f3012922f5d7fae1a2a..b9e79e10217fa3266dbfcf2fabc2df39e54e3486 100644
(file)
--- a/
package/boot/grub2/Makefile
+++ b/
package/boot/grub2/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-201
0
OpenWrt.org
+# Copyright (C) 2006-201
5
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-9,23
+9,27
@@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=grub
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=grub
-PKG_VERSION:=2.0
0
+PKG_VERSION:=2.0
2
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.
g
z
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.
x
z
PKG_SOURCE_URL:=@GNU/grub
PKG_SOURCE_URL:=@GNU/grub
-PKG_
MD5SUM:=e927540b6eda8b024fb0391eeaa4091c
+PKG_
HASH:=810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f
+PKG_FIXUP:=autoreconf
HOST_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=grub2/host
HOST_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=grub2/host
+PKG_SSP:=0
+
+PKG_FLAGS:=nonshared
+
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/grub2
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/grub2
- SUBMENU:=Boot Loaders
- CATEGORY:=Utilities
- SECTION:=utils
+ CATEGORY:=Boot Loaders
+ SECTION:=boot
TITLE:=GRand Unified Bootloader
URL:=http://www.gnu.org/software/grub/
DEPENDS:=@TARGET_x86||TARGET_x86_64
TITLE:=GRand Unified Bootloader
URL:=http://www.gnu.org/software/grub/
DEPENDS:=@TARGET_x86||TARGET_x86_64
@@
-34,6
+38,7
@@
endef
define Package/grub2-editenv
CATEGORY:=Utilities
SECTION:=utils
define Package/grub2-editenv
CATEGORY:=Utilities
SECTION:=utils
+ SUBMENU:=Boot Loaders
TITLE:=Grub2 Environment editor
URL:=http://www.gnu.org/software/grub/
DEPENDS:=@TARGET_x86||TARGET_x86_64
TITLE:=Grub2 Environment editor
URL:=http://www.gnu.org/software/grub/
DEPENDS:=@TARGET_x86||TARGET_x86_64
@@
-43,15
+48,28
@@
define Package/grub2-editenv/description
Edit grub2 environment files.
endef
Edit grub2 environment files.
endef
+HOST_BUILD_PREFIX := $(STAGING_DIR_HOST)
+
+CONFIGURE_VARS += \
+ grub_build_mkfont_excuse="don't want fonts"
+
CONFIGURE_ARGS += \
--target=$(REAL_GNU_TARGET_NAME) \
--disable-werror \
CONFIGURE_ARGS += \
--target=$(REAL_GNU_TARGET_NAME) \
--disable-werror \
- --disable-nls
+ --disable-nls \
+ --disable-device-mapper \
+ --disable-libzfs \
+ --disable-grub-mkfont
+
+HOST_CONFIGURE_VARS += \
+ grub_build_mkfont_excuse="don't want fonts"
HOST_CONFIGURE_ARGS += \
HOST_CONFIGURE_ARGS += \
+ --disable-grub-mkfont \
--target=$(REAL_GNU_TARGET_NAME) \
--sbindir="$(STAGING_DIR_HOST)/bin" \
--disable-werror \
--target=$(REAL_GNU_TARGET_NAME) \
--sbindir="$(STAGING_DIR_HOST)/bin" \
--disable-werror \
+ --disable-libzfs \
--disable-nls
HOST_MAKE_FLAGS += \
--disable-nls
HOST_MAKE_FLAGS += \