Commit b89deecd authored by Sophie Brun's avatar Sophie Brun

Merge remote-tracking branch 'salsa/master' into kali/master

parents 930c6642 f7854e4f
......@@ -19,6 +19,7 @@ A10-OLinuXino-Lime /usr/lib/u-boot/A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin
A20-Olimex-SOM-EVB /usr/lib/u-boot/A20-Olimex-SOM-EVB/u-boot-sunxi-with-spl.bin 16
A20-OLinuXino-Lime /usr/lib/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin 16
A20-OLinuXino-Lime2 /usr/lib/u-boot/A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin 16
A20-OLinuXino-Lime2-eMMC /usr/lib/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot-sunxi-with-spl.bin 16
A20-OLinuXino-MICRO /usr/lib/u-boot/A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin 16
BananaPi /usr/lib/u-boot/Bananapi/u-boot-sunxi-with-spl.bin 16
BananaPiM2Berry /usr/lib/u-boot/bananapi_m2_berry/u-boot-sunxi-with-spl.bin 16
......
......@@ -11,7 +11,7 @@
# Default kernel ABI version to use. Append a kernel flavour to
# produce KERNELVERSION.
LINUX_KERNEL_ABI ?= 5.2.0-kali3
LINUX_KERNEL_ABI ?= 5.3.0-kali1
# Always "di" these days
KERNEL_FLAVOUR ?= di
......
......@@ -31,7 +31,7 @@ debian-installer (20190820+kali1) kali-dev; urgency=medium
* riscv64: Create a netboot tarball.
[ Cyril Brulebois ]
* Bump Linux kernel ABI from 4.19.0-5 to 5.2.0-3
* Bump Linux kernel ABI from 4.19.0-5 to 5.3.0-1
[ Martin Michlmayr ]
* Remove images for QNAP TS-11x/TS-21x/HS-21x, QNAP TS-41x/TS-42x
......@@ -43,7 +43,13 @@ debian-installer (20190820+kali1) kali-dev; urgency=medium
[ Sophie Brun ]
* Sync with Debian: Build for Linux kernel 5.2.0-kali2
[ Andreas B. Mundt ]
* ARM: sunxi: Add support for Olimex A20-OLinuXino-Lime2-eMMC.
[ Holger Wansing ]
* Remove trailing whitespaces from changelog, control and rules file, to
fix lintian tag.
-- Sophie Brun <sophie@offensive-security.com> Tue, 20 Aug 2019 09:44:47 +0200
......@@ -2282,7 +2288,7 @@ debian-installer (20120327) unstable; urgency=low
[ Christian Perrier ]
* Add needed characters for Uyghur
* Add needed characters for Ossetian
* Add needed characters for Ossetian
* Add needed characters for Sindhi
* No longer Build-Depend on palo (no longer used and
will allow removing palo from unstable)
......@@ -2511,7 +2517,7 @@ debian-installer (20101020) unstable; urgency=low
[ Joey Hess ]
* Run isohybrid on i386 and amd64 miniiso, which allows it to be written
directly to and booted from a USB stick.
directly to and booted from a USB stick.
[ Samuel Thibault ]
* Explicitly set timeout to -1 in grub configurations, to make it easy to
......@@ -2554,10 +2560,10 @@ debian-installer (20100911) unstable; urgency=low
[ Aurelien Jarno ]
* Build-depends on debian-ports-archive-keyring on architectures
hosted on debian-ports.org (sh4, sparc64).
* Build-depends on module-init-tools on sh4 and sparc64 as on other
* Build-depends on module-init-tools on sh4 and sparc64 as on other
Linux architectures.
* Switch kfreebsd-amd64 and kfreebsd-i386 to 8.1 kernel.
* Don't try to build unifont.bdf on GNU/kFreeBSD as the console already
* Don't try to build unifont.bdf on GNU/kFreeBSD as the console already
has basic font support for level 1 and bogl-bterm is not available.
* Build-depends on xorriso on kfreebsd-amd64, kfreebsd-i386 and hurd-i386.
* Add support to generate cdrom images on GNU/kFreeBSD.
......@@ -2589,7 +2595,7 @@ debian-installer (20100911) unstable; urgency=low
Closes: #593208
[ Joey Hess ]
* Use Dir::Etc::trusted rather than Apt::GPGV::TrustedKeyring,
* Use Dir::Etc::trusted rather than Apt::GPGV::TrustedKeyring,
to work with apt 0.8.0.
-- Otavio Salvador <otavio@debian.org> Sat, 11 Sep 2010 11:15:37 -0300
......@@ -2728,7 +2734,7 @@ debian-installer (20100122) unstable; urgency=low
* Drop no longer needed versioned build dependency on dpkg.
[ Aurelien Jarno ]
* Build GNU/kFreeBSD images using grub-mkrescue instead of grub-image,
* Build GNU/kFreeBSD images using grub-mkrescue instead of grub-image,
using patch from Robert Millan.
[ Samuel Thibault ]
......@@ -3038,7 +3044,7 @@ debian-installer (20081027) unstable; urgency=low
[ Bastian Blank ]
* Move s390 to 2.6.26-1.
[ Stephen R. Marenka ]
* Move m68k to 2.6.26-1.
* Add modules to cdrom.
......@@ -5085,9 +5091,9 @@ debian-installer (20040424) unstable; urgency=low
debian-installer (20040422) unstable; urgency=low
* Bdale Garbee
- add a new MISC target to the build Makefile, which makes it easy to
deliver a set of additional files to the target directory. use it to
deliver the bootloader and config file (elilo.efi and elilo.conf) for
- add a new MISC target to the build Makefile, which makes it easy to
deliver a set of additional files to the target directory. use it to
deliver the bootloader and config file (elilo.efi and elilo.conf) for
ia64 netboot.
- add ia64 netboot instructions to the manual
* Martin Michlmayr
......@@ -5240,7 +5246,7 @@ debian-installer (20040403) unstable; urgency=low
- Enable autobuilding on arm.
* Joey Hess
- Fix alpha netboot to use discover1-udeb, to avoid build failure.
-- Joey Hess <[email protected]> Wed, 31 Mar 2004 16:43:13 -0500
debian-installer (20040402) unstable; urgency=low
......@@ -5343,7 +5349,7 @@ debian-installer (20040325) unstable; urgency=low
* Joey Hess
- Try to add manifest info for hppa.
* Vincent Sanders
- Add support for pkg-lists to have kernel module packages on selected
- Add support for pkg-lists to have kernel module packages on selected
targets.
- change ARM netboot target to use this functionality
- add several more ARM configurations
......@@ -5458,7 +5464,7 @@ debian-installer (20040313) unstable; urgency=low
- sparc: rearrange some of the kernel handling.
* Bastian Blank
- Add cdebconf-text-udeb on s390.
- Move hw-detect and bogl-bterm-udeb from common to i386, m68k, mips for
- Move hw-detect and bogl-bterm-udeb from common to i386, m68k, mips for
demo.
* Several updated translations in udebs.
......@@ -5563,7 +5569,7 @@ debian-installer (20040301) unstable; urgency=low
- Removed the xfs flavoured cdrom, since 2.4.25 will have xfs standard.
- Add m68k as an arch in the control file.
* Joshua Kwan
- Fixed broken sparc32_netboot build. Same fix as the one for
- Fixed broken sparc32_netboot build. Same fix as the one for
sparc64_netboot.
-- Joey Hess <[email protected]> Sat, 28 Feb 2004 14:56:38 -0500
......@@ -5673,7 +5679,7 @@ debian-installer (20040209) unstable; urgency=low
- Make all the syslinux help screens leave graphics mode when displayed.
- Hack syslinux.txt so it all fits on one line, the same line as the boot:
prompt.
- Add ${BOOTPROMPT} expansion to bootscreen-subst, to make it easy
- Add ${BOOTPROMPT} expansion to bootscreen-subst, to make it easy
to make the last line in a syslinux screen not have a newline at EOF
on the image, while still being easily editable.
- Switch cdroms from load-installer to load-cdrom. This is to work around
......@@ -5771,7 +5777,7 @@ debian-installer (20031223) unstable; urgency=low
via -F and delete it when done. This is to support building on systems
running 2.6.
- Remove ide modules stuff from net drivers floppy. I don't know why it
was there, but its deps were not met and this could cause ugly messages
was there, but its deps were not met and this could cause ugly messages
during install.
- Remove the same ide modules from i386 netboot.
- Document the bootkbd boot parameter in syslinux f7.txt.
......
......@@ -42,7 +42,7 @@ Build-Depends:
# On x86 we need to include /lib/libgcc_s.so.1 in g-i initrds to
# work around #373253 until upstream can remove pthread_cancel()
# calls in directfb. For now, this is done by setting EXTRAFILES.
#
#
# Filesystem tools:
genext2fs (>= 1.3-7.1),
# For creating ext2 filesystems without being root.
......@@ -75,7 +75,7 @@ Build-Depends:
# For building firmware images for the D-Link DNS-32(0|3).
u-boot-tools [armel armhf arm64],
# For creating u-boot images
#
#
# Boot loaders:
# On many arches boot loaders are copied onto or ran on the boot
# images in one way or another. There's a reason our mailing list is
......@@ -130,7 +130,7 @@ Build-Depends:
# u-boot-sunxi to produce bootable arm64 images.
u-boot (>= 2016.01+dfsg1-1~) [armel],
# U-boot binaries for armel systems
#
#
# Architecture specific build dependencies:
tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
# For todos, used on files that need to be accessible from
......@@ -140,10 +140,10 @@ Build-Depends:
# mounting them. Note that patches from #900409 and #900410
# are required for a reproducible build (available since
# 4.0.18-2.1).
#
#
kmod [linux-any],
# depmod.
#
#
bf-utf-source [!s390 !s390x],
# Contains the unicode font we use. Not a udeb since we
# perform font reduction at build time.
......
......@@ -95,7 +95,7 @@ install: build
cp -a build/dest/* $(IMAGEDIR)
ln -s $(DATE) $(ARCHIVEDIR)/current
binary-arch: install
binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs
......@@ -114,5 +114,5 @@ binary-arch: install
binary-indep:
binary: binary-indep binary-arch
.PHONY: build build-images clean binary-indep binary-arch binary install
binary: binary-indep binary-arch
.PHONY: build build-images clean binary-indep binary-arch binary install
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment