mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
Updated to version 4.19.6
Besides the upstream update, I have disabled building of nrj-laptop kernels here. Now that the main kernels used in ROSA are based on the sources from Ubuntu, the stable-based kernels like this one are mostly intended for debugging. No need to build nrj-laptop flavour each time. Let us make things a bit easier for other ABF users at least. Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
This commit is contained in:
Evgenii Shatokhin
parent
cbb03baaf2
commit
cad40ee513
7 changed files with 1249 additions and 914 deletions
4
.abf.yml
4
.abf.yml
|
|
@ -1,3 +1,3 @@
|
|||
sources:
|
||||
linux-4.18.tar.xz: a5898f3a6383946b1de8d9dd449c2ca361b14c3d
|
||||
patch-4.18.20.xz: 305ce8b71e270b4804ba0e761e1e1a0d0557499f
|
||||
linux-4.19.tar.xz: 40f3e72192d59c0b7a4638cebd0ea55d35a782bb
|
||||
patch-4.19.6.xz: 7f17f55087b83035ed6ef7d99d96ff674162736f
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
>From 9f04e51293b130474504216a477bb2a73cbf59e1 Mon Sep 17 00:00:00 2001
|
||||
From: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
Date: Thu, 22 Mar 2012 22:29:11 +0200
|
||||
Subject: [PATCH] ata: prefer ata drivers over ide drivers when both are built
|
||||
|
||||
Currently the old IDE drivers are preferred over ATA drivers when both
|
||||
are built, since ide/ is listed first in drivers/Makefile and therefore
|
||||
the IDE drivers end up before ATA drivers in modules.order which is used
|
||||
by depmod/modprobe for module ordering.
|
||||
|
||||
Change it so that ATA drivers are preferred over IDE driver by moving
|
||||
the ide/ entry under ata/ in drivers/Makefile.
|
||||
|
||||
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
---
|
||||
drivers/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/Makefile b/drivers/Makefile
|
||||
index 795d0ca..ff3c239 100644
|
||||
--- a/drivers/Makefile
|
||||
+++ b/drivers/Makefile
|
||||
@@ -69,10 +69,10 @@ obj-$(CONFIG_LIBNVDIMM) += nvdimm/
|
||||
obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
|
||||
obj-$(CONFIG_NUBUS) += nubus/
|
||||
obj-y += macintosh/
|
||||
-obj-$(CONFIG_IDE) += ide/
|
||||
obj-$(CONFIG_SCSI) += scsi/
|
||||
obj-y += nvme/
|
||||
obj-$(CONFIG_ATA) += ata/
|
||||
+obj-$(CONFIG_IDE) += ide/
|
||||
obj-$(CONFIG_TARGET_CORE) += target/
|
||||
obj-$(CONFIG_MTD) += mtd/
|
||||
obj-$(CONFIG_SPI) += spi/
|
||||
|
|
@ -1,19 +1,18 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 1d740dbe676d..99d04dea3e2d 100644
|
||||
index 2366991c29b9..51b4ac281eec 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1074,9 +1074,7 @@ include/config/kernel.release: include/config/auto.conf FORCE
|
||||
@@ -1090,8 +1090,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE
|
||||
# Carefully list dependencies so we do not try to build scripts twice
|
||||
# in parallel
|
||||
PHONY += scripts
|
||||
-scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
|
||||
- asm-generic gcc-plugins $(autoksyms_h)
|
||||
-scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h)
|
||||
- $(Q)$(MAKE) $(build)=$(@)
|
||||
+scripts:
|
||||
|
||||
# Things we need to do before we recursively start building the kernel
|
||||
# or the modules are listed in "prepare".
|
||||
@@ -1115,7 +1113,7 @@ prepare0: archprepare gcc-plugins
|
||||
@@ -1129,7 +1128,7 @@ prepare0: archprepare gcc-plugins
|
||||
$(Q)$(MAKE) $(build)=.
|
||||
|
||||
# All the preparing..
|
||||
|
|
@ -22,7 +21,7 @@ index 1d740dbe676d..99d04dea3e2d 100644
|
|||
|
||||
# Support for using generic headers in asm-generic
|
||||
PHONY += asm-generic uapi-asm-generic
|
||||
@@ -1347,13 +1345,8 @@ endif # CONFIG_MODULES
|
||||
@@ -1326,13 +1325,8 @@ endif # CONFIG_MODULES
|
||||
CLEAN_DIRS += $(MODVERDIR) include/ksym
|
||||
|
||||
# Directories & files removed with 'make mrproper'
|
||||
|
|
@ -38,7 +37,7 @@ index 1d740dbe676d..99d04dea3e2d 100644
|
|||
|
||||
# clean - Delete most, but leave enough to build external modules
|
||||
#
|
||||
@@ -1375,13 +1368,10 @@ clean: archclean vmlinuxclean
|
||||
@@ -1354,13 +1348,10 @@ clean: archclean vmlinuxclean
|
||||
#
|
||||
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
||||
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
||||
|
|
@ -55,10 +54,10 @@ index 1d740dbe676d..99d04dea3e2d 100644
|
|||
$(call cmd,rmfiles)
|
||||
|
||||
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
||||
index 5def8779d7d8..9de582ed13f6 100644
|
||||
index 67ed9f6ccdf8..877b5716a928 100644
|
||||
--- a/scripts/kconfig/Makefile
|
||||
+++ b/scripts/kconfig/Makefile
|
||||
@@ -20,25 +20,18 @@ endif
|
||||
@@ -20,19 +20,14 @@ endif
|
||||
unexport CONFIG_
|
||||
|
||||
xconfig: $(obj)/qconf
|
||||
|
|
@ -76,15 +75,21 @@ index 5def8779d7d8..9de582ed13f6 100644
|
|||
nconfig: $(obj)/nconf
|
||||
- $< $(silent) $(Kconfig)
|
||||
|
||||
# This has become an internal implementation detail and is now deprecated
|
||||
# for external use.
|
||||
syncconfig: $(obj)/conf
|
||||
- $(Q)mkdir -p include/config include/generated
|
||||
- $< $(silent) --$@ $(Kconfig)
|
||||
build_menuconfig: $(obj)/mconf
|
||||
|
||||
localyesconfig localmodconfig: $(obj)/conf
|
||||
$(Q)mkdir -p include/config include/generated
|
||||
@@ -84,7 +77,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
||||
@@ -48,11 +43,9 @@ localyesconfig localmodconfig: $(obj)/conf
|
||||
cmp -s .tmp.config .config || \
|
||||
(mv -f .config .config.old.1; \
|
||||
mv -f .tmp.config .config; \
|
||||
- $< $(silent) --oldconfig $(Kconfig); \
|
||||
mv -f .config.old.1 .config.old) \
|
||||
else \
|
||||
mv -f .tmp.config .config; \
|
||||
- $< $(silent) --oldconfig $(Kconfig); \
|
||||
fi
|
||||
$(Q)rm -f .tmp.config
|
||||
|
||||
@@ -66,7 +59,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
||||
PHONY += $(simple-targets)
|
||||
|
||||
$(simple-targets): $(obj)/conf
|
||||
|
|
@ -92,7 +97,7 @@ index 5def8779d7d8..9de582ed13f6 100644
|
|||
|
||||
PHONY += oldnoconfig silentoldconfig savedefconfig defconfig
|
||||
|
||||
@@ -103,23 +95,10 @@ silentoldconfig: syncconfig
|
||||
@@ -85,23 +77,10 @@ silentoldconfig: syncconfig
|
||||
@echo " \"silentoldconfig\" will be removed after Linux 4.19"
|
||||
|
||||
savedefconfig: $(obj)/conf
|
||||
|
|
|
|||
1306
fs-aufs4.patch
1306
fs-aufs4.patch
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,7 @@
|
|||
%define kernelversion 4
|
||||
%define patchlevel 18
|
||||
%define patchlevel 19
|
||||
# sublevel is now used for -stable patches
|
||||
%define sublevel 20
|
||||
%define sublevel 6
|
||||
|
||||
# Release number. Increase this before a rebuild.
|
||||
%define rpmrel 1
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
%define build_nrj_desktop 1
|
||||
|
||||
# Build nrj laptop kernels
|
||||
%define build_nrj_laptop 1
|
||||
%define build_nrj_laptop 0
|
||||
|
||||
# build perf and cpupower tools
|
||||
%define build_perf 1
|
||||
|
|
@ -197,9 +197,6 @@ Patch106: x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch
|
|||
# disable floppy autoloading (mga #4696)
|
||||
Patch107: block-floppy-disable-pnp-modalias.patch
|
||||
|
||||
# prefer ata over ide drivers
|
||||
Patch108: ata-prefer-ata-drivers-over-ide-drivers-when-both-are-built.patch
|
||||
|
||||
# AUFS from http://aufs.sourceforge.net/
|
||||
Patch109: fs-aufs4.patch
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue