diff options
-rw-r--r-- | libre/acpi_call/PKGBUILD (renamed from libre/acpi_call-parabola/PKGBUILD) | 39 | ||||
-rw-r--r-- | libre/acpi_call/kmod.install (renamed from libre/acpi_call-parabola/kmod.install) | 0 | ||||
-rw-r--r-- | libre/bbswitch/PKGBUILD (renamed from libre/bbswitch-parabola/PKGBUILD) | 37 | ||||
-rw-r--r-- | libre/bbswitch/kmod.install (renamed from libre/bbswitch-parabola/kmod.install) | 0 | ||||
-rw-r--r-- | libre/lirc/PKGBUILD (renamed from libre/lirc-parabola/PKGBUILD) | 53 | ||||
-rw-r--r-- | libre/lirc/irexec.service (renamed from libre/lirc-parabola/irexec.service) | 0 | ||||
-rw-r--r-- | libre/lirc/kmod.install (renamed from libre/lirc-parabola/kmod.install) | 0 | ||||
-rw-r--r-- | libre/lirc/lirc-0.9.1a-fix-segfaults.patch (renamed from libre/lirc-parabola/lirc-0.9.1a-fix-segfaults.patch) | 0 | ||||
-rw-r--r-- | libre/lirc/lirc-utils.install (renamed from libre/lirc-parabola/lirc-utils.install) | 0 | ||||
-rw-r--r-- | libre/lirc/lirc.logrotate (renamed from libre/lirc-parabola/lirc.logrotate) | 0 | ||||
-rw-r--r-- | libre/lirc/lirc.tmpfiles (renamed from libre/lirc-parabola/lirc.tmpfiles) | 0 | ||||
-rw-r--r-- | libre/lirc/wpc8769l-build-fix.patch (renamed from libre/lirc-parabola/wpc8769l-build-fix.patch) | 0 | ||||
-rw-r--r-- | libre/tp_smapi/PKGBUILD (renamed from libre/tp_smapi-parabola/PKGBUILD) | 36 | ||||
-rw-r--r-- | libre/tp_smapi/kmod.install (renamed from libre/tp_smapi-parabola/kmod.install) | 0 | ||||
-rw-r--r-- | libre/vhba-module/60-vhba.rules (renamed from libre/vhba-module-parabola/60-vhba.rules) | 0 | ||||
-rw-r--r-- | libre/vhba-module/PKGBUILD (renamed from libre/vhba-module-parabola/PKGBUILD) | 37 | ||||
-rw-r--r-- | libre/vhba-module/kmod.install (renamed from libre/vhba-module-parabola/kmod.install) | 0 |
17 files changed, 126 insertions, 76 deletions
diff --git a/libre/acpi_call-parabola/PKGBUILD b/libre/acpi_call/PKGBUILD index 35fda1171..1629c010c 100644 --- a/libre/acpi_call-parabola/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -8,35 +8,45 @@ _kernelname= _basekernel=3.16 -_pkgrel=1 if [[ ${_kernelname} == "" ]]; then _basekernel=${_basekernel} - _pkgrel=11.3 + _archrel=11 + _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _pkgrel=7 + _archrel=7 + _parabolarel=1 elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.15 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} +elif [[ ${_kernelname} == -lts-grsec ]]; then + _basekernel=3.14 + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts-knock ]]; then _basekernel=3.10 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -rt ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -pae ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -xen ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} fi _pkgname=acpi_call -pkgname=${_pkgname}${_kernelname}-parabola +pkgname=${_pkgname}${_kernelname} pkgver=1.1.0 -pkgrel=${_pkgrel} +pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel} _extramodules=extramodules-${_basekernel}${_kernelname} pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)" arch=('i686' 'x86_64' 'mips64el') @@ -48,11 +58,10 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -[[ -n ${_kernelname} ]] && replaces+=("${_pkgname}-parabola${_kernelname}") -conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -[[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}-parabola${_kernelname}") -provides=("${_pkgname}${_kernelname}=${pkgver}") +replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") +[[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola") +conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") +[[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola") install='kmod.install' source=("${url}/archive/v${pkgver}.tar.gz") diff --git a/libre/acpi_call-parabola/kmod.install b/libre/acpi_call/kmod.install index 40caa464f..40caa464f 100644 --- a/libre/acpi_call-parabola/kmod.install +++ b/libre/acpi_call/kmod.install diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch/PKGBUILD index bdac305f6..a7d017da3 100644 --- a/libre/bbswitch-parabola/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -7,35 +7,47 @@ _kernelname= _basekernel=3.16 -_pkgrel=15.2 +_archrel=15 +_parabolarel=1 if [[ ${_kernelname} == "" ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.15 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} +elif [[ ${_kernelname} == -lts-grsec ]]; then + _basekernel=3.14 + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts-knock ]]; then _basekernel=3.10 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -rt ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -pae ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -xen ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} fi _pkgname=bbswitch -pkgname=${_pkgname}${_kernelname}-parabola +pkgname=${_pkgname}${_kernelname} pkgver=0.8 -pkgrel=${_pkgrel} +pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel} _extramodules=extramodules-${_basekernel}${_kernelname} pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre${_kernelname} kernel package)" arch=('i686' 'x86_64' 'mips64el') @@ -47,9 +59,8 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -provides=("${_pkgname}${_kernelname}=${pkgver}") +replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") +conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") install='kmod.install' source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") diff --git a/libre/bbswitch-parabola/kmod.install b/libre/bbswitch/kmod.install index 40caa464f..40caa464f 100644 --- a/libre/bbswitch-parabola/kmod.install +++ b/libre/bbswitch/kmod.install diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc/PKGBUILD index f4136ff98..ff9c204df 100644 --- a/libre/lirc-parabola/PKGBUILD +++ b/libre/lirc/PKGBUILD @@ -6,41 +6,53 @@ _kernelname= _basekernel=3.16 -_pkgrel=3.3 +_archrel=3 +_parabolarel=1 if [[ ${_kernelname} == "" ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.15 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} +elif [[ ${_kernelname} == -lts-grsec ]]; then + _basekernel=3.14 + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts-knock ]]; then _basekernel=3.10 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -rt ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -pae ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -xen ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} fi pkgbase=lirc -_pkgname=${pkgbase}${_kernelname}-parabola +_pkgname=${pkgbase}${_kernelname} if [[ -z ${_kernelname} ]]; then - pkgname=("$_pkgname" "${pkgbase}-utils-parabola") + pkgname=("$_pkgname" "${pkgbase}-utils") else pkgname=("$_pkgname") fi _pkgver=0.9.1a [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" -pkgrel=${_pkgrel} +pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel} epoch=1 _extramodules=extramodules-${_basekernel}${_kernelname} arch=('i686' 'x86_64' 'mips64el') @@ -102,14 +114,13 @@ build() { make } -_package_lirc-parabola() { +package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)" depends=("${pkgbase}-utils" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") - replaces=("${pkgbase}${_kernelname}" "${pkgbase}-libre${_kernelname}") - [[ -n ${_kernelname} ]] && replaces+=("${pkgbase}-parabola${_kernelname}") - conflicts=("${pkgbase}${_kernelname}" "${pkgbase}-libre${_kernelname}") - [[ -n ${_kernelname} ]] && conflicts+=("${pkgbase}-parabola${_kernelname}") - provides=("${pkgbase}${_kernelname}=${epoch}:${pkgver}") + replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") + [[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola") + conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") + [[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola") replaces+=("${pkgbase}+pctv") install=kmod.install @@ -123,17 +134,15 @@ _package_lirc-parabola() { true && install=${install}.pkg sed -i "s/^_EXTRAMODULES=$/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}" } -eval "package_${_pkgname}() { _package_lirc-parabola; }" -package_lirc-utils-parabola() { +package_lirc-utils() { pkgdesc="Linux Infrared Remote Control utilities" depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip') backup=("etc/${pkgbase}/${pkgbase}_options.conf" "etc/${pkgbase}/${pkgbase}d.conf" "etc/${pkgbase}/${pkgbase}md.conf") - replaces=("${pkgbase}-utils" "${pkgbase}-libre-utils") - conflicts=("${pkgbase}-utils" "${pkgbase}-libre-utils") - provides=("${pkgbase}-utils=${epoch}:${pkgver}") + replaces=("${pkgbase}-libre-utils" "${pkgbase}-utils-parabola") + conflicts=("${pkgbase}-libre-utils" "${pkgbase}-utils-parabola") install=${pkgbase}-utils.install cd "${srcdir}/${pkgbase}-${_pkgver}" diff --git a/libre/lirc-parabola/irexec.service b/libre/lirc/irexec.service index dffbbf5e0..dffbbf5e0 100644 --- a/libre/lirc-parabola/irexec.service +++ b/libre/lirc/irexec.service diff --git a/libre/lirc-parabola/kmod.install b/libre/lirc/kmod.install index 40caa464f..40caa464f 100644 --- a/libre/lirc-parabola/kmod.install +++ b/libre/lirc/kmod.install diff --git a/libre/lirc-parabola/lirc-0.9.1a-fix-segfaults.patch b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch index a1f657551..a1f657551 100644 --- a/libre/lirc-parabola/lirc-0.9.1a-fix-segfaults.patch +++ b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch diff --git a/libre/lirc-parabola/lirc-utils.install b/libre/lirc/lirc-utils.install index f7faa07eb..f7faa07eb 100644 --- a/libre/lirc-parabola/lirc-utils.install +++ b/libre/lirc/lirc-utils.install diff --git a/libre/lirc-parabola/lirc.logrotate b/libre/lirc/lirc.logrotate index 623c4f328..623c4f328 100644 --- a/libre/lirc-parabola/lirc.logrotate +++ b/libre/lirc/lirc.logrotate diff --git a/libre/lirc-parabola/lirc.tmpfiles b/libre/lirc/lirc.tmpfiles index 0b80e2e47..0b80e2e47 100644 --- a/libre/lirc-parabola/lirc.tmpfiles +++ b/libre/lirc/lirc.tmpfiles diff --git a/libre/lirc-parabola/wpc8769l-build-fix.patch b/libre/lirc/wpc8769l-build-fix.patch index 5e25693ab..5e25693ab 100644 --- a/libre/lirc-parabola/wpc8769l-build-fix.patch +++ b/libre/lirc/wpc8769l-build-fix.patch diff --git a/libre/tp_smapi-parabola/PKGBUILD b/libre/tp_smapi/PKGBUILD index 0a789ecb9..d14d7c91e 100644 --- a/libre/tp_smapi-parabola/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -12,35 +12,46 @@ _kernelname= _basekernel=3.16 -_pkgrel=1 +_parabolarel=1 if [[ ${_kernelname} == "" ]]; then _basekernel=${_basekernel} - _pkgrel=52.2 + _archrel=52 + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _pkgrel=29.1 + _archrel=29 + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.15 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} +elif [[ ${_kernelname} == -lts-grsec ]]; then + _basekernel=3.14 + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts-knock ]]; then _basekernel=3.10 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -rt ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -pae ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -xen ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} fi _pkgname=tp_smapi -pkgname=${_pkgname}${_kernelname}-parabola +pkgname=${_pkgname}${_kernelname} pkgver=0.41 -pkgrel=${_pkgrel} +pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel} _extramodules=extramodules-${_basekernel}${_kernelname} pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre${_kernelname} kernel package)" arch=('i686' 'x86_64' 'mips64el') @@ -52,9 +63,8 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -provides=("${_pkgname}${_kernelname}=${pkgver}") +replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") +conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") install='kmod.install' source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") diff --git a/libre/tp_smapi-parabola/kmod.install b/libre/tp_smapi/kmod.install index 40caa464f..40caa464f 100644 --- a/libre/tp_smapi-parabola/kmod.install +++ b/libre/tp_smapi/kmod.install diff --git a/libre/vhba-module-parabola/60-vhba.rules b/libre/vhba-module/60-vhba.rules index 39ae3a4ec..39ae3a4ec 100644 --- a/libre/vhba-module-parabola/60-vhba.rules +++ b/libre/vhba-module/60-vhba.rules diff --git a/libre/vhba-module-parabola/PKGBUILD b/libre/vhba-module/PKGBUILD index 18e863bf6..d14218281 100644 --- a/libre/vhba-module-parabola/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -7,35 +7,47 @@ _kernelname= _basekernel=3.16 -_pkgrel=6.2 +_archrel=6 +_parabolarel=1 if [[ ${_kernelname} == "" ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.15 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} +elif [[ ${_kernelname} == -lts-grsec ]]; then + _basekernel=3.14 + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -lts-knock ]]; then _basekernel=3.10 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -rt ]]; then _basekernel=3.14 - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -pae ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} elif [[ ${_kernelname} == -xen ]]; then _basekernel=${_basekernel} - _pkgrel=${_pkgrel} + _archrel=${_archrel} + _parabolarel=${_parabolarel} fi _pkgname=vhba-module -pkgname=${_pkgname}${_kernelname}-parabola +pkgname=${_pkgname}${_kernelname} pkgver=20140629 -pkgrel=${_pkgrel} +pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel} _extramodules=extramodules-${_basekernel}${_kernelname} pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre${_kernelname} kernel package)" arch=('i686' 'x86_64' 'mips64el') @@ -47,9 +59,8 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") -provides=("${_pkgname}${_kernelname}=${pkgver}") +replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") +conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") options=(!makeflags) install='kmod.install' diff --git a/libre/vhba-module-parabola/kmod.install b/libre/vhba-module/kmod.install index 08ecfbfba..08ecfbfba 100644 --- a/libre/vhba-module-parabola/kmod.install +++ b/libre/vhba-module/kmod.install |