diff options
author | David P <megver83@parabola.nu> | 2017-06-11 14:12:53 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2017-06-11 14:12:53 -0400 |
commit | 74fc77063bb6095956ffcc25aa4598d5eb5c0f0c (patch) | |
tree | 04c1d9e10421cc706fe09ec1cea71969ffdb0084 | |
parent | 0beff081d41400eb0091d58fcf52d77ef85fa649 (diff) | |
download | abslibre-74fc77063bb6095956ffcc25aa4598d5eb5c0f0c.tar.gz abslibre-74fc77063bb6095956ffcc25aa4598d5eb5c0f0c.tar.bz2 abslibre-74fc77063bb6095956ffcc25aa4598d5eb5c0f0c.zip |
Fixed issues in some kernels' PKGBUILDs
-rw-r--r-- | kernels/linux-libre-apparmor/PKGBUILD | 4 | ||||
-rw-r--r-- | kernels/linux-libre-audit/PKGBUILD | 18 | ||||
-rw-r--r-- | kernels/linux-libre-knock/PKGBUILD | 4 | ||||
-rw-r--r-- | kernels/linux-libre-nand/PKGBUILD | 4 | ||||
-rw-r--r-- | kernels/linux-libre-pae/PKGBUILD | 4 | ||||
-rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 6 | ||||
-rw-r--r-- | kernels/linux-libre-xen/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-pck/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 4 |
9 files changed, 27 insertions, 27 deletions
diff --git a/kernels/linux-libre-apparmor/PKGBUILD b/kernels/linux-libre-apparmor/PKGBUILD index 9d9411649..5a38286e7 100644 --- a/kernels/linux-libre-apparmor/PKGBUILD +++ b/kernels/linux-libre-apparmor/PKGBUILD @@ -183,8 +183,8 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with AppArmor support" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openr') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country' 'apparmor: to configure and enable mandatory access control for programs') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") diff --git a/kernels/linux-libre-audit/PKGBUILD b/kernels/linux-libre-audit/PKGBUILD index c88db1aee..0f89b99f4 100644 --- a/kernels/linux-libre-audit/PKGBUILD +++ b/kernels/linux-libre-audit/PKGBUILD @@ -171,12 +171,12 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with auditing support" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") - conflicts=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") - replaces=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -241,8 +241,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}" @@ -382,8 +382,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}" diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index fb68c054d..044912747 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -172,8 +172,8 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with support for stealth TCP sockets" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country' 'systemd-knock: to use system and service manager with TCP Stealth support' 'openssh-knock: to use SSH with TCP Stealth support') diff --git a/kernels/linux-libre-nand/PKGBUILD b/kernels/linux-libre-nand/PKGBUILD index 6870ad35b..92a6569ec 100644 --- a/kernels/linux-libre-nand/PKGBUILD +++ b/kernels/linux-libre-nand/PKGBUILD @@ -130,8 +130,8 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules, with support for accessing all type of NAND flash devices" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 320db485c..40723a832 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -121,8 +121,8 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with PAE support (HIGHMEM64G)" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 3a96a528d..575032b41 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -34,7 +34,7 @@ options=('!strip') source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign} "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"{,.sign} "https://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz" - "https://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign" + "https://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign" "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"{,.sig} "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig} "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig} @@ -189,8 +189,8 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with realtime preemption" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index da0b48b6d..9e1324bc5 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -182,8 +182,8 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with Xen guest support" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 61d202cc0..f01292f91 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -172,12 +172,12 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome features not merged into mainline [AUFS, BFQ, BFS, Knock, UKSM]" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country' 'systemd-knock: to use system and service manager with TCP Stealth support' 'openssh-knock: to use SSH with TCP Stealth support') - provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "kernel=${_archpkgver}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") conflicts=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b39a57bde..b31cfab31 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -184,8 +184,8 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") |