Merge branch 'master' into rx51_kernel4.12

This commit is contained in:
Martijn Braam 2017-07-16 16:58:21 +02:00 committed by GitHub
commit 626f3c891a
2 changed files with 3 additions and 2 deletions

View file

@ -5,7 +5,7 @@ pkgdesc="Nokia N900"
url="https://github.com/postmarketOS" url="https://github.com/postmarketOS"
arch="noarch" arch="noarch"
license="MIT" license="MIT"
depends="linux-nokia-rx51 uboot-tools" depends="linux-nokia-rx51 uboot-tools linux-firmware"
makedepends="uboot-tools" makedepends="uboot-tools"
install="" install=""
subpackages="" subpackages=""

View file

@ -22,6 +22,7 @@ case $pkgver in
*.*) _kernver=$pkgver;; *.*) _kernver=$pkgver;;
esac esac
pkgrel=1 pkgrel=1
arch="armhf" arch="armhf"
pkgdesc="Mainline Linux for the Nokia N900" pkgdesc="Mainline Linux for the Nokia N900"
url="https://github.com/pali/linux-n900" url="https://github.com/pali/linux-n900"
@ -110,7 +111,7 @@ package() {
"$pkgdir/usr/share/kernel/$_flavor/kernel.release" "$pkgdir/usr/share/kernel/$_flavor/kernel.release"
cd "$srcdir"/build cd "$srcdir"/build
make -j1 modules_install firmware_install \ make -j1 modules_install \
ARCH="$_carch" \ ARCH="$_carch" \
INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_PATH="$pkgdir" \
|| return 1 || return 1