Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
live-build
Commits
554a245f
Commit
554a245f
authored
Nov 10, 2015
by
Raphaël Hertzog
Browse files
Drop ixp4xx flavour on armel as it's gone from Debian/Kali.
parent
fff46cc5
Changes
6
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
554a245f
live
-
build
(
5.0
~
a11
-
1
kali3
)
kali
-
dev
;
urgency
=
medium
*
Drop
ixp4xx
flavour
on
armel
as
it
's gone from Debian/Kali.
-- Raphaël Hertzog <hertzog@debian.org> Tue, 10 Nov 2015 09:35:51 +0100
live-build (5.0~a11-1kali2) kali-dev; urgency=medium
* Add data/debian-cd/ symlinks for sana via debian/live-build.links.
...
...
debian/patches/Add-support-for-EFI-boot-with-syslinux-efi.patch
View file @
554a245f
...
...
@@ -11,6 +11,8 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
3 files changed, 322 insertions(+)
create mode 100644 scripts/build/binary_efi
diff --git a/scripts/build/binary b/scripts/build/binary
index fe90d8e..779dc7d 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -68,6 +68,9 @@
lb binary_loadlin ${@}
...
...
@@ -23,6 +25,9 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
lb binary_checksums ${@}
if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
diff --git a/scripts/build/binary_efi b/scripts/build/binary_efi
new file mode 100644
index 0000000..038a7de
--- /dev/null
+++ b/scripts/build/binary_efi
@@ -0,0 +1,282 @@
...
...
@@ -308,6 +313,8 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
+
+# Creating stage file
+Create_stagefile .build/binary_efi
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index e81a13a..d5b9c8e 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -71,6 +71,23 @@
fi
...
...
debian/patches/Better-handle-empty-package-lists.patch
View file @
554a245f
...
...
@@ -9,6 +9,8 @@ up empty (most notably due to #if evaluating to false).
scripts/build/binary_package-lists | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index d81bfe7..dcbadcc 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -145,6 +145,10 @@
then
...
...
debian/patches/Drop-ixp4xx-from-available-armel-flavors.patch
0 → 100644
View file @
554a245f
From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
Date: Tue, 10 Nov 2015 09:34:38 +0100
Subject: Drop ixp4xx from available armel flavors
It's gone from Debian unstable/testing and from Kali.
---
functions/defaults.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index eba52ae..9fcced9 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -413,7 +413,7 @@
Set_defaults ()
armel)
# armel will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-kirkwood orion5x versatile}"
;;
armhf)
debian/patches/Skip-comments-in-package-lists.patch
View file @
554a245f
...
...
@@ -16,6 +16,8 @@ Forwarded: directly committed upstream
functions/packagelists.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/functions/packagelists.sh b/functions/packagelists.sh
index 0ee13ce..8a8123e 100755
--- a/functions/packagelists.sh
+++ b/functions/packagelists.sh
@@ -111,6 +111,10 @@
Expand_packagelist ()
...
...
debian/patches/series
View file @
554a245f
Add-support-for-EFI-boot-with-syslinux-efi.patch
Skip-comments-in-package-lists.patch
Better-handle-empty-package-lists.patch
Drop-ixp4xx-from-available-armel-flavors.patch
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment