[arch-commits] Commit in kernel26-lts/repos (4 files)

Tobias Powalowski tpowa at archlinux.org
Sat Dec 19 14:15:50 UTC 2009


    Date: Saturday, December 19, 2009 @ 09:15:50
  Author: tpowa
Revision: 61554

Merged revisions 61553 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kernel26-lts/trunk

........
  r61553 | tpowa | 2009-12-19 15:14:59 +0100 (Sa, 19 Dez 2009) | 2 lines
  
  upgpkg: kernel26-lts 2.6.27.42-1
      bump to latest version, with splitted headers
........

Modified:
  kernel26-lts/repos/testing-x86_64/	(properties)
  kernel26-lts/repos/testing-x86_64/PKGBUILD
  kernel26-lts/repos/testing-x86_64/config
  kernel26-lts/repos/testing-x86_64/config.x86_64

---------------+
 PKGBUILD      |   74 ++++++++++++++++++++++++++++++++++----------------------
 config        |    6 +---
 config.x86_64 |   66 +++++++++++++++++++++----------------------------
 3 files changed, 76 insertions(+), 70 deletions(-)


Property changes on: kernel26-lts/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26-lts/trunk:1-61548
   + /kernel26-lts/trunk:1-61553

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-12-19 14:14:59 UTC (rev 61553)
+++ testing-x86_64/PKGBUILD	2009-12-19 14:15:50 UTC (rev 61554)
@@ -1,18 +1,15 @@
 # $Id$
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
-pkgname=kernel26-lts
+pkgbase=kernel26-lts
+pkgname=('kernel26-lts' 'kernel26-lts-headers') # Build stock -lts kernel
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.27
 pkgver=${_basekernel}.42
 pkgrel=1
-pkgdesc="The Linux Kernel and modules - stable longtime supported kernel package suitable for servers"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.kernel.org"
-backup=(etc/mkinitcpio.d/${pkgname}.preset)
-depends=('coreutils' 'kernel26-firmware>=2.6.27' 'module-init-tools' 'mkinitcpio>=0.5.20' 'udev-compat>=147')
-install=${pkgname}.install
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
 	# the main kernel config files
@@ -25,15 +22,13 @@
 	linux-2.6.27.9-ext4-cap-check-delay.patch)
 md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
          '79782ebd9672c39dd7303d7442756556'
-         '1ab067cf0534e3fe16578cf10c020b1b'
-         '20534542a14fe041f392abe377dc746a'
+         '5da8323ac828474e524bb95c200a2428'
+         'c9c14c1918a009dc92596c35e7bc8900'
          'a13338958d1b241f8dfd4c6014cad3d4'
          '659953c9c437d311bf93eff505ef8e67'
          '8cd12e9727d9221aacfa52ad9b9a42f9')
 
 build() {
-  KARCH=x86
-
   cd ${srcdir}/linux-$_basekernel
    if [ "$_basekernel" != "$pkgver" ]; then
      # add latest kernel stable patch
@@ -56,9 +51,7 @@
   # this ensures our kernel version is always 2.6.XX-lts
   # this way, minor kernel updates will not break external modules
   sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile
-  # get kernel version  
   make prepare
-  _kernver="$(make kernelrelease)"
   # load configuration
   # Configure the kernel. Replace the line below with one of your choice.
   #make menuconfig # CLI menu for configuration
@@ -74,10 +67,51 @@
   yes "" | make config
   # build!
   make bzImage modules || return 1
+}
+
+package_kernel26-lts() {
+  pkgdesc="The Linux Kernel and modules - stable longtime supported kernel package suitable for servers"
+  backup=(etc/mkinitcpio.d/${pkgname}.preset)
+  depends=('coreutils' 'kernel26-firmware>=2.6.27' 'module-init-tools' 'mkinitcpio>=0.5.20' 'udev-compat>=147')
+  install=${pkgname}.install
+
+  KARCH=x86
+  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
   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
+  # set correct depmod command for install
+  sed \
+    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
+    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
+    -i $startdir/${pkgname}.install
+  sed \
+    -e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \
+    -e "s|default_image=.*|default_image=\"/boot/${pkgname}.img\"|g" \
+    -e "s|fallback_image=.*|fallback_image=\"/boot/${pkgname}-fallback.img\"|g" \
+    -i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
+
+  echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/${pkgname}.kver
+  # remove build and source links
+  rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
+  # remove the firmware
+  rm -rf ${pkgdir}/lib/firmware
+}
+
+package_kernel26-lts-headers() {
+  pkgdesc="Header files and scripts for building modules for kernel26-lts"
+  mkdir -p ${pkgdir}/lib/modules/${_kernver}
+  cd ${pkgdir}/lib/modules/${_kernver}
+  ln -sf ../../../usr/src/linux-${_kernver} build
+  cd ${srcdir}/linux-$_basekernel
   install -D -m644 Makefile \
     ${pkgdir}/usr/src/linux-${_kernver}/Makefile
   install -D -m644 kernel/Makefile \
@@ -149,9 +183,6 @@
   # http://bugs.archlinux.org/task/14568
   cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
   
-  
-  # add vmlinux
-  cp vmlinux ${pkgdir}/usr/src/linux-${_kernver}
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@@ -164,22 +195,7 @@
   find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
   cd ${pkgdir}/lib/modules/${_kernver} && \
     (rm -f source build; ln -sf ../../../usr/src/linux-${_kernver} build)
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset || return 1
-  # set correct depmod command for install
-  sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i $startdir/${pkgname}.install
-  sed \
-    -e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \
-    -e "s|default_image=.*|default_image=\"/boot/${pkgname}.img\"|g" \
-    -e "s|fallback_image=.*|fallback_image=\"/boot/${pkgname}-fallback.img\"|g" \
-    -i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
 
-  echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/${pkgname}.kver
   # 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}
-  # remove the firmware
-  rm -rf ${pkgdir}/lib/firmware
 }

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2009-12-19 14:14:59 UTC (rev 61553)
+++ testing-x86_64/config	2009-12-19 14:15:50 UTC (rev 61554)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.37
-# Wed Oct 14 06:05:48 2009
+# Linux kernel version: 2.6.27.41
+# Wed Dec 16 20:13:52 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2123,8 +2123,6 @@
 CONFIG_N_HDLC=m
 # CONFIG_RISCOM8 is not set
 # CONFIG_SPECIALIX is not set
