diff options
| -rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 7064443db..df73e29d5 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -22,7 +22,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*}_${_rtpatchver} -pkgver=${_pkgver//-/.}_${_rtpatchver} +pkgver=${_pkgver//-/.}.${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="https://rt.wiki.kernel.org/" @@ -49,8 +49,8 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'bdb59c597c883cc0f78cebccca5652e79b63f30e1d497e0560737ba66a48ae27' 'aedc16bf897b0a1b0789158afad9ffed92be30eaedf8fe2f27cad659673dc93e' 'bf045f04e45ed068c1d79e48915039edb56db6e0e18aa84bdd84335f0d211801' + 'f2b934cd69c795ede11775bf16dad41cc0e4f78178dd16f6bb133b4f86786acf' '7dacc05e0d5cae7e176ed6f668a17ec43334daed58653847326e271b48c45aba' - '' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' @@ -82,7 +82,8 @@ prepare() { fi # add realtime patch - patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch" + patch -p1 -i "${srcdir}/patch-${_pkgver%-*}-${_rtpatchver}.patch" + rm localversion-rt # revert a few troublesome patches patch -p1 -i "${srcdir}/revert_timers-dont_raise_softirq_unconditionally_and_fixes.patch" @@ -118,7 +119,7 @@ prepare() { cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion - sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile + sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${_rtpatchver}-${pkgrel}|" Makefile # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh @@ -150,8 +151,8 @@ _package() { depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") - conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules}") - replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -160,7 +161,7 @@ _package() { # get kernel version _kernver="$(make LOCALVERSION= kernelrelease)" _basekernel=${_kernver%%-*} - _basekernel=${_basekernel%.*} + _basekernel=${_basekernel%.*.*} mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install @@ -208,9 +209,9 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=("${_provides[@]/%/-headers=${_archpkgver}}") - conflicts=("${_provides[@]/%/-headers}" "${_replaces[@]/%/-headers}") - replaces=("${_provides[@]/%/-headers}" "${_replaces[@]/%/-headers}") + provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -327,9 +328,9 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=("${_provides[@]/%/-docs=${_archpkgver}}") - conflicts=("${_provides[@]/%/-docs}" "${_replaces[@]/%/-docs}") - replaces=("${_provides[@]/%/-docs}" "${_replaces[@]/%/-docs}") + provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") cd "${srcdir}/${_srcname}" |