diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-04 13:06:55 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-08 07:53:38 +0000 |
| commit | d5f52fa2c10ee241b6a2a09e9cbc4f5a570a9d98 (patch) | |
| tree | e9eac516e395fc53a92da8377d1fe275a6a2e9d8 | |
| parent | 355351735d91fe4a6383c2407dd74f136e0cbecb (diff) | |
| download | aports-d5f52fa2c10ee241b6a2a09e9cbc4f5a570a9d98.tar.bz2 aports-d5f52fa2c10ee241b6a2a09e9cbc4f5a570a9d98.tar.xz | |
main/linux-vserver: switch to i486
so we can support VIA Samuel 2
(cherry picked from commit b237800e3f94e652c132d3aa61f0fc2abf1e7339)
| -rw-r--r-- | main/linux-vserver/APKBUILD | 4 | ||||
| -rw-r--r-- | main/linux-vserver/kernelconfig.x86 | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 9c32d5d382..36f453a970 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -5,7 +5,7 @@ pkgname=linux-${_flavor} pkgver=2.6.32.22 _kernver=2.6.32 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" @@ -127,4 +127,4 @@ md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 da1431a1d659298c6bd11714416c840f patch-2.6.32.22.bz2 0ffa43c0c98030732c258b097c5d03f9 patch-2.6.32.22-vs2.3.0.36.29.6.diff a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch -884ba32b4edb6c51426e826c44063e98 kernelconfig.x86" +9e3b5b12ce36bdc3ecf31eb2624d13f0 kernelconfig.x86" diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index 477d6620dd..6f4b515bd3 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.15-vs2.3.0.36.29.4 -# Wed Jun 16 07:47:05 2010 +# Linux kernel version: 2.6.32.22-vs2.3.0.36.29.6 +# Mon Oct 4 11:59:10 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -54,6 +54,7 @@ CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y @@ -143,13 +144,10 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y -CONFIG_HAVE_PERF_EVENTS=y # # Kernel Performance Events And Counters # -CONFIG_PERF_EVENTS=y -CONFIG_PERF_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set @@ -233,8 +231,8 @@ CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_MEMTEST is not set # CONFIG_M386 is not set -# CONFIG_M486 is not set -CONFIG_M586=y +CONFIG_M486=y +# CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set # CONFIG_M686 is not set @@ -263,7 +261,7 @@ CONFIG_X86_CPU=y CONFIG_X86_L1_CACHE_BYTES=64 CONFIG_X86_INTERNODE_CACHE_BYTES=64 CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_L1_CACHE_SHIFT=4 CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set CONFIG_X86_F00F_BUG=y @@ -1079,6 +1077,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_PID=y @@ -3075,6 +3074,8 @@ CONFIG_DVB_FIREDTV_INPUT=y # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m @@ -3130,6 +3131,7 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m CONFIG_DVB_LGS8GXX=m CONFIG_DAB=y CONFIG_USB_DABUSB=m |