-# CONFIG_SX is not set
-# CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
 CONFIG_NOZOMI=m
 

Modified: testing-x86_64/config.x86_64
===================================================================
--- testing-x86_64/config.x86_64	2009-12-19 14:14:59 UTC (rev 61553)
+++ testing-x86_64/config.x86_64	2009-12-19 14:15:50 UTC (rev 61554)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.36
-# Thu Oct  8 19:43:00 2009
+# Linux kernel version: 2.6.27.41
+# Wed Dec 16 20:37:39 2009
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -87,7 +87,7 @@
 CONFIG_RELAY=y
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
-CONFIG_IPC_NS=y
+# CONFIG_IPC_NS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -183,12 +183,13 @@
 # CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_VSMP is not set
 CONFIG_PARAVIRT_GUEST=y
-# CONFIG_XEN is not set
+CONFIG_XEN=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=32
 CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_KVM_CLOCK is not set
-# CONFIG_KVM_GUEST is not set
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
 CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_CLOCK is not set
+CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_M386 is not set
@@ -481,7 +482,7 @@
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
+CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -706,24 +707,7 @@
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-CONFIG_IP_DCCP_ACKVEC=y
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-CONFIG_IP_DCCP_CCID2=m
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=m
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
-CONFIG_IP_DCCP_TFRC_LIB=m
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -926,7 +910,7 @@
 CONFIG_RFKILL_INPUT=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_NET_9P=m
-# CONFIG_NET_9P_VIRTIO is not set
+CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
 
 #
@@ -1057,7 +1041,8 @@
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-# CONFIG_VIRTIO_BLK is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_IBM_ASM is not set
@@ -1418,7 +1403,7 @@
 CONFIG_BROADCOM_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
@@ -1692,6 +1677,7 @@
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_HE=m
 # CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_XEN_NETDEV_FRONTEND=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m
@@ -1717,7 +1703,7 @@
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
-# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRTIO_NET=m
 CONFIG_ISDN=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
@@ -1859,6 +1845,7 @@
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
+CONFIG_XEN_KBDDEV_FRONTEND=m
 
 #
 # Input Device Drivers
@@ -1998,8 +1985,6 @@
 CONFIG_N_HDLC=m
 # CONFIG_RISCOM8 is not set
 # CONFIG_SPECIALIX is not set
-# CONFIG_SX is not set
-# CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
 CONFIG_NOZOMI=m
 
@@ -2027,7 +2012,10 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -2037,7 +2025,7 @@
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
+CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
@@ -2698,6 +2686,7 @@
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_BACKLIGHT=y
@@ -2768,6 +2757,7 @@
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_LTV350QV=m
@@ -2989,7 +2979,7 @@
 CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_OHCI_HCD=m
@@ -3310,6 +3300,8 @@
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_SMX=m
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
 
 #
 # Firmware Drivers
@@ -3568,7 +3560,7 @@
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
+CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
@@ -3631,7 +3623,7 @@
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_DEBUG_RODATA is not set
-# CONFIG_DIRECT_GBPAGES is not set
+CONFIG_DIRECT_GBPAGES=y
 # CONFIG_DEBUG_NX_TEST is not set
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_MMIOTRACE_HOOKS=y




More information about the arch-commits mailing list