From 2334bf712c92bc98af695ca1c3675488554d482d Mon Sep 17 00:00:00 2001 From: James Thomas Date: Fri, 24 Oct 2014 09:19:48 +0100 Subject: Remove any existing nouveau drivers before running depmod This means we use the out-of-tree module located in extra/ --- strata/bsp-jetson-genivi/nouveau-drm.morph | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/strata/bsp-jetson-genivi/nouveau-drm.morph b/strata/bsp-jetson-genivi/nouveau-drm.morph index e89df38b..e297a069 100644 --- a/strata/bsp-jetson-genivi/nouveau-drm.morph +++ b/strata/bsp-jetson-genivi/nouveau-drm.morph @@ -1,10 +1,12 @@ name: nouveau-drm kind: chunk build-commands: - - cd drm && make M=$(pwd) -C /usr/src/linux/ modules + - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules install-commands: - - cd drm && make M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install + - cd drm && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install system-integration: nouveau-drm-misc: 00-earlyconf: + - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done) + - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; done) - (cd /lib/modules && for version in *; do depmod -a "$version"; done) -- cgit v1.2.1