summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/ati-utils/.md5sum.i6862
-rw-r--r--base/ati-utils/.md5sum.x86_642
-rwxr-xr-xbase/ati-utils/Pkgfile2
-rw-r--r--base/kernel/Pkgfile16
-rw-r--r--base/kernel/makefile_compat.patch10
-rw-r--r--base/udev/.footprint.i6862
-rw-r--r--base/udev/.footprint.x86_642
-rw-r--r--base/udev/.md5sum.i6864
-rw-r--r--base/udev/.md5sum.x86_644
-rw-r--r--base/udev/Pkgfile6
10 files changed, 30 insertions, 20 deletions
diff --git a/base/ati-utils/.md5sum.i686 b/base/ati-utils/.md5sum.i686
index 5199c9163..5aa5fa9f2 100644
--- a/base/ati-utils/.md5sum.i686
+++ b/base/ati-utils/.md5sum.i686
@@ -1 +1 @@
-ff901cfa828006e25e9d6718a515b5c0 ati-driver-installer-11-6-x86.x86_64.run
+acebb812d4c057766828df0bf572e8ae ati-driver-installer-11-7-x86.x86_64.run
diff --git a/base/ati-utils/.md5sum.x86_64 b/base/ati-utils/.md5sum.x86_64
index 5199c9163..5aa5fa9f2 100644
--- a/base/ati-utils/.md5sum.x86_64
+++ b/base/ati-utils/.md5sum.x86_64
@@ -1 +1 @@
-ff901cfa828006e25e9d6718a515b5c0 ati-driver-installer-11-6-x86.x86_64.run
+acebb812d4c057766828df0bf572e8ae ati-driver-installer-11-7-x86.x86_64.run
diff --git a/base/ati-utils/Pkgfile b/base/ati-utils/Pkgfile
index 2c2e485c3..164ec922b 100755
--- a/base/ati-utils/Pkgfile
+++ b/base/ati-utils/Pkgfile
@@ -5,7 +5,7 @@
# Depends on:
name=ati-utils
-version=11.6
+version=11.7
release=1
[ "`uname -m`" == "i686" ] && _ARCH=x86
[ "`uname -m`" == "x86_64" ] && _ARCH=x86_64
diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile
index 408a49819..fbad4be53 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel/Pkgfile
@@ -4,9 +4,9 @@
# Packager: thierryn1 at hispeed dot ch
name=kernel
-version=2.6.39.3
+version=2.6.39.4
_BaseVersion=2.6.39
-release=2
+release=1
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
@@ -15,9 +15,9 @@ INITRDBASE="nutyx-initrd"
_extra=30052011
_tools=03072011
NVIDIA_VERSION=280.13
-VB_VERSION=4.0.12
-VB_BUILD=72916
-ATI_VERSION=11.6
+VB_VERSION=4.1.0
+VB_BUILD=73009
+ATI_VERSION=11.7
[ "`uname -m`" == "i686" ] && _ARCH=x86
[ "`uname -m`" == "x86_64" ] && _ARCH=x86_64
@@ -29,7 +29,7 @@ source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_
http://www.broadcom.com/docs/linux_sta/5_100_82_38.patch \
http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \
http://www2.ati.com/drivers/linux/ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \
- http://nutyx.meticul.eu/files/patchs/ati/ati-${ATI_VERSION}.tar.gz \
+ makefile_compat.patch \
http://fr.download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\
http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\
http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2 \
@@ -101,8 +101,8 @@ cd $SRC
sh ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati
cd ati
patch -Np1 -i ../makefile_compat.patch
-patch -Np1 -i ../2.6.39_bkl.patch
-patch -Np1 -i ../no_bkl.patch
+# patch -Np1 -i ../2.6.39_bkl.patch
+# patch -Np1 -i ../no_bkl.patch
cd common/lib/modules/fglrx/build_mod
cp 2.6.x/Makefile .
cp $SRC/ati/arch/${_ARCH}/lib/modules/fglrx/build_mod/libfglrx_ip.a .
diff --git a/base/kernel/makefile_compat.patch b/base/kernel/makefile_compat.patch
new file mode 100644
index 000000000..defa3d8d8
--- /dev/null
+++ b/base/kernel/makefile_compat.patch
@@ -0,0 +1,10 @@
+--- 10.10/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2010-09-22 09:15:33.000000000 +0200
++++ 10.10/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2010-10-01 17:57:21.057820899 +0200
+@@ -66,6 +66,7 @@
+ -DFGL_GART_RESERVED_SLOT \
+ -DFGL_LINUX253P1_VMA_API \
+ -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
++ -DCOMPAT_ALLOC_USER_SPACE=$(COMPAT_ALLOC_USER_SPACE) \
+
+ ifeq ($(KERNELRELEASE),)
+ # on first call from remote location we get into this path
diff --git a/base/udev/.footprint.i686 b/base/udev/.footprint.i686
index 5572d384f..34d3c8df1 100644
--- a/base/udev/.footprint.i686
+++ b/base/udev/.footprint.i686
@@ -105,7 +105,7 @@ drwxr-xr-x root/root lib/udev/rules.d/
-rw-r--r-- root/root lib/udev/rules.d/60-persistent-storage.rules
-rw-r--r-- root/root lib/udev/rules.d/60-persistent-v4l.rules
-rw-r--r-- root/root lib/udev/rules.d/61-accelerometer.rules
--rw-r--r-- root/root lib/udev/rules.d/70-acl.rules
+-rw-r--r-- root/root lib/udev/rules.d/70-udev-acl.rules
-rw-r--r-- root/root lib/udev/rules.d/75-cd-aliases-generator.rules
-rw-r--r-- root/root lib/udev/rules.d/75-net-description.rules
-rw-r--r-- root/root lib/udev/rules.d/75-persistent-net-generator.rules
diff --git a/base/udev/.footprint.x86_64 b/base/udev/.footprint.x86_64
index 5572d384f..34d3c8df1 100644
--- a/base/udev/.footprint.x86_64
+++ b/base/udev/.footprint.x86_64
@@ -105,7 +105,7 @@ drwxr-xr-x root/root lib/udev/rules.d/
-rw-r--r-- root/root lib/udev/rules.d/60-persistent-storage.rules
-rw-r--r-- root/root lib/udev/rules.d/60-persistent-v4l.rules
-rw-r--r-- root/root lib/udev/rules.d/61-accelerometer.rules
--rw-r--r-- root/root lib/udev/rules.d/70-acl.rules
+-rw-r--r-- root/root lib/udev/rules.d/70-udev-acl.rules
-rw-r--r-- root/root lib/udev/rules.d/75-cd-aliases-generator.rules
-rw-r--r-- root/root lib/udev/rules.d/75-net-description.rules
-rw-r--r-- root/root lib/udev/rules.d/75-persistent-net-generator.rules
diff --git a/base/udev/.md5sum.i686 b/base/udev/.md5sum.i686
index 6252fec55..a6988f8b9 100644
--- a/base/udev/.md5sum.i686
+++ b/base/udev/.md5sum.i686
@@ -1,2 +1,2 @@
-bd122d04cf758441f498aad0169a454f udev-172.tar.bz2
-99c3fc6ac39627d0ca9ca77b896b595a udev-config-20100128.tar.bz2
+91a88a359b60bbd074b024883cc0dbde udev-173.tar.bz2
+7308633a6ad718f7f9f4b0aabb85ef47 udev-config-20100128.tar.bz2
diff --git a/base/udev/.md5sum.x86_64 b/base/udev/.md5sum.x86_64
index 6252fec55..a6988f8b9 100644
--- a/base/udev/.md5sum.x86_64
+++ b/base/udev/.md5sum.x86_64
@@ -1,2 +1,2 @@
-bd122d04cf758441f498aad0169a454f udev-172.tar.bz2
-99c3fc6ac39627d0ca9ca77b896b595a udev-config-20100128.tar.bz2
+91a88a359b60bbd074b024883cc0dbde udev-173.tar.bz2
+7308633a6ad718f7f9f4b0aabb85ef47 udev-config-20100128.tar.bz2
diff --git a/base/udev/Pkgfile b/base/udev/Pkgfile
index ccaeddea9..bd0ffe18e 100644
--- a/base/udev/Pkgfile
+++ b/base/udev/Pkgfile
@@ -6,16 +6,16 @@
# Run on:
name=udev
-version=172
+version=173
release=1
_lfs_release=20100128
source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \
http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${_lfs_release}.tar.bz2)
build() {
if ( pkginfo -i|grep "^glib " > /dev/null) then
- EXTRA="--with-pci-ids-path=/usr/share/pci.ids.gz"
+ EXTRA="--with-pci-ids-path=/usr/share/pci.ids.gz --enable-udev_acl"
else
- EXTRA="--disable-extras --disable-introspection --disable-hwdb --disable-udev_acl --disable-keymap"
+ EXTRA="--disable-extras --disable-introspection --disable-hwdb --disable-keymap"
fi
cd udev-$version