← Back to branch summary

~oem-solutions-releng/live-build/lb-sg-2.x-add-support-for-xz-and-bzip2-compression

« back to all changes in this revision

Viewing changes to helpers/lh_binary_linux-image

  • Committer: Daniel Baumann
  • Date: 2011-03-09 17:19:41 UTC
  • Revision ID: daniel@debian.org-20110309171941-vyn0zxupujidmbu9
Adding live-helper 1.0~a15-1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
helpers/lh_binary_linux-image
60
60
                ;;
61
61
 
62
62
        tar|usb-hdd)
 
63
                DESTDIR="binary/live"
 
64
 
63
65
                # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
64
 
                if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
 
66
                if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
65
67
                then
66
 
                        if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
67
 
                        then
68
 
                                DESTDIR="binary"
69
 
                        else
70
 
                                DESTDIR="binary/live"
71
 
                        fi
72
 
                else
73
 
                        DESTDIR="binary/live"
 
68
                        DESTDIR="binary"
74
69
                fi
75
70
                ;;
76
71
esac
84
79
                case "${LIVE_ARCHITECTURE}" in
85
80
                        amd64)
86
81
                                DESTDIR="${DESTDIR}.amd"
 
82
                                LINUX="vmlinuz"
87
83
                                ;;
88
84
 
89
85
                        i386)
90
86
                                DESTDIR="${DESTDIR}.386"
 
87
                                LINUX="vmlinuz"
91
88
                                ;;
92
89
 
93
90
                        powerpc)
94
91
                                DESTDIR="${DESTDIR}.ppc"
 
92
                                LINUX="vmlinux"
95
93
                                ;;
96
94
                esac
97
95
        fi
101
99
mkdir -p "${DESTDIR}"
102
100
 
103
101
# Installing linux-image
104
 
cp chroot/boot/vmlinuz* "${DESTDIR}"
 
102
cp chroot/boot/"${LINUX}"* "${DESTDIR}"
105
103
cp chroot/boot/initrd.img* "${DESTDIR}"
106
104
 
107
105
# Creating stage file