From 12e47458520fd70be1a6ebafaa3f754fdc49044f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 7 Sep 2015 22:20:30 -0300 Subject: linux-libre{,-dtb}: fix RCN patching --- libre/linux-libre-dtb/PKGBUILD | 3 ++- libre/linux-libre/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'libre') 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" -- cgit v1.2.3-54-g00ecf