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

ubuntu-cpc: Refactor arch handling to fix armhf

Browse Source 
[ Steve Langasek ]
  * Refactor some non-idiomatic architecture handling in
    live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot that also misidentifies
    the architecture name for armhf.
This commit is contained in:
Robert C Jennings 2017-05-25 20:35:26 -05:00
parent 4a65c41a5e
commit cb8ede888f
2 changed files with 26 additions and 17 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 (2.209.11) trusty; urgency=medium
[ Steve Langasek ]
* Refactor some non-idiomatic architecture handling in
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot that also misidentifies
the architecture name for armhf.
-- Robert C Jennings <robert.jennings@canonical.com> Tue, 23 May 2017 21:38:47 -0500
livecd-rootfs (2.209.10) trusty; urgency=medium livecd-rootfs (2.209.10) trusty; urgency=medium
[ Steve Langasek ] [ Steve Langasek ]

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

@ -126,26 +126,26 @@ 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
## Add ttyS0 for i386/amd64 for Trusty and newer ;;
if [ "$arch" = "i386" -o "$arch" = "amd64" ]; then ppc64el)
add_serial_console ttyS0 add_serial_console hvc0
fi exit 0
;;
esac
psuedo_grub_probe() { psuedo_grub_probe() {
cat <<"PSUEDO_GRUB_PROBE" cat <<"PSUEDO_GRUB_PROBE"