...
 
Commits (8)
......@@ -12,7 +12,7 @@ Set keyboard map 0fbootkbd=es07
Select the desktop 0fdesktop=kde07
Accessibility options (last 2 options not available for all images):
Use high contrast theme 0ftheme=dark07
Use dark contrast theme 0ftheme=dark07
Use Braille tty 0fbrltty=driver,device,texttable07
Use Speakup 0fspeakup.synth=driver07
......
......@@ -18,8 +18,8 @@ menu begin advanced
include ${SYSDIR}adspk.cfg
menu end
menu begin dark
menu label Accessible high ^contrast installer menu
menu title Accessible high contrast option
menu label Accessible ^dark contrast installer menu
menu title Accessible dark contrast option
include ${SYSDIR}drkmenu.cfg
label mainmenu
menu label ^Back..
......
......@@ -19,7 +19,7 @@ menu begin advanced
include ${SYSDIR}x86adspk.cfg
menu end
menu begin dark
menu label Accessible high ^contrast option
menu label Accessible ^dark contrast option
include ${SYSDIR}x86drkm.cfg
menu end
label help
......
menu title Accessible high contrast i386 installer menu
menu title Accessible dark contrast i386 installer menu
include ${SYSDIR}drkmenu.cfg
label mainmenu
menu label ^Back..
......
MEDIA_TYPE = netboot image (SSH)
TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-320 ts21x ts41x lacie lschlv2 lsqvl lsvl lswsxl lswvl lswxl lsxhl
TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-320 lacie lschlv2 lsqvl lsvl lswsxl lswvl lswxl lsxhl
EXTRANAME = $(MEDIUM)/
TYPE = netboot/network-console
......@@ -19,39 +19,6 @@ dns-320:
mkdns323fw -k $(TEMP)/dns-320/kernel.uboot -i $(TEMP)/dns-320/initrd.uboot -t DNS-320 -o $(SOME_DEST)/$(EXTRANAME)d-link/dns-320/netboot.img
update-manifest $(SOME_DEST)/$(EXTRANAME)d-link/dns-320/netboot.img "installer image (dlink firmware) for D-Link DNS-320"
# QNAP TS-11x/TS-21x/HS-21x
ts21x: $(TEMP_INITRD_XZ)
mkdir -p $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x
echo "TS-11x/TS-21x" > $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/model
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ts219-6281.dtb > $(TEMP)/vmlinuz-ts219-6281
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ts219-6281 $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/kernel-6281
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/kernel-6281 "Linux kernel for QNAP TS-11x/TS-21x/HS-21x (MV88F6281 CPU)"
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ts219-6282.dtb > $(TEMP)/vmlinuz-ts219-6282
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ts219-6282 $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/kernel-6282
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/kernel-6282 "Linux kernel for QNAP TS-11x/TS-21x/HS-21x (MV88F6282 CPU)"
cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/initrd
util/pad $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/initrd 9437184
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/initrd "initrd for QNAP TS-11x/TS-21x/HS-21x"
install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/flash-debian
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-21x/flash-debian "Script to flash debian-installer"
ln -s ts-21x $(SOME_DEST)/$(EXTRANAME)qnap/ts-11x
# QNAP TS-41x/TS-42x
ts41x: $(TEMP_INITRD_XZ)
mkdir -p $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x
echo "TS-41x" > $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/model
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ts419-6281.dtb > $(TEMP)/vmlinuz-ts419-6281
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ts419-6281 $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/kernel-6281
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/kernel-6281 "Linux kernel for QNAP TS-41x/TS-42x (MV88F6281 CPU)"
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ts419-6282.dtb > $(TEMP)/vmlinuz-ts419-6282
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ts419-6282 $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/kernel-6282
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/kernel-6282 "Linux kernel for QNAP TS-41x/TS-42x (MV88F6282 CPU)"
cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/initrd
util/pad $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/initrd 9437184
install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/flash-debian
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/initrd "initrd for QNAP TS-41x/TS-42x"
update-manifest $(SOME_DEST)/$(EXTRANAME)qnap/ts-41x/flash-debian "Script to flash debian-installer"
# LaCie NAS series: Network Space v2 (and parents), d2 Network v2 and *Big Network v2
lacie:
mkdir -p $(SOME_DEST)/$(EXTRANAME)lacie
......
......@@ -63,16 +63,3 @@ lsgl: lschl
update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/config-debian "Script to run debian-installer"
update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/uImage.buffalo "Linux kernel for Linkstation Pro/Live (LS-GL)"
update-manifest $(SOME_DEST)/$(EXTRANAME)buffalo/lspro_ls-gl/initrd.buffalo "initrd for Linkstation Pro/Live (LS-GL)"
# HP Media Vault mv2120
#mv2120:
# mkdir -p $(SOME_DEST)/$(EXTRANAME)hp/mv2120
# mkdir -p $(TEMP)/mv2120
# Set machine id 1693 (0x069d)
# devio > $(TEMP)/mv2120/kernel 'wl 0xe3a01c06,4' 'wl 0xe381109d,4'
# cat $(TEMP_KERNEL) >> $(TEMP)/mv2120/kernel
# mkimage -A arm -O linux -T kernel -C none -e 0x01600000 -a 0x01600000 -n "Debian kernel" -d $(TEMP)/mv2120/kernel $(TEMP)/mv2120/kernel.uboot
# util/pad $(TEMP)/mv2120/kernel.uboot 2097152 # 2 MB
# mkimage -A arm -O linux -T ramdisk -C none -n "Debian installer" -d $(TEMP_INITRD) $(TEMP)/mv2120/initrd.uboot
# cat $(TEMP)/mv2120/kernel.uboot $(TEMP)/mv2120/initrd.uboot > $(SOME_DEST)/$(EXTRANAME)hp/mv2120/netboot.img
# update-manifest $(SOME_DEST)/$(EXTRANAME)hp/mv2120/netboot.img "installer image for HP Media Vault mv2120/mv51x0"
......@@ -11,7 +11,7 @@
# Default kernel ABI version to use. Append a kernel flavour to
# produce KERNELVERSION.
LINUX_KERNEL_ABI ?= 5.2.0-kali2
LINUX_KERNEL_ABI ?= 5.2.0-kali3
# Always "di" these days
KERNEL_FLAVOUR ?= di
......
......@@ -119,6 +119,7 @@ sub start_submenu ($;%)
print_indented("set menu_color_highlight=white/blue\n");
}
print_set_theme($theme);
print_indented("set gfxpayload=keep\n");
}
sub end_submenu ()
{
......
debian-installer (20191003+kali1) kali-dev; urgency=medium
* Sync with Debian: Build for Linux kernel 5.2.0-kali3
-- Sophie Brun <sophie@offensive-security.com> Thu, 03 Oct 2019 13:10:02 +0200
debian-installer (20190820+kali2) kali-dev; urgency=medium
* armel/HP mv2120: disable the build. It fails with kernel 5.2.0-2
-- Sophie Brun <sophie@offensive-security.com> Tue, 20 Aug 2019 11:36:12 +0200
-- Sophie Brun <sophie@offensive-security.com> Thu, 03 Oct 2019 13:09:41 +0200
debian-installer (20190820+kali1) kali-dev; urgency=medium
......@@ -10,6 +16,11 @@ debian-installer (20190820+kali1) kali-dev; urgency=medium
* hurd-i386: Set USE_UNRELEASED to 1.
* gen-sources.list.udeb: Allow to have several spaces around [] qualifiers in
sources.list entries.
* build/boot/x86: Restore 'd' shortcut for the dark theme. 'c' can obviously
not work in grub (Closes: #935545).
* build/util/grub-gencfg: Set gfxpayload=keep in submenus too, to fix
unreadable fonts on hidpi displays in netboot images booted with EFI.
(See: #935546)
[ Karsten Merker ]
* riscv64: Include nic-modules and scsi-modules for virtio targets
......@@ -20,7 +31,15 @@ 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-2
* Bump Linux kernel ABI from 4.19.0-5 to 5.2.0-3
[ Martin Michlmayr ]
* Remove images for QNAP TS-11x/TS-21x/HS-21x, QNAP TS-41x/TS-42x
and HP Media Vault mv2120 due to size problems with the Linux
kernel.
[ John Paul Adrian Glaubitz ]
* Always force USE_PROPOSED_UPDATES=0 for Debian Ports architectures.
[ Sophie Brun ]
* Sync with Debian: Build for Linux kernel 5.2.0-kali2
......
......@@ -41,6 +41,7 @@ RELEASE_ARCHES=amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
ifeq (,$(filter $(ARCH), $(RELEASE_ARCHES)))
USE_UNRELEASED=1
USE_UDEBS_FROM=unstable
USE_PROPOSED_UPDATES=0
endif
ARCHIVEDIR=debian/tmp/installer-$(ARCH)
......