aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRubba Reduppa2011-08-12 10:56:05 -0700
committeryar2015-07-03 16:58:13 -0700
commit193094a410fe41109094aea0df0d547e6ed9aacf (patch)
tree84bfea41e7e4a30add78f07e6620db5abd5d057f
parent8b150b43d276c827b6f591aa5559541be5d9bc61 (diff)
downloadaur-193094a410fe41109094aea0df0d547e6ed9aacf.tar.gz
config tty printk
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--config.x86_649
-rw-r--r--menu.lst4
-rwxr-xr-xnconfig-wrapper4
5 files changed, 12 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 034bbca71427..a0e0efe5f828 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-linode
pkgdesc = The Linux Kernel and modules
pkgver = 3.0.1
- pkgrel = 6
+ pkgrel = 7
url = http://www.kernel.org/
install = linux-linode.install
arch = x86_64
@@ -28,8 +28,8 @@ pkgbase = linux-linode
source = change-default-console-loglevel.patch
md5sums = 398e95866794def22b12dfbc15ce89c0
md5sums = ac49f7907f1fc85fbab92d0f1aa1552a
- md5sums = b073fa78b6eadca078382f3cae57452d
- md5sums = 4f57cec4177ff365dfdf5457b3ed3136
+ md5sums = a4ebddd66e0697c30e223ab5040243f1
+ md5sums = 846d5c4777361ac67414fe1fae4346fa
md5sums = ee66f3cd0c5bc0ba0f65499784d19f30
md5sums = 9d3c56a4b999c8bfbd4018089a62f662
diff --git a/PKGBUILD b/PKGBUILD
index 29aa4e182799..3a818e4ffd64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=linux-linode
_kernelname=-linode
_basekernel=3.0
pkgver=${_basekernel}.1
-pkgrel=6
+pkgrel=7
arch=(x86_64)
url="http://www.kernel.org/"
license=(GPL2)
@@ -16,8 +16,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-${_basekernel}.tar.bz2
'change-default-console-loglevel.patch')
md5sums=('398e95866794def22b12dfbc15ce89c0'
'ac49f7907f1fc85fbab92d0f1aa1552a'
- 'b073fa78b6eadca078382f3cae57452d'
- '4f57cec4177ff365dfdf5457b3ed3136'
+ 'a4ebddd66e0697c30e223ab5040243f1'
+ '846d5c4777361ac67414fe1fae4346fa'
'ee66f3cd0c5bc0ba0f65499784d19f30'
'9d3c56a4b999c8bfbd4018089a62f662')
pkgdesc="The Linux Kernel and modules"
diff --git a/config.x86_64 b/config.x86_64
index e54edf493b4b..b5c596a201b7 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -891,22 +891,17 @@ CONFIG_DEVKMEM=y
#
# Serial drivers
#
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250 is not set
CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_CORE=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_TTY_PRINTK is not set
+CONFIG_TTY_PRINTK=y
CONFIG_HVC_DRIVER=y
CONFIG_HVC_IRQ=y
CONFIG_HVC_XEN=y
diff --git a/menu.lst b/menu.lst
index 3abedaf5d10c..bdbef2dfab7a 100644
--- a/menu.lst
+++ b/menu.lst
@@ -3,10 +3,10 @@ timeout 10
title Arch Linux Linode Xen kernel %VER%
root (hd0)
-kernel /boot/vmlinuz-linux-linode root=/dev/xvda ro verbose
+kernel /boot/vmlinuz-linux-linode root=/dev/xvda ro quiet
initrd /boot/initramfs-linux-linode.img
title Arch Linux Linode Xen kernel %VER% Fallback
root (hd0)
-kernel /boot/vmlinuz-linux-linode root=/dev/xvda ro verbose
+kernel /boot/vmlinuz-linux-linode root=/dev/xvda ro quiet
initrd /boot/initramfs-linux-linode-fallback.img
diff --git a/nconfig-wrapper b/nconfig-wrapper
index 70b50f32ea63..2b2b881d0f10 100755
--- a/nconfig-wrapper
+++ b/nconfig-wrapper
@@ -17,10 +17,10 @@ makepkg -cd
cd $ldir
make nconfig
cd ../..
-diff $ldir/.config config.x86_64
+diff config.x86_64 $ldir/.config
askyn "update package?" && {
- cat $ldir/.config > config.x86_64
+ cat config.x86_64 > $ldir/.config
mnew=($(md5sum config.x86_64))
sed -i s_${mold[0]}_${mnew[0]}_ig PKGBUILD
pkgrel=0