diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-10-04 20:01:48 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-10-04 20:14:19 -0300 |
| commit | 229c4fcf3a4075d6005fb8bbe8daa945d8a8e086 (patch) | |
| tree | aeefbf65a54d5397e01e5ad5d76b79d642660a7f /libre/linux-libre-pck/PKGBUILD | |
| parent | 63a876f40b45dea45fd3755dad61160e4c5eb199 (diff) | |
remove linux-uimage from conflicts and replaces arrays for armv7h kernels
Diffstat (limited to 'libre/linux-libre-pck/PKGBUILD')
| -rw-r--r-- | libre/linux-libre-pck/PKGBUILD | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 0b3ee9828..627e6de99 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -179,7 +179,6 @@ _package() { provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") - [ "${CARCH}" = "armv7h" ] && conflicts+=("${_replacesarchkernel}-uimage") && replaces+=("${_replacesarchkernel}-uimage") if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then depends+=('mkinitcpio>=0.7') backup=("etc/mkinitcpio.d/${pkgbase}.preset") @@ -194,13 +193,10 @@ _package() { _basekernel=${_basekernel%.*} mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} - if [ "${CARCH}" = "armv7h" ]; then - mkdir -p "${pkgdir}/boot/dtbs/${pkgbase}" - fi make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install if [ "${CARCH}" = "armv7h" ]; then + make LOCALVERSION= INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs/${pkgbase}" dtbs_install cp arch/$KARCH/boot/zImage "${pkgdir}/boot/vmlinuz-${pkgbase}" - cp arch/$KARCH/boot/dts/*.dtb "${pkgdir}/boot/dtbs/${pkgbase}" elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" fi |