Commit 58b8e18b authored by Sophie Brun's avatar Sophie Brun

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

parents 6ccbb032 66e57218
set cd=$root
set default=3
set timeout=-1
insmod multiboot
insmod cpuid
insmod echo
insmod gzio
insmod minicmd
insmod normal
insmod chain
if loadfont $prefix/font.pf2 ; then
set gfxmode=640x480
set gfxpayload=keep
insmod efi_gop
insmod efi_uga
insmod video_bochs
insmod video_cirrus
insmod gfxterm
terminal_output gfxterm
fi
insmod png
if background_image /boot/grub/splash.png ; then
set color_normal=white/black
set color_highlight=black/white
else
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
fi
insmod play
play 960 440 1 0 4 440 1
menuentry "Debian GNU/Hurd installer boot menu" {
true
}
menuentry "" {
true
}
function boot_one {
echo "Loading ..."
set root=$cd
multiboot /boot/kernel/gnumach.gz $options
module --nounzip /boot/${gtk}initrd.gz initrd '$(ramdisk-create)'
module /boot/kernel/ext2fs.static ext2fs \
--multiboot-command-line='${kernel-command-line}' \
--host-priv-port='${host-port}' \
--device-master-port='${device-port}' \
--exec-server-task='${exec-task}' -T typed gunzip:device:rd0 \
'$(task-create)' '$(task-resume)'
module /boot/kernel/exec.static exec '$(exec-task=task-create)'
}
menuentry "Text install" {
set options="TERM=mach-gnu-color"
boot_one
}
menuentry "Pseudo-graphical install" {
set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=9"
boot_one
}
menuentry "Pseudo-graphical install with CJK support" {
set options="GTK_NOVESA=1 VGA_OPTIONS=--font-width=8"
boot_one
}
menuentry "Graphical install" {
set options=""
if test -e /boot/gtk ; then
set gtk="gtk/"
else
set gtk=""
fi
boot_one
}
menuentry "Automated install" {
set options="auto=true priority=critical TERM=mach-gnu-color"
boot_one
}
menuentry "Expert install" {
set options="priority=low TERM=mach-gnu-color"
boot_one
}
menuentry "Rescue mode" {
set options="rescue/enable=true"
boot_one
}
menuentry "" {
true
}
menuentry "Boot from first hard disk" {
set root=hd0
chainloader +1
}
......@@ -54,6 +54,10 @@ arch_miniiso: arm_grub_efi
cp -a $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_PLATFORM)/* \
$(TEMP_CD_TREE)/boot/grub/$(GRUB_PLATFORM)/; \
mkdir -p $(TEMP_CD_TREE)/EFI/debian; \
echo "search --file --set=root /.disk/info" >> $(TEMP_CD_TREE)/EFI/debian/grub.cfg; \
echo "set prefix=(\$$root)/boot/grub" >> $(TEMP_CD_TREE)/EFI/debian/grub.cfg; \
echo "source \$$prefix/$(GRUB_PLATFORM)/grub.cfg" >> $(TEMP_CD_TREE)/EFI/debian/grub.cfg; \
fi
if [ "$(GRUB_EFI)" = y ]; then \
......@@ -61,6 +65,8 @@ arch_miniiso: arm_grub_efi
-boot-load-size 4 -boot-info-table \
-eltorito-alt-boot \
--efi-boot boot/grub/efi.img -no-emul-boot \
-append_partition 2 0xef $(TEMP_CD_TREE)/boot/grub/efi.img \
-partition_cyl_align all \
-o $(TEMP_MINIISO) $(TEMP_CD_TREE); \
fi
......
......@@ -11,7 +11,7 @@
# Default kernel ABI version to use. Append a kernel flavour to
# produce KERNELVERSION.
LINUX_KERNEL_ABI ?= 5.3.0-kali2
LINUX_KERNEL_ABI ?= 5.3.0-kali3
# Always "di" these days
KERNEL_FLAVOUR ?= di
......@@ -49,8 +49,8 @@ DEBIAN_RELEASE = $(USE_UDEBS_FROM)
# The version (number and codename) of the Debian release targeted by the
# installation images. (Only the codename is used while the version number
# has not yet been determined.)
DEBIAN_VERSION = 2017.1 (kali-rolling)
DEBIAN_VERSION ?= buster
DEBIAN_VERSION = 2019.4 (kali-rolling)
DEBIAN_VERSION ?= bullseye
# Define here from what release (codename!) components (udebs) should be taken
# to build debian-installer. By default this is set to 'unstable' for building
......
......@@ -2,7 +2,7 @@ MEDIUM_SUPPORTED = cdrom netboot miniiso
BASEVERSION = $(LINUX_KERNEL_ABI)
KERNELMAJOR = 2.6
KERNELVERSION = $(BASEVERSION)-parisc $(BASEVERSION)-parisc64-smp
KERNELVERSION = $(BASEVERSION)-parisc $(BASEVERSION)-parisc64
KERNELNAME = $(foreach ver,${KERNELVERSION},vmlinuz-$(ver))
VERSIONED_SYSTEM_MAP = t
......@@ -16,7 +16,7 @@ arch_tree:
arch_netboot:
palo -f /dev/null -k $(TEMP)/vmlinuz*parisc \
-k $(TEMP)/vmlinuz*parisc64-smp \
-k $(TEMP)/vmlinuz*parisc64 \
-r $(TEMP_INITRD) -b /usr/share/palo/iplboot \
-c "0/linux initrd=0/ramdisk" \
-s $(TEMP_BOOT)
......
......@@ -12,7 +12,7 @@ arch_miniiso:
-rm -rf $(TEMP_CD_TREE)/*
install -m 644 -D $(BASE_TMP)miniiso/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*parisc $(TEMP_CD_TREE)/boot/vmlinux-parisc
install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*parisc64-smp $(TEMP_CD_TREE)/boot/vmlinux-parisc64-smp
install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*parisc64 $(TEMP_CD_TREE)/boot/vmlinux-parisc64
install -m 644 -D /usr/share/palo/iplboot $(TEMP_CD_TREE)/boot/iplboot
genisoimage -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
......
......@@ -14,4 +14,13 @@ KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
USE_UNRELEASED = 1
GRUB_PLATFORM=i386-pc
# Configuration for generating EFI images
GRUB_EFI=y
GRUB_EFI_PLATFORM=i386-efi
GRUB_EFI_NAME=ia32
# We don't have support for UEFI Secure Boot on this arch
EFI_SIGNED=n
include config/hurd.cfg
......@@ -31,7 +31,6 @@ GRUB_CFG_CDROM=boot/hurd/grub-hurd-cdrom.cfg
GRUB_CFG_PXE=boot/hurd/grub-hurd-pxe.cfg
# GRUB modules
GRUB_PLATFORM=i386-pc
GRUB_MODDIR=/usr/lib/grub/$(GRUB_PLATFORM)
GRUB_MODULES_PXE=pxe tftp multiboot cpuid echo play gfxterm gfxterm_background gzio minicmd normal png vbe
......@@ -47,6 +46,13 @@ ifneq ($(shell id -u),0)
ROOTCMD = fakeroot-tcp
endif
# Extract GRUB EFI files.
.PHONY: x86_grub_efi
x86_grub_efi:
ifeq ($(GRUB_EFI),y)
efi-image $(TEMP_GRUB_EFI) $(GRUB_EFI_PLATFORM) $(GRUB_EFI_NAME) $(NETBOOT_PATH) $(EFI_SIGNED)
endif
# Unsupported targets
arch_tree:
arch_boot:
......@@ -55,8 +61,9 @@ arch_boot_screens:
# genisoimage CD info directory, including grub and configuration files
# Note that the configuration is extensively manipulated by debian-cd to
# support all the available CD/DVD variants.
# Supply GRUB EFI configuration.
.PHONY: arch_cd_info_dir
arch_cd_info_dir:
arch_cd_info_dir: x86_grub_efi
x86-image $(TEMP_CD_INFO_DIR) $(GRUB_PLATFORM)
sed -e "s/@[email protected]/$(ARCH)/g" $(GRUB_CFG_CDROM) \
......@@ -71,6 +78,17 @@ arch_cd_info_dir:
cp $(SPLASH_PNG) $(TEMP_CD_INFO_DIR)/boot/grub/splash.png; \
fi
if [ "$(GRUB_EFI)" = y ]; then \
set -e; \
mkdir -p $(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM); \
cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_INFO_DIR)/grub/; \
cp boot/hurd/grub-hurd-efi.cfg \
$(TEMP_CD_INFO_DIR)/grub/grub.cfg; \
cp -a $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/grub/font.pf2; \
cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_EFI_PLATFORM)/* \
$(TEMP_CD_INFO_DIR)/grub/$(GRUB_EFI_PLATFORM)/; \
fi
# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
.PHONY: arch_miniiso
arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
......
# Installer translation status generated by the script:
# scripts/l10n/calc-release-status
# This file should be updated before every official release.
# Generated on: Mon, 01 Jul 2019 16:25:15 +0000
# Generated on: Fri, 29 Nov 2019 08:49:17 +0100
#
# FAKE UPDATE, see https://lists.debian.org/debian-boot/2019/11/msg00188.html
#
am: 2 M
ar: 2 M
......
debian-installer (20191130) UNRELEASED; urgency=medium
[ John Paul Adrian Glaubitz ]
* hppa: Strip -smp suffix from 64-bit kernel version string.
[ Steve McIntyre ]
* Tweak mini.iso generation on arm so EFI netboot will work.
-- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Fri, 29 Nov 2019 14:00:08 +0100
debian-installer (20191111+kali1) kali-dev; urgency=medium
[ Osamu Aoki ]
* partman-doc: Convert to DocBook XML 4.5 (Closes: #907970)
......@@ -36,6 +47,7 @@ debian-installer (20190820+kali1) kali-dev; urgency=medium
* 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)
* Add hurd-i386 EFI support.
[ Karsten Merker ]
* riscv64: Include nic-modules and scsi-modules for virtio targets
......@@ -46,7 +58,9 @@ 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.3.0-1
* Bump Linux kernel ABI from 4.19.0-5 to 5.3.0-2
* Target bullseye.
* Not updating translation-status on purpose.
[ Martin Michlmayr ]
* Remove images for QNAP TS-11x/TS-21x/HS-21x, QNAP TS-41x/TS-42x
......
......@@ -57,7 +57,7 @@ Build-Depends:
genromfs [sparc sparc64],
# Used for creating sparc floppies (which are not built by
# default.)
dosfstools [i386 ia64 m68k amd64 armhf arm64],
dosfstools [hurd-i386 i386 ia64 m68k amd64 armhf arm64],
# For creating FAT filesystems with mkfs.msdos.
# Of course i386/amd64 use this for floppies, CDs etc.
# m68k uses it for atari floppies
......@@ -109,7 +109,7 @@ Build-Depends:
# Signed bootloader components for UEFI Secure Boot
grub-efi-amd64-bin [amd64],
grub-efi-arm64-bin [arm64],
grub-efi-ia32-bin [i386],
grub-efi-ia32-bin [hurd-i386 i386],
grub-efi-ia64-bin [ia64],
grub-efi-arm-bin [armhf],
grub-common [amd64 arm64 i386], xorriso,
......
......@@ -22,7 +22,7 @@ USE_UDEBS_FROM=unstable
TRANSSTATUS=
BOOTMENU_BEEP=n
else
USE_UDEBS_FROM=buster
USE_UDEBS_FROM=bullseye
USE_PROPOSED_UPDATES=0
TRANSSTATUS=translation-status
BOOTMENU_BEEP=y
......
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