aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Oliveira <robertoguimaraes8@gmail.com>2017-06-01 13:21:07 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-06-16 14:17:59 +0200
commitbf5323d2b58bab33fcc809886c3b0e75033ac2cf (patch)
tree5ba752a306e1483e6509eeb38588311b96374b9c
parentb94677ab61788321ca49525a88ae523c9f0a6bca (diff)
downloadalpine_aports-bf5323d2b58bab33fcc809886c3b0e75033ac2cf.tar.bz2
alpine_aports-bf5323d2b58bab33fcc809886c3b0e75033ac2cf.tar.xz
alpine_aports-bf5323d2b58bab33fcc809886c3b0e75033ac2cf.zip
main/grub: add powerpc-utils as dependency for grub-ieee1275
grub-ieee1275 for ppc64le requires some commands that are provided by powerpc-utils. Said that, I am moving powerpc-utils to main packages and addig it as dependency for grub-ieee1275.
-rw-r--r--main/grub/APKBUILD7
-rw-r--r--main/powerpc-utils/APKBUILD (renamed from testing/powerpc-utils/APKBUILD)0
2 files changed, 4 insertions, 3 deletions
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index b77d443ead..077ac02604 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -3,7 +3,7 @@
3pkgname=grub 3pkgname=grub
4_ver=2.02~beta3 4_ver=2.02~beta3
5pkgver=2.02_beta3 5pkgver=2.02_beta3
6pkgrel=6 6pkgrel=7
7pkgdesc="Bootloader with support for Linux, Multiboot and more" 7pkgdesc="Bootloader with support for Linux, Multiboot and more"
8url="https://www.gnu.org/software/grub/" 8url="https://www.gnu.org/software/grub/"
9arch="all !armhf !s390x" 9arch="all !armhf !s390x"
@@ -22,7 +22,8 @@ case "$CARCH" in
22x86) subpackages="$subpackages $pkgname-efi $pkgname-bios" ;; 22x86) subpackages="$subpackages $pkgname-efi $pkgname-bios" ;;
23x86_64) subpackages="$subpackages $pkgname-efi $pkgname-bios $pkgname-xenhost" ;; 23x86_64) subpackages="$subpackages $pkgname-efi $pkgname-bios $pkgname-xenhost" ;;
24aarch64) subpackages="$subpackages $pkgname-efi" ;; 24aarch64) subpackages="$subpackages $pkgname-efi" ;;
25ppc64le) subpackages="$subpackages $pkgname-ieee1275" ;; 25ppc64le) subpackages="$subpackages $pkgname-ieee1275"
26 makedepends="$makedepends powerpc-utils" ;;
26s390x) subpackages="$subpackages $pkgname-emu" ;; 27s390x) subpackages="$subpackages $pkgname-emu" ;;
27esac 28esac
28 29
@@ -246,7 +247,7 @@ xenhost() {
246 247
247ieee1275() { 248ieee1275() {
248 pkgdesc="$pkgdesc (IEEE1275 version)" 249 pkgdesc="$pkgdesc (IEEE1275 version)"
249 depends="$pkgname" 250 depends="$pkgname powerpc-utils"
250 mkdir -p $subpkgdir/usr/lib/grub 251 mkdir -p $subpkgdir/usr/lib/grub
251 mv $pkgdir/usr/lib/grub/*-ieee1275 $subpkgdir/usr/lib/grub/ 252 mv $pkgdir/usr/lib/grub/*-ieee1275 $subpkgdir/usr/lib/grub/
252} 253}
diff --git a/testing/powerpc-utils/APKBUILD b/main/powerpc-utils/APKBUILD
index e514f48687..e514f48687 100644
--- a/testing/powerpc-utils/APKBUILD
+++ b/main/powerpc-utils/APKBUILD