diff options
| author | Andraž Levstik | 2009-09-15 21:20:14 +0200 |
|---|---|---|
| committer | Andraž Levstik | 2009-09-15 21:20:14 +0200 |
| commit | 648826b030ca79cc17e6e2d8f8d15bf3b9a8c77c (patch) | |
| tree | cd90f383c74bd4314767414b7e583b972ec1b3b3 | |
| parent | b30c338f22e712357193c60a3b9aaf8bd01178c6 (diff) | |
drm: use the separate repository for the -3d support
| -rwxr-xr-x | kernels/drm/BUILD | 2 | ||||
| -rwxr-xr-x | kernels/drm/DETAILS | 11 | ||||
| -rwxr-xr-x | kernels/drm/INSTALL | 6 | ||||
| -rwxr-xr-x | kernels/drm/PREPARE | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/kernels/drm/BUILD b/kernels/drm/BUILD index 39aee012bc..0d9a3435a0 100755 --- a/kernels/drm/BUILD +++ b/kernels/drm/BUILD @@ -1,2 +1,2 @@ cd linux-core && -make DRM_MODULES="$DRM_DRIVERS" RUNNING_REL=$(get_kernel_version) +make DRM_MODULES="$DRM_DRIVERS" RUNNING_REL=2.6.31 diff --git a/kernels/drm/DETAILS b/kernels/drm/DETAILS index 416bc498e0..d2fd862f02 100755 --- a/kernels/drm/DETAILS +++ b/kernels/drm/DETAILS @@ -7,12 +7,19 @@ else fi SOURCE=$SPELL-git.tar.bz2 FORCE_DOWNLOAD=on +if [[ $DRM_AGD5F == y ]]; then + SOURCE_URL=git://anongit.freedesktop.org/~agd5f/drm:drm-agd5f:r6xx-r7xx-3d + SOURCE=$SPELL-agd5f.tar.bz2 +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-agd5f +else SOURCE_URL=git://anongit.freedesktop.org/git/mesa/drm:drm-git - SOURCE_IGNORE=volatile + SOURCE=$SPELL-git.tar.bz2 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-git +fi + SOURCE_IGNORE=volatile WEB_SITE=http://dri.freedesktop.org ENTERED=20060913 - PATCHLEVEL=1 + PATCHLEVEL=2 LICENSE[0]=GPL SHORT="The kernel Direct Rendering Manager" cat << EOF diff --git a/kernels/drm/INSTALL b/kernels/drm/INSTALL index 3f2c1125d9..1a46ce2fc0 100755 --- a/kernels/drm/INSTALL +++ b/kernels/drm/INSTALL @@ -1,10 +1,10 @@ cd $SOURCE_DIRECTORY && -mkdir -vp $INSTALL_ROOT/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm && +mkdir -vp $INSTALL_ROOT/lib/modules/2.6.31/kernel/drivers/char/drm && if [[ "$(get_kernel_version | cut -c-3)" == "2.6" ]]; then cp -v $SOURCE_DIRECTORY/linux-core/*.ko \ - $INSTALL_ROOT/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm/ + $INSTALL_ROOT/lib/modules/2.6.31/kernel/drivers/char/drm/ else cp -v $SOURCE_DIRECTORY/linux-core/*.o \ - $INSTALL_ROOT/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm/ + $INSTALL_ROOT/lib/modules/2.6.31/kernel/drivers/char/drm/ fi diff --git a/kernels/drm/PREPARE b/kernels/drm/PREPARE index 4a33c0d873..9ebe8e19d2 100755 --- a/kernels/drm/PREPARE +++ b/kernels/drm/PREPARE @@ -1,8 +1,8 @@ config_query DRM_AUTOUPDATE \ "Automaticaly update the spell on sorcery queue/system-update?" "n" && -config_query DRM_6XX \ - "Use the EXPERIMENTAL r6xx-7xx-support branch?" "n" && +config_query DRM_AGD5F \ + "Use the EXPERIMENTAL r6xx-7xx-3d branch?" "n" && # # At least for 2.6.26 and 2.6.27, drm requires CONFIG_UNUSED_SYMBOLS=y |