From deadde90a4ad32efa93c66d92c280d5449e9aa29 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 30 May 2007 07:58:06 +0000 Subject: [PATCH] Clifford Wolf: Updated linux (2.6.21.2) [2007052518260726930] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8473 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.conf | 3 +++ package/base/linux/linux.desc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index 7cd1c31cf..f1c3abd3e 100644 --- a/package/base/linux/linux.conf +++ b/package/base/linux/linux.conf @@ -506,6 +506,9 @@ main_lx_headers() { done rm -vf $builddir/hdr_path/include/scsi/{sg,scsi,scsi_ioctl}.h cp -av $builddir/hdr_path/include/* $root/usr/include/ + + # avoid shared files conflict with glibc + var_append flist''del '|' "usr/include/scsi" } autoextract=0 diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 5f358eada..9d4f70c2f 100644 --- a/package/base/linux/linux.desc +++ b/package/base/linux/linux.desc @@ -50,8 +50,8 @@ #endif #if xpkg == linux26.* -[V] 2.6.21.1 -[D] 912049885 linux-2.6.21.1.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/ +[V] 2.6.21.2 +[D] 3363684588 linux-2.6.21.2.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/ #endif [CD] for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done