Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6028e1bb35a4acf208bcaf1fba4e8a9085ef2f03
commit 6028e1bb35a4acf208bcaf1fba4e8a9085ef2f03 Author: crazy <[email protected]> Date: Mon Feb 29 01:53:26 2016 +0100 kernel-4.4.3-1-x86_64 * move url, depends etc back to FrugalBuild * removed scm part for now .. * I'm not even sure how this ever worked since we used wrong Fuse ... diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index db62cc8..20201f2 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -4,24 +4,41 @@ ### NOTE: check btrfs-progs to match the kernel -USE_DEVEL=${USE_DEVEL:-"n"} +Finclude kernel + +url="https://www.kernel.org" +depends=('kmod' 'sed') +[[ -z "$_F_kernel_name" ]] && makedepends+=('unifdef') +[[ "$CARCH" = "arm" ]] && makedepends+=('u-boot-tools') +groups=('base') +archs=('i686' 'x86_64' 'arm') +options=('nodocs' 'genscriptlet') +_F_archive_grepv="rc" +up2date="Flasttar $url" + +## the only reason why I don't remove *_DEVEL is because I want to re-add old -custom kernel builds style -- crazy -- if ! Fuse $USE_DEVEL; then _F_kernel_patches=('fix-i915.patch' \ - 'fix_for_missing_nvme_ioctl.h.patch' \ - 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch' \ - 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch' \ - 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch' ) -else - # example for a tagged rc release: 2.6.32.rc5 - # example for a random snapshot (based on git describe output): 2.6.32.rc5.81.g964fe08 - pkgver=2.6.32.rc5 - pkgrel=1 - _F_scm_type="git" - _F_scm_url="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6" + 'fix_for_missing_nvme_ioctl.h.patch' \ + 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch' \ + 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch' \ + 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch' ) + + for i in "${_F_kernel_patches[@]}" + do + source+=("$i") + signatures+=('') + done + + source+=("https://www.kernel.org/pub/linux/kernel/v4.x/$_F_archive_name-$pkgver.tar.xz") + signatures+=("https://www.kernel.org/pub/linux/kernel/v4.x/$_F_archive_name-$pkgver.tar.sign") fi -Finclude kernel +## Really don't add any scm shit here .. if you really wish git builds do these manually or use rc tarballs + +source+=('config.i686' 'config.x86_64' 'config.arm') +signatures+=('' '' '') subpkgs+=('cpupower') diff --git a/source/include/kernel.sh b/source/include/kernel.sh index 5e63766..5bf9a30 100644 --- a/source/include/kernel.sh +++ b/source/include/kernel.sh @@ -112,50 +112,6 @@ else fi ### -# * url -# * depends -# * makedepends -# * groups -# * replaces -# * archs -# * options() -# * up2date -# * source() -### -url="https://www.kernel.org" -depends=('kmod' 'sed') -if [ -z "$_F_kernel_name" ]; then - makedepends=("${makedepends[@]}" 'unifdef') -fi -if [ "$CARCH" = "arm" ]; then - makedepends=("${makedepends[@]}" 'u-boot-tools') -fi -groups=('base') -archs=('i686' 'x86_64' 'arm') -options=('nodocs' 'genscriptlet') -_F_archive_grepv="rc" -up2date="Flasttar $url" - -if ! Fuse DEVEL; then - source=("https://www.kernel.org/pub/linux/kernel/v4.x/$_F_archive_name-$pkgver.tar.xz") - signatures=("https://www.kernel.org/pub/linux/kernel/v4.x/$_F_archive_name-$pkgver.tar.sign") -else - if [ -z "$_F_scm_tag" ]; then - _F_scm_tag="v$pkgver" - fi - Finclude scm -fi - -for i in "${_F_kernel_patches[@]}" -do - source=("${source[@]}" "$i") - signatures=("${signatures[@]}" '') -done - -source=("${source[@]}" 'config.i686' 'config.x86_64' 'config.arm') -signatures=("${signatures[@]}" '' '' '') - -### # == PROVIDED FUNCTIONS # * Fbuildkernel() ### _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
