summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <tnut at nutyx dot com>2011-07-02 22:33:09 +0200
committertnut <tnut at nutyx dot com>2011-07-02 22:33:09 +0200
commit0a955405e91f31066abfaafd3e8837c8373d4545 (patch)
tree7ec070a3e84713d63ca34aac6f3829e7cc7de747
parent182cb84aacadfd0e5d8a77563bdf50c5a79bad41 (diff)
parent3942b14cc412f99b33231d18b9a5b828da0e58aa (diff)
downloadnutyx-extra-0a955405e91f31066abfaafd3e8837c8373d4545.tar.gz
nutyx-extra-0a955405e91f31066abfaafd3e8837c8373d4545.tar.bz2
nutyx-extra-0a955405e91f31066abfaafd3e8837c8373d4545.tar.xz
nutyx-extra-0a955405e91f31066abfaafd3e8837c8373d4545.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
-rw-r--r--base/kernel/Pkgfile17
-rw-r--r--base/kernel/config_6428
2 files changed, 20 insertions, 25 deletions
diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile
index 7c67c35f6..e00fabaa3 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel/Pkgfile
@@ -6,7 +6,7 @@
name=kernel
version=2.6.39.2
_BaseVersion=2.6.39
-release=3
+release=4
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
@@ -23,8 +23,11 @@ ATI_VERSION=11.6
[ "`uname -m`" == "x86_64" ] && _ARCH=x86_64
[ "`uname -m`" == "i686" ] && VB_ARCH=x86
[ "`uname -m`" == "x86_64" ] && VB_ARCH=amd64
-
-source=(http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \
+[ "`uname -m`" == "i686" ] && BC_ARCH=x86_32
+[ "`uname -m`" == "x86_64" ] && BC_ARCH=x86_64
+source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_38.tar.gz \
+ 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 \
ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\
@@ -66,7 +69,7 @@ case `uname -m` in
mv $SRC/config ./.config;;
esac
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
-# make menuconfig
+make menuconfig
case `uname -m` in
x86_64)
cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
@@ -80,6 +83,12 @@ case `uname -m` in
i?86)
cp .config `prt-get printf %p --filter=$name`/$name/config;;
esac
+# Module broadcom
+cd $SRC
+patch -Np0 -i 5_100_82_38.patch
+KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd` clean
+KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd`
+install -m 0644 -D wl.ko $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/wl.ko
# Module nvidia
cd $SRC
sh NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run --extract-only
diff --git a/base/kernel/config_64 b/base/kernel/config_64
index 2cebd56ff..be246ffde 100644
--- a/base/kernel/config_64
+++ b/base/kernel/config_64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 2.6.39 Kernel Configuration
-# Fri Jun 24 21:48:40 2011
+# Sat Jul 2 17:43:10 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -3721,7 +3721,7 @@ CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
-# CONFIG_DRM_I810 is not set
+CONFIG_DRM_I810=m
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
@@ -3770,14 +3770,8 @@ CONFIG_FB_VESA=y
CONFIG_FB_N411=m
CONFIG_FB_HGA=m
CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
CONFIG_FB_LE80578=m
CONFIG_FB_CARILLO_RANCH=m
# CONFIG_FB_INTEL is not set
@@ -3787,17 +3781,9 @@ CONFIG_FB_MATROX_MYSTIQUE=y
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_I2C=m
CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
CONFIG_FB_S3=m
CONFIG_FB_SAVAGE=m
CONFIG_FB_SAVAGE_I2C=y