Codebase list live-build / 22397a2
Update patches and links for new version Sophie Brun 9 years ago
8 changed file(s) with 20 addition(s) and 81 deletion(s). Raw diff Collapse all Expand all
+1
-0
.gitignore less more
0 .pc/
+9
-0
debian/changelog less more
0 live-build (4.0.3-1kali1) kali-dev; urgency=medium
1
2 * Import new debian version
3 * Drop patches add-xfsprogs-jfsutils-to-d-i and
4 fix-kernel-metapackages-used-in-di-step as it's already in debian version.
5 * Add a link to kali-rolling
6
7 -- Sophie Brun <[email protected]> Thu, 27 Nov 2014 16:00:47 +0100
8
09 live-build (4.0.3-1) unstable; urgency=low
110
211 [ Richard Nelson ]
+3
-2
debian/live-build.links less more
0 usr/share/live/build/data/debian-cd/wheezy usr/share/live/build/data/debian-cd/kali
1 usr/share/live/build/data/debian-cd/wheezy usr/share/live/build/data/debian-cd/kali-dev
0 usr/share/live/build/data/debian-cd/jessie usr/share/live/build/data/debian-cd/kali
1 usr/share/live/build/data/debian-cd/jessie usr/share/live/build/data/debian-cd/kali-dev
2 usr/share/live/build/data/debian-cd/jessie usr/share/live/build/data/debian-cd/kali-rolling
+6
-6
debian/patches/add-efi-support.patch less more
88
99 --- a/scripts/build/binary
1010 +++ b/scripts/build/binary
11 @@ -72,6 +72,9 @@ lb binary_loadlin ${@}
11 @@ -69,6 +69,9 @@ lb binary_loadlin ${@}
1212 lb binary_win32-loader ${@}
1313 lb binary_includes ${@}
1414 lb binary_hooks ${@}
2020 if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
2121 --- a/scripts/build/binary_iso
2222 +++ b/scripts/build/binary_iso
23 @@ -88,6 +88,23 @@ fi
23 @@ -82,6 +82,23 @@ fi
2424 # Handle xorriso generic options
25 XORRISO_OPTIONS="-r -J -joliet-long -l -cache-inodes"
25 XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
2626
2727 +case "${LB_BUILD_WITH_CHROOT}" in
2828 + true)
4242 +esac
4343 +
4444 # Handle xorriso live-build specific options
45 case "${LB_PARENT_DISTRIBUTION}" in
46 squeeze)
47 @@ -180,6 +197,26 @@ case "${LB_BOOTLOADER}" in
45 if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
46 then
47 @@ -155,6 +172,26 @@ case "${LB_BOOTLOADER}" in
4848 ;;
4949 esac
5050
+0
-25
debian/patches/add-xfsprogs-jfsutils-to-d-i.patch less more
0 Description: Ensure xfsprogs and jfsutils are available in the ISO
1 Otherwise users opting for XFS and JFS and installing without network
2 won't have them and the (first) boot can be interrupted due to this.
3 Author: Raphaël Hertzog <[email protected]>
4 Bug-Kali: http://bugs.kali.org/view.php?id=467
5
6 ---
7 debian/changelog | 8 ++++++++
8 scripts/build/binary_debian-installer | 2 +-
9 2 files changed, 9 insertions(+), 1 deletion(-)
10
11 --- a/scripts/build/binary_debian-installer
12 +++ b/scripts/build/binary_debian-installer
13 @@ -413,7 +413,7 @@ then
14 ;;
15 esac
16
17 - DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2"
18 + DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2 xfsprogs jfsutils"
19
20 case "${LB_MODE}" in
21 debian)
22 --
23 1.8.4.rc3
24
+1
-1
debian/patches/fix-default-armhf-kernel-flavours.patch less more
77
88 --- a/functions/defaults.sh
99 +++ b/functions/defaults.sh
10 @@ -674,15 +674,15 @@ Set_defaults ()
10 @@ -525,15 +525,15 @@ Set_defaults ()
1111 *)
1212 # armel will have special images: one rootfs image and many additional kernel images.
1313 # therefore we default to all available armel flavours
+0
-45
debian/patches/fix-kernel-metapackages-used-in-di-step.patch less more
0 Description: Fix kernel meta-packages required for d-i
1 The linux-image-2.6-* meta-packages were transitional and are gone
2 in the latest version used by Kali.
3 .
4 Instead use the linux-image-* meta-packages.
5 Author: Raphaël Hertzog <[email protected]>
6
7 --- a/scripts/build/binary_debian-installer
8 +++ b/scripts/build/binary_debian-installer
9 @@ -353,7 +353,7 @@ then
10 ;;
11
12 *)
13 - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-amd64"
14 + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64"
15 ;;
16 esac
17 ;;
18 @@ -381,7 +381,7 @@ then
19 ;;
20
21 *)
22 - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
23 + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-486 linux-image-686-pae"
24 ;;
25 esac
26 ;;
27 @@ -394,7 +394,7 @@ then
28 ;;
29
30 *)
31 - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp"
32 + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-sparc64 linux-image-sparc64-smp"
33 ;;
34 esac
35 ;;
36 @@ -407,7 +407,7 @@ then
37 ;;
38
39 *)
40 - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp"
41 + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
42 ;;
43 esac
44 ;;
+0
-2
debian/patches/series less more
0 add-xfsprogs-jfsutils-to-d-i.patch
1 fix-kernel-metapackages-used-in-di-step.patch
20 fix-default-armhf-kernel-flavours.patch
31 add-efi-support.patch