diff --git a/debian/changelog b/debian/changelog index 4281b03e..6e8c0126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 diff --git a/debian/control b/debian/control index 541576ff..3e0e3b1a 100644 --- a/debian/control +++ b/debian/control @@ -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 diff --git a/live-build/auto/build b/live-build/auto/build index 8169d7a9..197e3113 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -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: " - echo "data lines: [ ...]" - 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