Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c258fd2a5fd94d5247b67c39784accb8b9428cd8

commit c258fd2a5fd94d5247b67c39784accb8b9428cd8
Author: crazy <[email protected]>
Date:   Mon Feb 29 01:26:22 2016 +0100

kernel-4.4.3-1-x86_64
* subbackup's' -> subbackup
* while at it added subpackup to all subpackages to fix fblint
* also moved all subpackages from kernel.sh to FrugalBuild

diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild
index ee04b70..db62cc8 100644
--- a/source/base/kernel/FrugalBuild
+++ b/source/base/kernel/FrugalBuild
@@ -30,7 +30,7 @@ subrodepends+=("kernel=$_F_kernelver_ver")
subdepends+=('pciutils')
subgroups+=('apps-extra')
subarchs+=('i686 x86_64')
-subbackups+=('etc/sysconfig/cpupower')
+subbackup+=('etc/sysconfig/cpupower')
subconflicts+=('cpufrequtils')
subprovides+=('cpufrequtils')
subreplaces+=('cpufrequtils')
@@ -45,6 +45,7 @@ subrodepends+=("kernel=$_F_kernelver_ver")
subdepends+=('pciutils')
subgroups+=('apps-extra')
subarchs+=('i686 x86_64')
+subbackup+=('')
subconflicts+=('')
subprovides+=('')
subreplaces+=('')
@@ -57,12 +58,55 @@ subrodepends+=("kernel=$_F_kernelver_ver")
subdepends+=('elfutils slang binutils>=2.25 xz')
subgroups+=('devel-extra')
subarchs+=('i686 x86_64')
+subbackup+=('')
subconflicts+=('')
subprovides+=('')
subreplaces+=('')
suboptions+=('')
subinstall+=('')

+
+subpkgs+=("kernel$_F_kernel_name-docs")
+subdescs+=("Linux kernel documentation")
+subrodepends+=("kernel=$_F_kernelver_ver")
+subdepends+=('')
+subgroups+=('devel-extra')
+subarchs+=('i686 x86_64 arm')
+subbackup+=('')
+subconflicts+=('')
+subprovides+=('')
+subreplaces+=('')
+suboptions+=('')
+subinstall+=('')
+
+subpkgs+=("kernel$_F_kernel_name-source")
+subrodepends+=("make gcc>=5.3.0-2 kernel-headers")
+subdescs+=('Linux kernel source')
+subgroups+=('devel-extra')
+subdepends+=('')
+subreplaces+=('')
+subprovides+=('')
+subconflicts+=('')
+subarchs+=('i686 x86_64 arm')
+subbackup+=('')
+subinstall+=('')
+suboptions+=('nodocs')
+
+if [ -z "$_F_kernel_name" ]; then
+       subpkgs+=('kernel-headers')
+       subrodepends+=('')
+       subgroups+=('devel devel-core')
+       subdescs+=('Linux kernel include files')
+       subarchs+=('i686 x86_64 arm')
+       subbackup+=('')
+       subinstall+=('')
+       suboptions+=('')
+       subreplaces+=('')
+       subdepends+=('')
+       subprovides+=('')
+       subconflicts+=('')
+fi
+
build()
{
Fbuildkernel
diff --git a/source/include/kernel.sh b/source/include/kernel.sh
index 8b84d96..5e63766 100644
--- a/source/include/kernel.sh
+++ b/source/include/kernel.sh
@@ -156,39 +156,6 @@ source=("${source[@]}" 'config.i686' 'config.x86_64' 
'config.arm')
signatures=("${signatures[@]}" '' '' '')

###
-# * subpkg()
-# * subarchs()
-# * subinstall()
-# * suboptions()
-# * subgroups()
-# * subdescs()
-###
-subpkgs=("kernel$_F_kernel_name-source" "kernel$_F_kernel_name-docs")
-subrodepends=("kernel$_F_kernel_name-docs make gcc kernel-headers" 
"kernel$_F_kernel_name")
-subdescs=('Linux kernel source' 'Linux kernel documentation')
-subgroups=('devel-extra' 'apps')
-subdepends=('' '')
-subreplaces=('' '')
-subprovides=('' '')
-subconflicts=('' '')
-subarchs=('i686 x86_64 arm' 'i686 x86_64 arm')
-subinstall=('' '')
-suboptions=('nodocs' '')
-if [ -z "$_F_kernel_name" ]; then
-       subpkgs=("${subpkgs[@]}" 'kernel-headers')
-       subrodepends=("${subrodepends[@]}" '')
-       subgroups=("${subgroups[@]}" 'devel devel-core')
-       subdescs=("${subdescs[@]}" 'Linux kernel include files')
-       subarchs=("${subarchs[@]}" 'i686 x86_64 arm')
-       subinstall=("${subinstall[@]}" '')
-       suboptions=("${suboptions[@]}" '')
-       subreplaces=("${subreplaces[@]}" '')
-       subdepends=("${subdepends[@]}" '')
-       subprovides=("${subprovides[@]}" '')
-       subconflicts=("${subconflicts[@]}" '')
-fi
-
-###
# == PROVIDED FUNCTIONS
# * Fbuildkernel()
###
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to