summaryrefslogtreecommitdiff
path: root/package/grub
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-29 11:40:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-29 21:56:31 +0200
commitf14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch)
tree7617315e619f969c13e79c1f44c2428871719357 /package/grub
parent365261c9db442081290b7d21aba6201244af294d (diff)
resolve merge conflict
Diffstat (limited to 'package/grub')
-rw-r--r--package/grub/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 66100ba85..ca618209c 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= grub
PKG_VERSION:= 2.00
PKG_RELEASE:= 5
PKG_MD5SUM:= a1043102fbc7bcedbf53e7ee3d17ab91
-PKG_DESCR:= GRUB2 bootloader
-PKG_SECTION:= boot
+PKG_DESCR:= multiboot boot loader
+PKG_SECTION:= base/boot
PKG_BUILDDEP:= bison-host
PKG_URL:= http://www.gnu.org/software/grub
PKG_SITES:= ftp://ftp.gnu.org/gnu/grub/
@@ -18,7 +18,7 @@ PKG_SYSTEM_DEPENDS:= !mikrotik-rb532
PKG_NOPARALLEL:= 1
PKG_SUBPKGS:= GRUB GRUB_TOOLS
-PKGSD_GRUB_TOOLS:= GRUB2 tools
+PKGSD_GRUB_TOOLS:= grub2 tools
PKG_CHOICES_GRUB:= PC EFI
PKGCD_PC:= build for PC BIOS