diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/boot/grub2 | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/boot/grub2')
| -rw-r--r-- | package/boot/grub2/Makefile | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile index b606f54be..dd490ff17 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/Makefile @@ -16,7 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/grub PKG_MD5SUM:=e927540b6eda8b024fb0391eeaa4091c -PKG_HOST_ONLY:=1 HOST_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=grub2/host @@ -32,6 +31,23 @@ define Package/grub2 DEPENDS:=@TARGET_x86 endef +define Package/grub2-editenv + CATEGORY:=Utilities + SECTION:=utils + TITLE:=Grub2 Environment editor + URL:=http://www.gnu.org/software/grub/ + DEPENDS:=@TARGET_x86 +endef + +define Package/grub2-editenv/description + Edit grub2 environment files. +endef + +CONFIGURE_ARGS += \ + --target=$(REAL_GNU_TARGET_NAME) \ + --disable-werror \ + --disable-nls + HOST_CONFIGURE_ARGS += \ --target=$(REAL_GNU_TARGET_NAME) \ --sbindir="$(STAGING_DIR_HOST)/bin" \ @@ -47,5 +63,11 @@ define Host/Configure $(Host/Configure/Default) endef +define Package/grub2-editenv/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ +endef + $(eval $(call HostBuild)) $(eval $(call BuildPackage,grub2)) +$(eval $(call BuildPackage,grub2-editenv)) |