summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-07 22:20:30 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-07 22:20:30 -0300
commit12e47458520fd70be1a6ebafaa3f754fdc49044f (patch)
treedb171a8a1f743885cafc628d7807841f4a930f07
parentb30604f3fe600e853b8042adeb58fd99da45a396 (diff)
downloadabslibre-12e47458520fd70be1a6ebafaa3f754fdc49044f.tar.gz
abslibre-12e47458520fd70be1a6ebafaa3f754fdc49044f.tar.bz2
abslibre-12e47458520fd70be1a6ebafaa3f754fdc49044f.zip
linux-libre{,-dtb}: fix RCN patching
-rw-r--r--libre/linux-libre-dtb/PKGBUILD3
-rw-r--r--libre/linux-libre/PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/libre/linux-libre-dtb/PKGBUILD b/libre/linux-libre-dtb/PKGBUILD
index d7af00bb6..8f5711d30 100644
--- a/libre/linux-libre-dtb/PKGBUILD
+++ b/libre/linux-libre-dtb/PKGBUILD
@@ -12,6 +12,7 @@ pkgdesc='dtb files for Linux-libre'
arch=('armv7h')
url=('http://linux-libre.fsfla.org/')
license=('GPL2')
+makedepends=('git')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign"
"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
@@ -54,7 +55,7 @@ prepare() {
fi
# RCN patch (CM3 firmware deblobbed)
- patch -p1 -i "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+ git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
# ALARM patches
patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b2a07b444..ebf83de26 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -27,7 +27,7 @@ url="http://linux-libre.fsfla.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
if [ "$CARCH" = "armv7h" ]; then
- makedepends+=('uboot-tools')
+ makedepends+=('git' 'uboot-tools')
fi
options=('!strip')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
@@ -110,7 +110,7 @@ prepare() {
if [ "${CARCH}" = "armv7h" ]; then
# RCN patch (CM3 firmware deblobbed)
- patch -p1 -i "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+ git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
# ALARM patches
patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"