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

Import patches-unapplied version 2.137 to ubuntu/saucy-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 0022f57f81f1370338635a8cd0c59776e6ff95bd

New changelog entries:
  * clear up /var/lib/initramfs-tools/ in the chroot after building initrds
  * remove ubuntu-touch/hooks/49-setup-demo-assets.chroot
  * handle sources.list in ubuntu-touch initrd creation
This commit is contained in:
Oliver Grawert 2013-05-28 11:13:57 +02:00 committed by usd-importer
parent 0022f57f81
commit 559b695a85
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.137) saucy; urgency=low
* clear up /var/lib/initramfs-tools/ in the chroot after building initrds
* remove ubuntu-touch/hooks/49-setup-demo-assets.chroot
* handle sources.list in ubuntu-touch initrd creation
-- Oliver Grawert <ogra@ubuntu.com> Tue, 28 May 2013 11:13:57 +0200
livecd-rootfs (2.136) saucy; urgency=low
* ubuntu-touch: determine the value for $kver inside the chroot, not

31
live-build/auto/build
View File

@ -404,12 +404,19 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
fi
if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
for subarch in maguro manta grouper mako; do
touchsubarches="maguro manta grouper mako"
lb chroot_proc install "$@"
lb chroot_sysfs install "$@"
lb chroot_devpts install "$@"
sourceslist="chroot/etc/apt/sources.list"
lb chroot_proc install "$@"
lb chroot_sysfs install "$@"
lb chroot_devpts install "$@"
mv "${sourceslist}" "${sourceslist}.orig"
echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist
Chroot chroot "apt-get -y update"
for subarch in $touchsubarches; do
kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/ Depends: //')"
kver=${kpkg#linux-image-}
Chroot chroot "apt-get -y install $kpkg"
@ -420,14 +427,22 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
Chroot chroot "apt-get -y purge $kpkg"
lb chroot_devpts remove "$@"
lb chroot_sysfs remove "$@"
lb chroot_proc remove "$@"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
done
lb chroot_devpts remove "$@"
lb chroot_sysfs remove "$@"
lb chroot_proc remove "$@"
rm -rf chroot/var/lib/initramfs-tools/*
Chroot chroot "apt-get -y purge crda wireless-regdb"
Chroot chroot "apt-get -y clean"
mv $sourceslist.orig $sourceslist
for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
rm $file
done
fi
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))

15
live-build/ubuntu-touch/hooks/49-setup-demo-assets.chroot
View File

@ -1,15 +0,0 @@
#!/bin/bash
# Extract pictures to user
tar -C /home/phablet/Pictures/ --strip-components=1 -xzf \
/usr/share/demo-assets/pictures.tgz
chown -R phablet:phablet /home/phablet/Pictures
# Copy videos to user
cp -p /usr/share/demo-assets/videos/* /home/phablet/Videos/
chown -R phablet:phablet /home/phablet/Videos
# Set up fake telepathy-logger data
mkdir -p /home/phablet/.local/share/TpLogger/logs
cp -aRp /usr/share/demo-assets/telephony-app/* /home/phablet/.local/share/TpLogger/logs
chown -R phablet.phablet /home/phablet/.local/