Commit 2af4919f authored by Sophie Brun's avatar Sophie Brun

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

parents b16a167b d7542a1c
include debian-installer/riscv64/menu.cfg
menu title Debian GNU/Linux installer menu
prompt 1
label install
menu label Install
menu default
linux debian-installer/riscv64/linux
initrd debian-installer/riscv64/initrd.gz
label expert
menu label Expert Install
linux debian-installer/riscv64/linux
initrd debian-installer/riscv64/initrd.gz
append priority=low
label rescue
menu label Rescue Mode
linux debian-installer/riscv64/linux
initrd debian-installer/riscv64/initrd.gz
append rescue/enable=true
......@@ -11,7 +11,7 @@
# Default kernel ABI version to use. Append a kernel flavour to
# produce KERNELVERSION.
LINUX_KERNEL_ABI ?= 4.19.0-kali5
LINUX_KERNEL_ABI ?= 5.2.0-kali2
# Always "di" these days
KERNEL_FLAVOUR ?= di
......
......@@ -12,4 +12,6 @@ DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
USE_UNRELEASED = 1
include config/hurd.cfg
MEDIA_TYPE = netboot image
TARGET = $(KERNEL) $(INITRD)
TARGET = $(KERNEL) $(INITRD) $(NETBOOT_TAR)
EXTRANAME = $(MEDIUM)/
MANIFEST-NETBOOT_TAR = "Tarball of the tftp/PXE boot directory"
MANIFEST-KERNEL = "linux kernel"
MANIFEST-INITRD = "netboot initrd"
.PHONY: arch_netboot_dir
arch_netboot_dir: $(KERNEL) $(INITRD)
-rm -f $(TEMP_NETBOOT_DIR)
mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
mkdir -p $(TEMP_NETBOOT_DIR)/pxelinux.cfg
cp $(INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
cp $(KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
cp boot/$(ARCH)/pxe/menu.cfg $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/
cp boot/$(ARCH)/pxe/default-riscv $(TEMP_NETBOOT_DIR)/pxelinux.cfg
debian-ports-archive-keyring-udeb
virtio-modules-${kernel:Version} ?
nic-modules-${kernel:Version}
scsi-modules-${kernel:Version}
......@@ -36,7 +36,7 @@ get_mirrors() {
[ -s $file ] || continue
grep '^deb[[:space:]]' $file | \
grep -v '^deb[[:space:]]\+cdrom:' | \
sed 's,^deb \[[^]]*\] ,deb ,' | \
sed 's,^deb[[:space:]]\+\[[^]]*\][[:space:]]\+,deb ,' | \
grep -v 'security.debian.org' | \
grep '[[:space:]]main' | \
awk '{print $1 " " $2}' | \
......
debian-installer (20190703) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* hurd-i386: Set USE_UNRELEASED to 1.
* gen-sources.list.udeb: Allow to have several spaces around [] qualifiers in
sources.list entries.
[ Karsten Merker ]
* riscv64: Include nic-modules and scsi-modules for virtio targets
such as the qemu riscv64 "virt" machine. In recent kernel versions
the virtio-modules udeb has been removed and the various virtio
modules have been included in other module udebs (virtio_blk is now
in scsi-modules and virtio_net is now in nic-modules).
* riscv64: Create a netboot tarball.
[ Cyril Brulebois ]
* Bump Linux kernel ABI from 4.19.0-5 to 5.2.0-2
-- Samuel Thibault <sthibault@debian.org> Wed, 07 Aug 2019 10:19:26 +0200
debian-installer (20190702+kali1) kali-dev; urgency=medium
* Sync with Debian.
......
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