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

Refactor some non-idiomatic architecture handling in

Browse Source 
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
This commit is contained in:
Steve Langasek 2016-02-02 20:33:52 -08:00
parent 893ba9e96f
commit 8e20e4b169
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.375) UNRELEASED; urgency=medium
* Refactor some non-idiomatic architecture handling in
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 02 Feb 2016 20:33:23 -0800
livecd-rootfs (2.374) xenial; urgency=medium livecd-rootfs (2.374) xenial; urgency=medium
[ Michael Vogt ] [ Michael Vogt ]

41
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
View File

@ -126,30 +126,29 @@ fi
#### END COMMON ARCH FUNCTIONS #### END COMMON ARCH FUNCTIONS
if [ "$arch" = "ppc64el" ]; then
add_serial_console hvc0
exit 0
fi
# ARM images are special case $arch in
if [[ "$arch" =~ (arm|arm64|aarch64) ]]; then # ARM images are special
armhf|arm64)
echo "Configuring ARM Serial Port"
add_serial_console ttyAMA0
echo "Configuring ARM Serial Port" echo "Image architecture is ARM. Existing vmbuilder-fixups"
add_serial_console ttyAMA0
echo "Image architecture is ARM. Existing vmbuilder-fixups" exit 0
;;
exit 0 ## Add ttyS0 for i386/amd64 for Trusty and newer
fi i386|amd64)
add_serial_console ttyS0
if [ "$arch" = "s390x" ]; then ;;
exit 0 ppc64el)
fi add_serial_console hvc0
exit 0
## Add ttyS0 for i386/amd64 for Trusty and newer ;;
if [ "$arch" = "i386" -o "$arch" = "amd64" ]; then s390x)
add_serial_console ttyS0 exit 0
fi ;;
esac
psuedo_grub_probe() { psuedo_grub_probe() {
cat <<"PSUEDO_GRUB_PROBE" cat <<"PSUEDO_GRUB_PROBE"