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

Import patches-unapplied version 2.375 to ubuntu/xenial-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 2ace5b787ba058c6de1803bd4d4ef825ebfea82d

New changelog entries:
  [ 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.
  [ Ben Howard ]
  * ubuntu-cpc: add missing net.ifnames=0 for ppc64el disk images.
This commit is contained in:
Ben Howard 2016-02-04 17:15:58 +01:00 committed by usd-importer
parent 2ace5b787b
commit 80fddc56a2
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
livecd-rootfs (2.375) xenial; 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.
[ Ben Howard ]
* ubuntu-cpc: add missing net.ifnames=0 for ppc64el disk images.
-- Ben Howard <ben.howard@ubuntu.com> Thu, 04 Feb 2016 17:15:58 +0100
livecd-rootfs (2.374) xenial; urgency=medium livecd-rootfs (2.374) xenial; urgency=medium
[ Michael Vogt ] [ Michael Vogt ]

2
live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
View File

@ -38,7 +38,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
GRUB_TIMEOUT=0 GRUB_TIMEOUT=0
# Set the default commandline # Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk" GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk net.ifnames=0"
EOF EOF
prep_partition="/dev/mapper${loop_device///dev/}p2" prep_partition="/dev/mapper${loop_device///dev/}p2"
chroot mountpoint grub-install "${prep_partition}" \ chroot mountpoint grub-install "${prep_partition}" \

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"