From 39492896353a3deb92d40e639497b58349319c4e Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Sat, 12 Feb 2011 13:32:59 +0100 Subject: [PATCH] Import patches-unapplied version 1.157 to ubuntu/natty Imported using git-ubuntu import. Changelog parent: 4a39adda5ce660a09bad1bc5dbd3f5b55fb9c612 New changelog entries: * drop IGEPv2 x-loader and u-boot from livefs.sh, they are not in main and thus break image builds --- debian/changelog | 7 +++++++ livecd.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e9e20ab2..b27ca5a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.157) natty; urgency=low + + * drop IGEPv2 x-loader and u-boot from livefs.sh, they are not in main + and thus break image builds + + -- Oliver Grawert Sat, 12 Feb 2011 13:32:59 +0100 + livecd-rootfs (1.156) natty; urgency=low * Add X-Loader and U-Boot packages for IGEPv2, Beagle and Panda diff --git a/livecd.sh b/livecd.sh index 7f236895..d9e9147f 100755 --- a/livecd.sh +++ b/livecd.sh @@ -436,7 +436,7 @@ link_in_boot = $link_in_boot STRIP_VMLINUZ=no ;; omap) - LIST="$LIST linux-omap x-loader-omap3-igepv2 u-boot-linaro-igep0020 x-loader-omap3-beagle u-boot-linaro-omap3-beagle" + LIST="$LIST linux-omap x-loader-omap3-beagle u-boot-linaro-omap3-beagle" STRIP_VMLINUZ=no ;; omap4)