[arch-commits] Commit in kernel26-lts/trunk (PKGBUILD config config.x86_64)

Sun Oct 31 08:42:30 UTC 2010

Date: Sunday, October 31, 2010 @ 04:42:30
  Author: tpowa
Revision: 97523

upgpkg: kernel26-lts 2.6.32.25-2
sync up with latest config changes

Modified:
  kernel26-lts/trunk/PKGBUILD
  kernel26-lts/trunk/config
  kernel26-lts/trunk/config.x86_64

---------------+
 PKGBUILD      |   19 ++++++++++++-------
 config        |   13 +++++++++----
 config.x86_64 |   13 +++++++++----
 3 files changed, 30 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2010-10-31 08:36:16 UTC (rev 97522)
+++ PKGBUILD	2010-10-31 08:42:30 UTC (rev 97523)
@@ -6,7 +6,7 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.32
 pkgver=${_basekernel}.25
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.kernel.org"
@@ -18,8 +18,8 @@
         ${pkgname}.preset)
 md5sums=('260551284ac224c3a43c4adac7df4879'
          'd8fff54efff6c5f7b07e5370a5e9f119'
-         '9eb3a6ec7eaae508ddc0f9226ed5681e'
-         'd1850e0336a0bee3f154d0af489a4342'
+         '2e701029d508940a4ae02761edab4575'
+         'e11cfba11a4d363412474743c36c9147'
          '2cbfeb3e2a18d45f82f613e97fc23355')
 
 build() {
@@ -57,7 +57,7 @@
   ####################
   yes "" | make config
   # build!
-  make bzImage modules || return 1
+  make ${MAKEFLAGS} bzImage modules
 }
 
 package_kernel26-lts() {
@@ -70,15 +70,15 @@
   cd ${srcdir}/linux-$_basekernel
   # get kernel version
   _kernver="$(make kernelrelease)"
-  mkdir -p ${pkgdir}/{lib/modules,boot}
-  make INSTALL_MOD_PATH=${pkgdir} modules_install || return 1
+  mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
+  make INSTALL_MOD_PATH=${pkgdir} modules_install
   cp System.map ${pkgdir}/boot/System.map26${_kernelname}
   cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname}
   # add vmlinux
   install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux
 
   # install fallback mkinitcpio.conf file and preset file for kernel
-  install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset || return 1
+  install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
   # set correct depmod command for install
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
@@ -208,3 +208,8 @@
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
+md5sums=('260551284ac224c3a43c4adac7df4879'
+         'd8fff54efff6c5f7b07e5370a5e9f119'
+         '2e701029d508940a4ae02761edab4575'
+         'e11cfba11a4d363412474743c36c9147'
+         '2cbfeb3e2a18d45f82f613e97fc23355')

Modified: config
===================================================================
--- config	2010-10-31 08:36:16 UTC (rev 97522)
+++ config	2010-10-31 08:42:30 UTC (rev 97523)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Wed Jun  2 12:51:44 2010
+# Sun Oct 31 07:18:48 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -54,6 +54,7 @@
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_KTIME_SCALAR=y
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
 
@@ -399,6 +400,7 @@
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_HIBERNATION_NVS=y
 CONFIG_HIBERNATION=y
@@ -879,8 +881,6 @@
 CONFIG_SCTP_HMAC_SHA1=y
 # CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_RDS is not set
-# CONFIG_RDS_TCP is not set
-# CONFIG_RDS_DEBUG is not set
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
@@ -1081,6 +1081,7 @@
 CONFIG_LIB80211_CRYPT_TKIP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
 # CONFIG_MAC80211_RC_DEFAULT_PID is not set
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -3167,6 +3168,8 @@
 # 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
@@ -3222,6 +3225,7 @@
 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
@@ -4097,6 +4101,7 @@
 CONFIG_COMEDI_PCI_DRIVERS=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=m
 CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_8255=m
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 # CONFIG_ALTERA_PCIE_CHDMA is not set
@@ -4591,7 +4596,7 @@
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
-# CONFIG_SECURITY_PATH is not set
+CONFIG_SECURITY_PATH=y
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_INTEL_TXT is not set
 # CONFIG_SECURITY_SELINUX is not set

Modified: config.x86_64
===================================================================
--- config.x86_64	2010-10-31 08:36:16 UTC (rev 97522)
+++ config.x86_64	2010-10-31 08:42:30 UTC (rev 97523)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Wed Jun  2 10:06:40 2010
+# Sun Oct 31 08:16:04 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -55,6 +55,7 @@
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
 
@@ -398,6 +399,7 @@
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_HIBERNATION_NVS=y
 CONFIG_HIBERNATION=y
@@ -855,8 +857,6 @@
 CONFIG_SCTP_HMAC_SHA1=y
 # CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_RDS is not set
-# CONFIG_RDS_TCP is not set
-# CONFIG_RDS_DEBUG is not set
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
@@ -1052,6 +1052,7 @@
 CONFIG_LIB80211_CRYPT_TKIP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
 # CONFIG_MAC80211_RC_DEFAULT_PID is not set
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -3012,6 +3013,8 @@
 # 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
@@ -3067,6 +3070,7 @@
 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
@@ -3902,6 +3906,7 @@
 CONFIG_COMEDI_PCI_DRIVERS=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=m
 CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_8255=m
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 # CONFIG_ALTERA_PCIE_CHDMA is not set
@@ -4392,7 +4397,7 @@
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
-# CONFIG_SECURITY_PATH is not set
+CONFIG_SECURITY_PATH=y
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_INTEL_TXT is not set
 # CONFIG_SECURITY_SELINUX is not set


