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

Import patches-unapplied version 2.332 to ubuntu/wily-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 9cc1a68ad19aeacd7cf9db62abc93d7d1771d41f

New changelog entries:
  * Get previous ubuntu-core changes on desktop-next
This commit is contained in:
Sebastien Bacher 2015-07-09 18:19:41 +02:00 committed by usd-importer
parent 9cc1a68ad1
commit 1a48fd620d
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.332) wily; urgency=medium
* Get previous ubuntu-core changes on desktop-next
-- Sebastien Bacher <seb128@ubuntu.com> Thu, 09 Jul 2015 18:19:41 +0200
livecd-rootfs (2.331) wily; urgency=medium livecd-rootfs (2.331) wily; urgency=medium
* merge lp:~sergiusens/livecd-rootfs/eth0Not to not hardcode eth0 anymore on * merge lp:~sergiusens/livecd-rootfs/eth0Not to not hardcode eth0 anymore on

9
live-build/ubuntu-desktop-next/hooks/04-configure_network.chroot
View File

@ -1,9 +0,0 @@
#!/bin/sh -x
if=eth0
# Manually configure the first ethernet device
cat >/etc/network/interfaces.d/"$if"<<EOT
allow-hotplug $if
iface $if inet dhcp
EOT

25
live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
View File

@ -16,39 +16,34 @@ mkdir -p $TMPDIR/assets/
( (
cd binary/boot/filesystem.dir cd binary/boot/filesystem.dir
# for compatibility with current grub/u-d-f
cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/
if [ -e vmlinu? ] && [ -e initrd.img ]; then
cp -ar --parent vmlinu? initrd.img $TMPDIR/system
fi
cp -ar --parent lib/modules/ $TMPDIR/system/ cp -ar --parent lib/modules/ $TMPDIR/system/
cp -ar --parent lib/firmware/ $TMPDIR/system/ cp -ar --parent lib/firmware/ $TMPDIR/system/
# new assets handling # new assets handling
# FIXME:
# - how to keep version information (and do we care)
if [ -f boot/vmlinu?-*.signed ]; then if [ -f boot/vmlinu?-*.signed ]; then
cp -ar boot/vmlinu?-*.signed $TMPDIR/assets/vmlinuz kernel=boot/vmlinu?-*.signed
else else
cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz kernel=boot/vmlinu?-*
fi fi
cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img
initrd=boot/initrd.img-*
cp -ar $initrd $TMPDIR/assets/
cp -ar $kernel $TMPDIR/assets/
cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/ cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/
dtbs=$(find lib/firmware -type d -name 'device-tree' -print0) dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
if [ -n "$dtbs" ]; then if [ -n "$dtbs" ]; then
mv "$dtbs" $TMPDIR/assets/dtbs mv "$dtbs" $TMPDIR/assets/dtbs
fi fi
)
# create hardware.yaml for u-boot # create hardware.yaml
# this assumes armh == u-boot # this assumes armh == u-boot
# and all others grub # and all others grub
(
# common bits # common bits
cat > $TMPDIR/hardware.yaml << EOF cat > $TMPDIR/hardware.yaml << EOF
kernel: assets/vmlinuz kernel: assets/$(basename $kernel)
initrd: assets/initrd.img initrd: assets/$(basename $initrd)
partition-layout: system-AB partition-layout: system-AB
EOF EOF