Changeset 3080


Ignore:
Timestamp:
Dec 15, 2016, 1:00:45 PM (2 years ago)
Author:
kbut
Message:

update from upstream

Location:
live-build/trunk/fuentes
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • live-build/trunk/fuentes/debian/changelog

    r903 r3080  
    1 live-build (3.0~a57-1ubuntu25+lliurex1) xenial; urgency=high
    2 
    3   * Remove wrong option on lb_binary_disk script(LP: #1555980)
    4 
    5  -- Raul Rodrigo Segura <raurodse@gmail.com>  Fri, 18 Mar 2016 12:12:39 +0100
     1live-build (3.0~a57-1ubuntu25.1) xenial; urgency=medium
     2
     3  * Avoid recompressing initrd.img symlinks (LP: #1539157).
     4
     5 -- Colin Watson <cjwatson@ubuntu.com>  Tue, 28 Jun 2016 15:45:10 +0100
    66
    77live-build (3.0~a57-1ubuntu25) xenial; urgency=medium
  • live-build/trunk/fuentes/debian/patches/series

    r902 r3080  
    3232upstart-not-in-bootstrap
    3333ubuntu-s390x-support.patch
    34 fix_launchpadbug_1555980
     34ubuntu-initramfs-compression-symlinks.patch
  • live-build/trunk/fuentes/scripts/build/lb_binary_disk

    r902 r3080  
    109109
    110110                                lzma)
    111                                         lzcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
     111                                        lzcat -S "" "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
    112112                                        ;;
    113113                        esac
  • live-build/trunk/fuentes/scripts/build/lb_chroot_hacks

    r900 r3080  
    196196
    197197        bzip2)
    198                 for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
     198                for INITRAMFS in $(find chroot/boot -name 'initrd*' -not -type l); do
    199199                        zcat "${INITRAMFS}" | bzip2 -c ${BZIP2_OPTIONS} > "${INITRAMFS}.new"
    200200                        mv "${INITRAMFS}.new" "${INITRAMFS}"
     
    206206                # /etc/initramfs-tools/conf.d/ instead, but it's hard to
    207207                # pass options that way.
    208                 for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
     208                for INITRAMFS in $(find chroot/boot -name 'initrd*' -not -type l); do
    209209                        zcat "${INITRAMFS}" | lzma -c ${LZMA_OPTIONS} > "${INITRAMFS}.new"
    210210                        mv "${INITRAMFS}.new" "${INITRAMFS}"
Note: See TracChangeset for help on using the changeset viewer.