Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-05 16:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

add STRIP_VMLINUZ=no for omap, remove extra subarch check and fix comment for STRIP_VMLINUZ

Browse Source
This commit is contained in:
Oliver Grawert 2010-04-20 13:19:59 +02:00
parent f0ffdb8c74
commit 191a27c4a9
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (1.114) UNRELEASED; urgency=low
* make sure STRIP_VMLINUZ=no is set for omap, also change the code to only
use the case statement for matching subarches instead of adding an extra
check.
* fix the comment for STRIP_VMLINUZ to reflect reality.
-- Oliver Grawert <ogra@ubuntu.com> Tue, 20 Apr 2010 13:16:16 +0200
livecd-rootfs (1.113) lucid; urgency=low livecd-rootfs (1.113) lucid; urgency=low
* fix typo * fix typo

20
livecd.sh
View File

@ -316,6 +316,14 @@ link_in_boot = $link_in_boot
mkdir -p ${ROOT}proc mkdir -p ${ROOT}proc
mount -tproc none ${ROOT}proc mount -tproc none ${ROOT}proc
# this indicates whether or not to keep /boot/vmlinuz; the default is to
# strip it from the livefs as ubiquity >= 1.9.4 copies the kernel from the
# CD root (/casper/vmlinuz) to the target if it doesn't find one on the
# livefs, allowing us to save space; however some subarches use the uImage
# format in casper/ so we would end up with no vmlinuz file in /boot at the
# end. Not stripping it in the first place from /boot saves us from that.
STRIP_VMLINUZ=yes
case $TARGETARCH+$SUBARCH in case $TARGETARCH+$SUBARCH in
powerpc+ps3) powerpc+ps3)
mkdir -p ${ROOT}spu;; mkdir -p ${ROOT}spu;;
@ -338,24 +346,16 @@ link_in_boot = $link_in_boot
;; ;;
dove) dove)
LIST="$LIST linux-dove" LIST="$LIST linux-dove"
STRIP_VMLINUZ=no
;; ;;
omap) omap)
LIST="$LIST linux-omap" LIST="$LIST linux-omap"
STRIP_VMLINUZ=no
;; ;;
esac;; esac;;
*) echo "Unknown architecture: no kernel."; exit 1;; *) echo "Unknown architecture: no kernel."; exit 1;;
esac esac
# this indicates whether or not to keep /boot/vmlinuz; the default is to
# strip it from the livefs as ubiquity >= 1.9.4 copies the kernel from the
# CD root (/casper/vmlinuz) to the target if it doesn't find one on the
# livefs, allowing us to save space; however some subarches use the uImage
# format and wouldn't save any space so the stripping doesn't make sense
STRIP_VMLINUZ=yes
if [ "$TARGETARCH" = "armel" ] && [ "$SUBARCH" = "dove" ]; then
STRIP_VMLINUZ=no
fi
for x in $EXCLUDE; do for x in $EXCLUDE; do
LIST="$(without_package "$x" "$LIST")" LIST="$(without_package "$x" "$LIST")"
done done