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

Import patches-unapplied version 1.114 to ubuntu/lucid

Browse Source 
Imported using git-ubuntu import.

Changelog parent: d0c869bbc1ec928681c9b64dc3d8aac5d0339de6

New changelog entries:
  * 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.
  * fix typo
This commit is contained in:
Oliver Grawert 2010-04-20 13:20:10 +02:00 committed by usd-importer
parent d0c869bbc1
commit cb683e30d2
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.bzrignore
View File

@ -1,4 +0,0 @@
debian/*.debhelper*
debian/*.substvars
debian/files
debian/livecd-rootfs

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
livecd-rootfs (1.114) lucid; 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:20:10 +0200
livecd-rootfs (1.113) lucid; urgency=low
* fix typo
-- LaMont Jones <lamont@ubuntu.com> Sat, 27 Mar 2010 21:10:16 -0600
livecd-rootfs (1.112) lucid; urgency=low livecd-rootfs (1.112) lucid; urgency=low
* ltsp image needs to be readable * ltsp image needs to be readable

22
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
@ -658,7 +658,7 @@ Pin-Priority: 550
rm -Rf $(pwd)/ltsp-live rm -Rf $(pwd)/ltsp-live
if [ -f $(pwd)/images/ltsp-live.img ]; then if [ -f $(pwd)/images/ltsp-live.img ]; then
mv $(pwd)/images/ltsp-live.img livecd.$FS-ltsp.squashfs mv $(pwd)/images/ltsp-live.img livecd.$FS-ltsp.squashfs
chmod 644 livecd.$FS-ltsp.squashfs chmod 0644 livecd.$FS-ltsp.squashfs
rmdir --ignore-fail-on-non-empty $(pwd)/images/ rmdir --ignore-fail-on-non-empty $(pwd)/images/
else else
echo "LTSP: Unable to build the chroot, see above for details." echo "LTSP: Unable to build the chroot, see above for details."