From 82caa295426b3d40fc072dd675adb94d8044cadb Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 19 Nov 2012 12:58:36 +0100 Subject: [PATCH] Import patches-unapplied version 2.97 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: 1d42aa78bb75ba47c302cfd55baf104c2ddeac51 New changelog entries: * add linux-firmware-nexus7 and nvidia-graphics-drivers-tegra3 to nexus7 builds * preseed the license popup of linux-firmware-nexus7, we will show it in the installer for full image installs. --- debian/changelog | 9 +++++++++ live-build/auto/config | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bcfaf325..f38a9218 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.97) raring; urgency=low + + * add linux-firmware-nexus7 and nvidia-graphics-drivers-tegra3 to nexus7 + builds + * preseed the license popup of linux-firmware-nexus7, we will show + it in the installer for full image installs. + + -- Oliver Grawert Mon, 19 Nov 2012 12:58:36 +0100 + livecd-rootfs (2.96) raring; urgency=low * add nexus7 specific kernel cmdline diff --git a/live-build/auto/config b/live-build/auto/config index 637dd95c..b6c2b039 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -308,9 +308,11 @@ case $ARCH in ;; nexus7) COMPONENTS='main restricted universe multiverse' - add_package install zram-config + add_package install zram-config linux-firmware-nexus7 nvidia-graphics-drivers-tegra3 add_package live ac100-tarball-installer BINARY_REMOVE_LINUX=false + mkdir -p config/preseed + echo "linux-firmware-nexus7 shared/nexus7_notice_accepted boolean true" >config/preseed/linux-firmware-nexus7.preseed.chroot ;; esac ;;