diff options
-rw-r--r-- | libre-testing/kernel26-libre-lts/PKGBUILD (renamed from libre/kernel26-libre-lts/PKGBUILD) | 21 | ||||
-rw-r--r-- | libre-testing/kernel26-libre-lts/config.i686 (renamed from libre/kernel26-libre-lts/config.i686) | 13 | ||||
-rw-r--r-- | libre-testing/kernel26-libre-lts/config.x86_64 (renamed from libre/kernel26-libre-lts/config.x86_64) | 13 | ||||
-rw-r--r-- | libre-testing/kernel26-libre-lts/kernel26-libre-lts.install (renamed from libre/kernel26-libre-lts/kernel26-libre-lts.install) | 2 | ||||
-rw-r--r-- | libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset (renamed from libre/kernel26-libre-lts/kernel26-libre-lts.preset) | 0 | ||||
-rw-r--r-- | libre-testing/kernel26-libre-lts/libata-alignment.patch | 48 | ||||
-rw-r--r-- | libre/kernel26-libre/PKGBUILD | 25 | ||||
-rw-r--r-- | libre/kernel26-libre/config.i686 | 2 | ||||
-rw-r--r-- | libre/kernel26-libre/config.x86_64 | 2 | ||||
-rwxr-xr-x | libre/kernel26-libre/get_configs | 5 |
10 files changed, 92 insertions, 39 deletions
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre-testing/kernel26-libre-lts/PKGBUILD index 3635113e3..964e94eb2 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre-testing/kernel26-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102710 2010-12-10 14:54:46Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> @@ -6,12 +6,13 @@ pkgbase=kernel26-libre-lts pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts kernel _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 -pkgver=${_basekernel}.28 -pkgrel=1 +pkgver=${_basekernel}.29 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') url="http://linux-libre.fsfla.org" source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre2/linux-${pkgver}-libre2.tar.bz2 + libata-alignment.patch # the main kernel config files config.i686 config.x86_64 # standard config files for mkinitcpio ramdisk @@ -21,6 +22,9 @@ source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkg build() { cd ${srcdir}/linux-$pkgver + # fix 22343 udev crashes + patch -Np1 -i ${srcdir}/libata-alignment.patch + cat ../config.$CARCH >./.config if [ "${_kernelname}" != "" ]; then @@ -88,6 +92,8 @@ package_kernel26-libre-lts() { rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build} # remove the firmware rm -rf ${pkgdir}/lib/firmware + # gzip -9 all modules to safe 100MB of space + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } package_kernel26-libre-lts-headers() { @@ -205,8 +211,9 @@ package_kernel26-libre-lts-headers() { # 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=('04d6d1167a2093e0867a0c9076f4033f' - '2e701029d508940a4ae02761edab4575' - 'e11cfba11a4d363412474743c36c9147' +md5sums=('56f1879c2e12421882826aad8b6d9210' + '30851deee235a7486bd408cbe8eb2d71' + '5b4fcd892ee4baf9db8fc9b8aa66a741' + '4741e988cce00d77a02424ae4286bcb0' '2cbfeb3e2a18d45f82f613e97fc23355' - '62775470edfc6cf639e9919026a70426') + 'fbfc7a1af3208c7b729055d91e1c149a') diff --git a/libre/kernel26-libre-lts/config.i686 b/libre-testing/kernel26-libre-lts/config.i686 index 5c78b7538..0a14c46f3 100644 --- a/libre/kernel26-libre-lts/config.i686 +++ b/libre-testing/kernel26-libre-lts/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Sun Oct 31 07:18:48 2010 +# Sat Feb 19 16:39:33 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -100,11 +100,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_GROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -# CONFIG_USER_SCHED is not set -CONFIG_CGROUP_SCHED=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_NS=y @@ -116,6 +111,9 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y @@ -304,6 +302,7 @@ CONFIG_IOMMU_API=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -4196,7 +4195,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=m -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_DEFAULTS_TO_ORDERED=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre-testing/kernel26-libre-lts/config.x86_64 index 6dcd2bc18..92b878704 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre-testing/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Sun Oct 31 08:16:04 2010 +# Sat Feb 19 17:17:30 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -101,11 +101,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_GROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -# CONFIG_USER_SCHED is not set -CONFIG_CGROUP_SCHED=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_NS=y @@ -117,6 +112,9 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y @@ -302,6 +300,7 @@ CONFIG_IOMMU_API=y CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -4000,7 +3999,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=m -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_DEFAULTS_TO_ORDERED=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.install index a112d8dd3..c3249445a 100644 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.install +++ b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.install @@ -144,4 +144,4 @@ fi post_remove() { rm -f /boot/kernel26${KERNEL_NAME}.img rm -f /boot/kernel26${KERNEL_NAME}-fallback.img -}
\ No newline at end of file +} diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.preset b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset index b65e064b4..b65e064b4 100644 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.preset +++ b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset diff --git a/libre-testing/kernel26-libre-lts/libata-alignment.patch b/libre-testing/kernel26-libre-lts/libata-alignment.patch new file mode 100644 index 000000000..edd96f3b1 --- /dev/null +++ b/libre-testing/kernel26-libre-lts/libata-alignment.patch @@ -0,0 +1,48 @@ +diff -Nur linux-2.6.32.orig/drivers/ata/libata-scsi.c linux-2.6.32/drivers/ata/libata-scsi.c +--- linux-2.6.32.orig/drivers/ata/libata-scsi.c 2009-12-03 14:51:21.000000000 +1100 ++++ linux-2.6.32/drivers/ata/libata-scsi.c 2011-01-22 20:32:53.353775375 +1100 +@@ -1099,13 +1099,13 @@ + /* configure max sectors */ + blk_queue_max_sectors(sdev->request_queue, dev->max_sectors); + ++ sdev->sector_size = ATA_SECT_SIZE; ++ + if (dev->class == ATA_DEV_ATAPI) { + struct request_queue *q = sdev->request_queue; + void *buf; + +- /* set the min alignment and padding */ +- blk_queue_update_dma_alignment(sdev->request_queue, +- ATA_DMA_PAD_SZ - 1); ++ /* set DMA padding */ + blk_queue_update_dma_pad(sdev->request_queue, + ATA_DMA_PAD_SZ - 1); + +@@ -1119,12 +1119,24 @@ + + blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN); + } else { +- /* ATA devices must be sector aligned */ +- blk_queue_update_dma_alignment(sdev->request_queue, +- ATA_SECT_SIZE - 1); + sdev->manage_start_stop = 1; + } + ++ /* ++ * ata_pio_sectors() expects buffer for each sector to not cross ++ * page boundary. Enforce it by requiring buffers to be sector ++ * aligned, which works iff sector_size is not larger than ++ * PAGE_SIZE. ATAPI devices also need the alignment as ++ * IDENTIFY_PACKET is executed as ATA_PROT_PIO. ++ */ ++ if (sdev->sector_size > PAGE_SIZE) ++ ata_dev_printk(dev, KERN_WARNING, ++ "sector_size=%u > PAGE_SIZE, PIO may malfunction\n", ++ sdev->sector_size); ++ ++ blk_queue_update_dma_alignment(sdev->request_queue, ++ sdev->sector_size - 1); ++ + if (dev->flags & ATA_DFLAG_AN) + set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); + diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 56046bbc1..af73d75e9 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -6,16 +6,15 @@ pkgbase="kernel26-libre" pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Build stock -LIBRE kernel _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.37 -pkgver=${_basekernel} -pkgrel=5 +pkgver=${_basekernel}.1 +pkgrel=1 makedepends=('xmlto' 'docbook-xsl') -#_patchname="patch-${pkgver}-${pkgrel}-LIBRE" -_patchname="patch-${pkgver}-4-LIBRE" +_patchname="patch-${pkgver}-${pkgrel}-LIBRE" arch=(i686 x86_64) license=('GPL2') url="http://linux-libre.fsfla.org/" options=(!strip) -source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37-libre/linux-2.6.37-libre.tar.bz2 +source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.bz2 http://repo.parabolagnulinux.org/other/kernel26/${_patchname}.bz2 # the main kernel config files config.i686 config.x86_64 @@ -24,7 +23,7 @@ source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37-libre/linux kernel26.install) build() { - cd ${srcdir}/linux-$_basekernel + cd ${srcdir}/linux-$pkgver # Add -LIBRE patches # See http://projects.parabolagnulinux.org/linux-libre-2.6-LIBRE.git/ patch -Np1 -i ${srcdir}/${_patchname} || return 1 @@ -82,7 +81,7 @@ package_kernel26-libre() { optdepends=('crda: to set the correct wireless channels of your country') KARCH=x86 - cd ${srcdir}/linux-$_basekernel + cd ${srcdir}/linux-$pkgver # get kernel version _kernver="$(make kernelrelease)" mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot} @@ -126,7 +125,7 @@ package_kernel26-libre-headers() { mkdir -p ${pkgdir}/lib/modules/${_kernver} cd ${pkgdir}/lib/modules/${_kernver} ln -sf ../../../usr/src/linux-${_kernver} build - cd ${srcdir}/linux-$_basekernel + cd ${srcdir}/linux-$pkgver install -D -m644 Makefile \ ${pkgdir}/usr/src/linux-${_kernver}/Makefile install -D -m644 kernel/Makefile \ @@ -240,7 +239,7 @@ provides=("kernel26-docs=$pkgver") replaces=('kernel26-docs') conflicts=('kernel26-docs') -cd ${srcdir}/linux-$_basekernel +cd ${srcdir}/linux-$pkgver mkdir -p $pkgdir/usr/src/linux-$_kernver mv Documentation $pkgdir/usr/src/linux-$_kernver find $pkgdir -type f -exec chmod 444 {} \; @@ -248,9 +247,9 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } -md5sums=('3e80c55a0927b4439f3aad4f973f05cc' - 'b9eecbe905cc8db8dc1b408ae5e471da' - 'fcd0dd7a2148aec4d8b07dd01e99c0e1' - '52b1fd9c166c74fa3273b7d9a204fefb' +md5sums=('e88329f0b1a8c8527b5cab36530b2d57' + 'e5b28b5bed7ef1a898d528cf0d75220d' + '5266c8554fe93d3dbfb1699f0d86f129' + 'bdc02636e0acc27b942898a4fc66163f' '25584700a0a679542929c4bed31433b6' '1bff12f1ba69206b1abee2bba4b7619c') diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index 00e138c67..50ad703a0 100644 --- a/libre/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.37 Kernel Configuration -# Sat Jan 29 19:26:29 2011 +# Fri Feb 18 16:45:06 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index c38956c3d..a4c1457b1 100644 --- a/libre/kernel26-libre/config.x86_64 +++ b/libre/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.37 Kernel Configuration -# Sat Jan 29 19:46:24 2011 +# Fri Feb 18 18:18:04 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/libre/kernel26-libre/get_configs b/libre/kernel26-libre/get_configs index fe60a3696..624ea1048 100755 --- a/libre/kernel26-libre/get_configs +++ b/libre/kernel26-libre/get_configs @@ -2,12 +2,13 @@ source PKGBUILD -pkgname=${pkgname%-libre} +pkgname=${pkgname/-libre/} +KERNEL_VERSION=${2:-${_basekernel}-ARCH} from=${1:-core} for pkgarch in ${arch[@]}; do wget -nc "http://mirrors.kernel.org/archlinux/$from/os/${pkgarch}/${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" - tar -xOf "${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" usr/src/linux-${_basekernel}-ARCH/.config > config.${pkgarch} + tar -xOf "${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" usr/src/linux-${KERNEL_VERSION}/.config > config.${pkgarch} done sed -i "s/-ARCH/-LIBRE/" config.* |