diff options
| author | fauno <fauno@endefensadelsl.org> | 2017-04-25 17:47:20 -0300 |
|---|---|---|
| committer | fauno <fauno@endefensadelsl.org> | 2017-04-25 17:47:20 -0300 |
| commit | be373f6b99054c98d7bb847fdfc5b9fb278db352 (patch) | |
| tree | 53a0219d366f52711cd195525608194597cc615c /libre | |
| parent | c8217633f8a10bbe4e3cb2acf070410480903dac (diff) | |
| parent | f5b32de57f842bc2542ffdad71c619e8147884a3 (diff) | |
| download | abslibre-be373f6b99054c98d7bb847fdfc5b9fb278db352.tar.gz abslibre-be373f6b99054c98d7bb847fdfc5b9fb278db352.tar.bz2 abslibre-be373f6b99054c98d7bb847fdfc5b9fb278db352.zip | |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 49fbcb8f2..c8c90db97 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -21,15 +21,13 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 rcnrel=armv7-x1 arch=('i686' 'x86_64' 'armv7h') url="https://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf') makedepends_armv7h=('git') -conflicts=('linux') -replaces=('linux') options=('!strip') source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" @@ -188,8 +186,8 @@ _package() { depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "kernel=${_archpkgver}") - conflicts=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") - replaces=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}" "${_replacesarchkernel[@]}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -254,8 +252,8 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}") - conflicts=("${_replacesoldkernels[@]/%/-headers}") - replaces=("${_replacesoldkernels[@]/%/-headers}") + conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -395,8 +393,8 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}") - conflicts=("${_replacesoldkernels[@]/%/-docs}") - replaces=("${_replacesoldkernels[@]/%/-docs}") + conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") cd "${srcdir}/${_srcname}" |