summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch (renamed from libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch)0
-rw-r--r--libre/uboot-trimslice/PKGBUILD (renamed from libre/uboot-trimslice-linux-libre/PKGBUILD)25
-rw-r--r--libre/uboot-trimslice/boot.txt (renamed from libre/uboot-trimslice-linux-libre/boot.txt)0
3 files changed, 12 insertions, 13 deletions
diff --git a/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch b/libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch
index 30718c561..30718c561 100644
--- a/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch
+++ b/libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch
diff --git a/libre/uboot-trimslice-linux-libre/PKGBUILD b/libre/uboot-trimslice/PKGBUILD
index b35cfe06e..a3cdc2d8b 100644
--- a/libre/uboot-trimslice-linux-libre/PKGBUILD
+++ b/libre/uboot-trimslice/PKGBUILD
@@ -1,24 +1,23 @@
# U-Boot: TrimSlice
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
buildarch=4
-_pkgname=linux-libre
-pkgname=uboot-trimslice-${_pkgname}
+pkgname=uboot-trimslice
pkgver=2014.10
-pkgrel=1
-pkgdesc="U-Boot for TrimSlice (built for the linux-libre kernel package)"
+pkgrel=1.parabola1
+pkgdesc="U-Boot for TrimSlice"
arch=('armv7h')
url="http://git.denx.de/u-boot.git/"
makedepends=('cbootimage' 'dtc' 'uboot-tools')
depends=('linux-libre')
-replaces=('uboot-trimslice')
+replaces=('uboot-trimslice-linux-libre')
+conflicts=('uboot4extlinux-trimslice' 'uboot4grub-trimslice')
license=('GPL')
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
"git+https://github.com/NVIDIA/cbootimage-configs.git"
"boot.txt"
- "0002-kernel-add-support-for-gcc-5.patch")
+ "0001-kernel-add-support-for-gcc-5.patch")
md5sums=('3ddcaee2f05b7c464778112ec83664b5'
'SKIP'
'9374fbadb4b4c1298ea050ad4ea79f46'
@@ -27,7 +26,7 @@ md5sums=('3ddcaee2f05b7c464778112ec83664b5'
prepare() {
cd u-boot-${pkgver}
- patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
+ patch -Np1 -i ../0001-kernel-add-support-for-gcc-5.patch
}
build() {
@@ -41,13 +40,13 @@ build() {
}
package() {
- mkdir -p "${pkgdir}/boot/${pkgname}"
- mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "TrimSlice" -d boot.txt "${pkgdir}/boot/${pkgname}"/boot.scr
- cp boot.txt "${pkgdir}/boot/${pkgname}"
+ mkdir -p "${pkgdir}"/boot
+ mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "TrimSlice" -d boot.txt "${pkgdir}"/boot/boot.scr
+ cp boot.txt "${pkgdir}"/boot
cd cbootimage-configs/tegra20/compulab/trimslice
ln -s ${srcdir}/u-boot-${pkgver}/u-boot-dtb-tegra.bin u-boot.bin
./build.sh
- cp trimslice-mmc.img trimslice-spi.img "${pkgdir}/boot/${pkgname}"
+ cp trimslice-mmc.img trimslice-spi.img "${pkgdir}"/boot
}
diff --git a/libre/uboot-trimslice-linux-libre/boot.txt b/libre/uboot-trimslice/boot.txt
index 100d4b6de..100d4b6de 100644
--- a/libre/uboot-trimslice-linux-libre/boot.txt
+++ b/libre/uboot-trimslice/boot.txt