Merge pull request #120 from chewitt/patch-1

fixes linux unpack logic so the atv image builds with nouveau correctly
This commit is contained in:
Stephan Raue 2012-01-14 04:12:15 -08:00
commit 897f30b2e2

View File

@ -52,10 +52,10 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD
sed -i -e "s|^CONFIG_DEBUG_FS=.*$|# CONFIG_DEBUG_FS is not set|" $LINUX/.config sed -i -e "s|^CONFIG_DEBUG_FS=.*$|# CONFIG_DEBUG_FS is not set|" $LINUX/.config
fi fi
# wipe out nouveau if GRAPHICS_DRIVERS contains nvidia # prevent nouveau from building unless it is the active graphics driver
echo $GRAPHIC_DRIVERS | grep "nvidia" &>/dev/null && \ if [ "$GRAPHIC_DRIVERS" != "nouveau" ]; then
sed -i '/NOUVEAU/ d' $LINUX/.config && \ sed -i -e "s|^CONFIG_DRM_NOUVEAU=.*$|# CONFIG_DRM_NOUVEAU is not set|" $LINUX/.config
echo "# CONFIG_DRM_NOUVEAU is not set" >> $LINUX/.config fi
# copy some extra firmware to linux tree # copy some extra firmware to linux tree
cp -R $PKG_DIR/firmware/* $LINUX/firmware cp -R $PKG_DIR/firmware/* $LINUX/firmware