diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-01-15 06:55:56 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-01-15 06:55:56 +0100 |
| commit | bafddb056fe8435c4de2b3e287350e4cd88673da (patch) | |
| tree | f474b100f062110a65fc4b55043ab052938b2116 | |
| parent | a3759cd62858b593d2a6417310916732b66f8e39 (diff) | |
| download | abslibre-bafddb056fe8435c4de2b3e287350e4cd88673da.tar.gz abslibre-bafddb056fe8435c4de2b3e287350e4cd88673da.tar.bz2 abslibre-bafddb056fe8435c4de2b3e287350e4cd88673da.zip | |
libre/grub: adding armv7h grub builds to pkgname unconditionally, and overriding arch=(armv7h) in the package_* functions - this helps makepkg --packagelist to behave correctly
| -rw-r--r-- | libre/grub/PKGBUILD | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 6f63cb3c6..39899b17f 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -34,9 +34,8 @@ _UNIFONT_VER='10.0.06' [[ "${CARCH}" = 'i686' ]] && _EMU_ARCH='i386' pkgbase='grub' -pkgname=('grub') -[[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle' - 'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab') +pkgname=('grub' 'grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle' + 'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab') pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)' pkgver='2.02' pkgrel='3.parabola1' @@ -773,6 +772,7 @@ package_grub() { } package_grub-am335x_bone() { + arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBone and BeagleBone Black (am335x-bone), (Parabola rebranded)' optdepends+=('dosfstools: For grub-mkrescue FAT FS' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' @@ -806,6 +806,7 @@ package_grub-am335x_bone() { } package_grub-omap3_beagle() { + arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard (omap3_beagle), (Parabola rebranded)' provides+=('grub-beagleboard') optdepends+=('dosfstools: For grub-mkrescue FAT FS' @@ -840,6 +841,7 @@ package_grub-omap3_beagle() { } package_grub-omap3_beagle_xm() { + arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM (omap3_beagle_xm), (Parabola rebranded)' provides+=('grub-beagleboard') optdepends+=('dosfstools: For grub-mkrescue FAT FS' @@ -874,6 +876,7 @@ package_grub-omap3_beagle_xm() { } package_grub-omap3_beagle_xm_ab() { + arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM rev A/B (omap3_beagle_xm_ab), (Parabola rebranded)' provides+=('grub-beagleboard') optdepends+=('dosfstools: For grub-mkrescue FAT FS' @@ -908,6 +911,7 @@ package_grub-omap3_beagle_xm_ab() { } package_grub-udoo() { + arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for UDOO (udoo), (Parabola rebranded)' optdepends+=('dosfstools: For grub-mkrescue FAT FS' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' |