summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrey Chirstoforo2016-03-08 22:17:46 +0000
committerGrey Chirstoforo2016-03-08 22:17:46 +0000
commitd438b2082137603018fdfb02f558f461b5a6583d (patch)
treecb2958cffe88391db9dbe76556ed9c29e7e449ad
parent07c92c8fd112557cc3822f448712a4d3692eefd6 (diff)
downloadaur-d438b2082137603018fdfb02f558f461b5a6583d.tar.gz
add config overrides
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--config.overrides5
3 files changed, 15 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c7caf0db58c..2bccc749253c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Mar 8 21:57:03 UTC 2016
+# Tue Mar 8 22:17:31 UTC 2016
pkgbase = linux-rpi2-latest-git
pkgver = 4.5.0_rc7_1_v7+
pkgrel = 1
@@ -16,9 +16,11 @@ pkgbase = linux-rpi2-latest-git
source = linux::git://github.com/raspberrypi/linux#branch=rpi-4.5.y
source = config.txt
source = cmdline.txt
+ source = config.overrides
md5sums = SKIP
md5sums = e44f530b3d333b98ad376872cdbbf823
md5sums = 0244ab7cb2e385a8efe9a7fba9bfcb48
+ md5sums = 52d6ecfbfbd617c05324d0e6cd2d7d18
pkgname = linux-rpi2-latest-git
pkgdesc = The Linux Kernel and modules - Raspberry Pi 2 from the newest git branch
diff --git a/PKGBUILD b/PKGBUILD
index a680947bc48b..189cc98baa43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,10 +12,12 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
options=('!strip')
source=("linux::git://github.com/raspberrypi/linux#branch=rpi-${_branch}.y"
'config.txt'
- 'cmdline.txt')
+ 'cmdline.txt'
+ 'config.overrides')
md5sums=('SKIP'
'e44f530b3d333b98ad376872cdbbf823'
- '0244ab7cb2e385a8efe9a7fba9bfcb48')
+ '0244ab7cb2e385a8efe9a7fba9bfcb48'
+ '52d6ecfbfbd617c05324d0e6cd2d7d18')
_dirname=linux-${_branch}
_kernelname=${pkgbase#linux}
pkgver=4.5.0_rc7_1_v7+
@@ -29,6 +31,9 @@ prepare() {
KERNEL=kernel7
make bcm2709_defconfig
+ # override some .config settings
+ scripts/kconfig/merge_config.sh -r .config ../config.overrides
+
# add pkgrel to extraversion
sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile
diff --git a/config.overrides b/config.overrides
new file mode 100644
index 000000000000..9a3c253bb8b3
--- /dev/null
+++ b/config.overrides
@@ -0,0 +1,5 @@
+# CONFIG_FB_BCM2708 is not set
+CONFIG_DRM=y
+CONFIG_DRM_VC4=y
+CONFIG_I2C_BCM2835=y
+