Bug#704571: live-build: improved patch with bugfixes
Package: live-build
Version: 3.0.1-1
Followup-For: Bug #704571
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
The previous patch is not perfectly correct, it works good but the
generated list in the syslinux menu is not in the correct order, the
updated patch solves this (verified)
- -- Package-specific info:
- -- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages live-build depends on:
ii debootstrap 1.0.48
Versions of packages live-build recommends:
ii cpio 2.11+dfsg-0.1
ii gnu-fdisk 1.2.4-3.1
ii live-boot-doc 3.0.1-1
ii live-config-doc 3.0.21-1
ii live-manual-html [live-manual] 1:3.0.1-1
Versions of packages live-build suggests:
ii debian-keyring 2012.11.15
ii dosfstools 3.0.13-1
ii fakeroot 1.18.4-2
ii git 1:1.7.10.4-1+wheezy1
ii gpgv 1.4.12-7
pn loadlin <none>
ii memtest86+ 4.20-1.1
ii mtools 4.0.17-1
ii parted 2.3-12
ii squashfs-tools 1:4.2-5
ii sudo 1.8.5p2-1+nmu1
ii syslinux 2:4.05+dfsg-6+deb7u1
ii uuid-runtime 2.20.1-5.3
pn win32-loader <none>
ii xorriso 1.2.2-2
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJRYzUPAAoJEKLHmb/f+NfC0LQP/2JeZyg9INOU5QniH2s7OZQj
vwD+qRcSHjNUxy4bkpoC0i1mDI8SLZEhuSM4rY9cBeXdWJs98pSeW/VqpF1PUUTF
pb9ubM2KsWLtZ+49p2Df9miEAHYSLAbyEOPuye1Q/RuEZDP7K4Cg6PdPJhF/xIis
wtdkLaYPA0mgGkPBvvPsmmGqzExtbVvG1DmJqcV0yqomjTX1IBs3VcAj4gQVZTUY
4GIrcYIBCYX1qnFCDhLtfVuack4EGphdIoTOp/L++5nHMZPteYcVGwfLAN5TdYyr
M5SLccsR0FKaYkB76VYU6sZ2++OY8KM/1+He3I9cAhHwnrgyx916dq9JPqj7m+uF
sjhl1o2I9gO14K6ZtnY7LSFhfHhnUQrCQMLQK9AWB1KDOqF9fkCXPVq5f6p8EEWJ
nbhau9H+5WQ7LK4/dOCQR1b5WrExdSG8UD6yxc3MP+nMG7dKHyYKiSnwwaydf0pZ
14bUHySb1DoQYZ1HBK040WAe6L6/zO01js5LKENSe32JXFR6QCppK/7E3KeIThpU
D8IrevBLd8KQiJdvb2D4SYtpQ3zZg9eK3Pm0wbGZE7iXDqqiViykrnzM+45XU4wu
5vuK6b2x6PVUta24/sC3clwyTeJUHh9DxXY6s8Bd9TUUx+MDqfVFas0KelbcivgC
pKRAqsC3Jc2DzgLoxfeW
=hKLX
-----END PGP SIGNATURE-----
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -183,15 +183,29 @@ then
;;
*)
- _NUMBER="0"
+ # this "for" uses a sorting by lenght and adds an indexed order
+ # example:
+ # - if we have: "686-pae 486 3.8-trunk-686-pae", we got this list:
+ # 3.8-trunk-686-pae:3
+ # 686-pae:1
+ # 486:2
+
+ for _FLAVOUR_INDEXED in $( echo "$LB_LINUX_FLAVOURS" | tr ' ' '\n' | awk '{ printf "%d:%s:%d\n", length($0), $0, NR;}' | sort -rn | sed 's/^[0-9]*://' )
+ do
+ _FLAVOUR="$(echo "${_FLAVOUR_INDEXED}" | sed 's|:.*$||g' )"
+ _INDEX="$(echo "${_FLAVOUR_INDEXED}" | sed 's|^.*:||g' )"
+
+ mv binary/live/vmlinuz-*${_FLAVOUR} binary/live/vmlinuz${_INDEX}
+ mv binary/live/initrd.img-*${_FLAVOUR} binary/live/initrd${_INDEX}.img
+ done
+
+
+ _NUMBER="0"
for _FLAVOUR in ${LB_LINUX_FLAVOURS}
do
_NUMBER="$((${_NUMBER} + 1))"
- mv binary/live/vmlinuz-*-${_FLAVOUR} binary/live/vmlinuz${_NUMBER}
- mv binary/live/initrd.img-*-${_FLAVOUR} binary/live/initrd${_NUMBER}.img
-
if [ "${_NUMBER}" -gt 1 ]
then
echo "" >> "${_TARGET}/live.cfg"
Reply to: