Merge pull request #1200 from sctincman/linux-parallella

core/linux-parallella to 3.14.12

core/linux-parallella/PKGBUILD

@@ -1,34 +1,31 @@
 # Parallella
 # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
+# Contributor: Scott Tincman <sctincman@gmail.com>
 
 buildarch=4
 
 pkgbase=linux-parallella
-_commit=c3c3ff26b9c1abf60176c280cf1a16d1e18e9c00
-_srcname=parallella-linux-adi-${_commit}
+_commit=7a0dc647b9b1c0010ff83fc117e29b408d5693bb
+_srcname=parallella-linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Parallella"
-pkgver=3.12.0
+pkgver=3.14.12
 pkgrel=1
 arch=('armv7h')
-url="https://github.com/parallella/parallella-linux-adi"
+url="https://github.com/parallella/parallella-linux"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage')
 options=('!strip')
-source=("https://github.com/parallella/parallella-linux-adi/archive/${_commit}.tar.gz"
-        'alarm.patch'
+source=("https://github.com/parallella/parallella-linux/archive/${_commit}.tar.gz"
         'config')
-md5sums=('efff205c33043ebf83483543293b3211'
-         '0ca4c6be68ddd1ee1c9224f80fc3a698'
-         '0c079fc22fd3e798511afb1eaf985244')
+sha256sums=('4b19478f7932294c92c749843c7f68c3d35deb28937f76f4154bec68f83076eb'
+            '8bb191e1ac181b0c0fa2ed0a64cf1e367d291f0f4045c000634f40b6c06d970d')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
 
   cat "${srcdir}/config" > ./.config
 
-  patch -p0 -i ../alarm.patch
-
   # add pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile
 
@@ -63,7 +60,7 @@ build() {
   #yes "" | make config
 
   # build!
-  make ${MAKEFLAGS} UIMAGE_LOADADDR=0x8000 uImage modules zynq-parallella.dtb
+  make ${MAKEFLAGS} UIMAGE_LOADADDR=0x8000 uImage modules zynq-parallella1-headless.dtb
 }
 
 _package() {
@@ -86,7 +83,7 @@ _package() {
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make INSTALL_MOD_PATH="${pkgdir}" modules_install
   cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
-  cp arch/$KARCH/boot/dts/zynq-parallella.dtb "${pkgdir}/boot/devicetree.dtb"
+  cp arch/$KARCH/boot/dts/zynq-parallella1-headless.dtb "${pkgdir}/boot/devicetree.dtb"
 
   # set correct depmod command for install
   sed \

core/linux-parallella/linux-parallella.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-parallella
-KERNEL_VERSION=3.12.0-1-ARCH
+KERNEL_VERSION=3.14.12-parallella-1-ARCH
 
 post_install () {
   # updating module dependencies