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

Import patches-unapplied version 2.219 to ubuntu/utopic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 9da734df9353e25b870f23845467a0e38c7606e8

New changelog entries:
  * Drop fdupes analysis: not widely used any more, can be done separately
    if needed, and very noisy in build logs.
  * Make the output kernel/initrd world-readable in a couple more cases,
    particularly relevant to ubuntu-defaults-image (LP: #1334616).
This commit is contained in:
Colin Watson 2014-06-26 12:31:12 +01:00 committed by usd-importer
parent 9da734df93
commit 90fb428342
3 changed files with 12 additions and 14 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.219) utopic; urgency=medium
* Drop fdupes analysis: not widely used any more, can be done separately
if needed, and very noisy in build logs.
* Make the output kernel/initrd world-readable in a couple more cases,
particularly relevant to ubuntu-defaults-image (LP: #1334616).
-- Colin Watson <cjwatson@ubuntu.com> Thu, 26 Jun 2014 12:31:12 +0100
livecd-rootfs (2.218) utopic; urgency=medium
* Install linux-signed-generic directly in live passes rather than relying

2
debian/control vendored
View File

@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
Package: livecd-rootfs
Architecture: any
Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils [armhf], python3-software-properties
Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils [armhf], python3-software-properties
Suggests: partimage
Breaks: ubuntu-defaults-builder (<< 0.32)
Description: construction script for the livecd rootfs

15
live-build/auto/build
View File

@ -247,19 +247,6 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
(cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr)
echo END docdirs
if which fdupes >/dev/null 2>&1; then
echo "===== Checking for duplicate files ====="
echo "first line: <total size for dupes> <different dupes> <all dupes>"
echo "data lines: <size for dupes> <number of dupes> <file size> <filename> [<filename> ...]"
echo BEGIN fdupes
(cd chroot \
&& fdupes --recurse --noempty --sameline --size --quiet usr \
| awk '/bytes each/ {s=$1} /^usr/ { n+=1; n2+=NF-1; sum+=s*(NF-1); print s*(NF-1), NF-1, s, $0 } END {print sum, n, n2}' \
| sort -nr
)
echo END fdupes
fi
lb binary "$@"
touch binary.success
) 2>&1 | tee binary.log
@ -359,11 +346,13 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
# only one kernel flavour
if [ -e "binary/$INITFS/vmlinuz" ]; then
ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
chmod 644 "$PREFIX.kernel"
else
ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
fi
if [ -e "binary/$INITFS/initrd.lz" ]; then
ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
chmod 644 "$PREFIX.initrd"
else
ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
fi