Commit dcd1cc41 authored by Lorenzo Faletra's avatar Lorenzo Faletra

Import Debian version 20190410+parrot1

debian-installer (20190410+parrot1) testing; urgency=medium

  * Import new Debian release.
  * Import Parrot configs.

debian-installer (20190410) unstable; urgency=medium

  [ Cyril Brulebois ]
  * Bump debhelper build-dep and compat from 7 to 11. Finally!
  * Fix “build-depends-on-1-revision build-depends u-boot-rockchip”,
    thanks to lintian.
  * Set dpkg source format explicitly as both dpkg-source and lintian
    are being excessively noisy.
  * Drop source.lintian-overrides: the only override was about the
    e2fsprogs build-dependency when it was still “Essential: yes”; as
    anticipated it's now only “Priority: required”.
  * Bump Standards-Version from 3.9.5 to 4.3.0; no changes required, with
    the usual exception regarding network access.
  * Review and merge Chris Lamb's work making d-i build reproducibly
    (Closes: #900918), with many thanks! Remaining issues seem related to
    fontconfig's cache and xorriso calls.
  * gen-tarball: specify the complete gzip command through a tar option
    instead of using the now-deprecated GZIP environment variable.
  * gen-tarball: use pigz if available, reducing build time.
  * Bump Linux kernel ABI from 4.19.0-1 to 4.19.0-4
  * Update translation-status for the release.

  [ Chris Lamb ]
  * Set BUILD_DATE based on SOURCE_DATE_EPOCH, rather than the other way
    around.
  * Ensure the GRUB memdisk images do not vary on filesystem ordering.
  * Ensure the GRUB memdisk images do not vary on filesystem timestamps.
  * Ensure that generated EFI images have a determinstic FAT volume ID.
  * When generating CPIO archives (initramfs, etc), ensure they are
    reproducible.
  * build/Makefile: Add a clamp_mtimes utility to avoid DRY violations.
  * 'clamp' the mtimes of various files before they are added to archives
    or media.
  * Specify --invariant to mkfs.fat(8) to ensure deterministic filesystem
    timestamps.
  * Increase the BUILD_DATE resolution to include the seconds component.
  * Clamp mtimes of the final build results in the destination directory.
  * Ensure that running the 'release' target does not alter the mtimes
    under dest/.
  * debian/control: Document that #900409 and #900410 are required for a
    reproducible build.
  * Ensure build is reproducible regardless of the user's
    umask(2). (Closes: #920631)
  * Ensure build is reproducible regardless of the underlying filesystem
    ordering. (Closes: #920676)

  [ John Paul Adrian Glaubitz ]
  * config: Set DEBIAN_RELEASE to unstable for all architectures
    in Debian Ports. (Closes: #920353)
  * pkg-lists: Add debian-ports-archive-keyring-udeb package for all
    architectures in Debian Ports for cdrom and netboot images.

  [ Holger Wansing ]
  * Add dark theme shortcut (Closes: #820911)

  [ Samuel Thibault ]
  * Rework dark theme shortcut.
  * Introduce dark menu theme.
  * Fix loading background image on netboot grub.

  [ Ben Hutchings ]
  * armel: Delete unused package list for ixp4xx (Closes: #921951)

  [ Vagrant Cascadian ]
  * [armhf] Add images for Novena.
  * Update versioned Build-Depends on u-boot-imx.
  * [armhf] Add images for BananaPiM2Berry. Thanks to Lucas Nussbaum.
  * Update versioned Build-Depends on u-boot-sunxi.

  [ Steve McIntyre ]
  * Switch to using buster artwork for the splash screen

debian-installer (20190118) unstable; urgency=medium

  [ Vagrant Cascadian ]
  * [arm64] Use arm-trusted-firmware instead of atf-allwinner to build
    pine64_plus and pinebook images.

  [ John Paul Adrian Glaubitz ]
  * alpha: Clean up formatting of build configuration file.
  * alpha: Remove fb-modules from cdrom and netboot package lists.
  * hppa: Clean up formatting of build configuration file.

  [ Cyril Brulebois ]
  * Bump Linux kernel ABI from 4.18.0-3 to 4.19.0-1
  * Update translation-status for the release.

  [ Vagrant Cascadian ]
  * [armhf] Re-enable Firefly-RK3288 image.
  * [armhf] Update Build-Depends for u-boot-rockchip.
  * Add u-boot-rockchip to Built-Using.
parent ce3e61d7
......@@ -139,7 +139,16 @@ define recurse
endef
define mkinitramfs
(cd $(TREE) && find . | sort | cpio --quiet -o -H newc) >
(cd $(TREE) && find . | sort | cpio --reproducible --quiet -o -H newc) >
endef
define clamp_mtimes
find $(1) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 | xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)"
endef
define normalise_permissions
find $(1) -type d -print0 | xargs -0r chmod $(DIR_MODE)
find $(1) -not -type d -and -not -type l -print0 | xargs -0r chmod $(FILE_MODE)
endef
# Limit on mfsroot size. It is determined by NKPT (in <machine/pmap.h).
......@@ -287,6 +296,8 @@ build_%:
_build:
@[ -n "$(SUBARCH) $(MEDIUM) $(FLAVOUR)" ] || { echo "invalid target"; false; }
@$(submake) tree_umount $(EXTRATARGETS) $(TARGET)
# Ensure build results have reproducible mtimes
@$(clamp_mtimes) $(BASE_DEST)
# Convenience rules to clean and build.
.PHONY: rebuild_%
......@@ -304,6 +315,9 @@ release:
rm -f $(BASE_DEST)/MD5SUMS $(BASE_DEST)/SHA256SUMS
cd $(BASE_DEST) && md5sum `find -L . -type f | sort` > MD5SUMS # XXX remove this
cd $(BASE_DEST) && sha256sum `find -L . -type f | sort` > SHA256SUMS
# We have just modified files
$(clamp_mtimes) $(BASE_DEST)
$(normalise_permissions) $(BASE_DEST)
# The general tree target.
$(STAMPS)tree-unpack-$(targetstring)-stamp: $(STAMPS)get_udebs-$(targetstring)-stamp
......@@ -462,11 +476,7 @@ endif
ifdef PRESEED
# Copy in preseed file.
sed -e 's/@DEBIAN_RELEASE@/$(DEBIAN_RELEASE)/g' \
-e 's/@USE_UDEBS_FROM@/$(USE_UDEBS_FROM)/g' \
-e 's/@DEBIAN_VERSION@/$(DEBIAN_VERSION)/g' \
-e 's/@LINUX_KERNEL_ABI@/$(LINUX_KERNEL_ABI)/g' \
$(PRESEED) >$(TREE)/preseed.cfg
cp -a $(PRESEED) $(TREE)/preseed.cfg
endif
ifndef OMIT_LSB
......@@ -645,6 +655,11 @@ endif
# Remove extra udebs now that we're done with them.
rm -rf $(EXTRAUDEBSDIR)
# Clamp timestamps to be no later than SOURCE_DATE_EPOCH and normalise
# file modes before they get added to media.
$(clamp_mtimes) $(TREE)
$(normalise_permissions) $(TREE)
# Tree target ends here. Whew!
@touch $@
......@@ -667,9 +682,6 @@ sources.list.udeb:
echo "deb [trusted=yes] copy:$(shell pwd)/ $(LOCALUDEBDIR)/"; \
if [ "$(MIRROR)x" != "x" ]; then \
echo "deb $(MIRROR) $(USE_UDEBS_FROM) $(UDEB_COMPONENTS)"; \
if [ "$(USE_PROPOSED_UPDATES)" = 1 ]; then \
echo "deb $(MIRROR) $(USE_UDEBS_FROM)-proposed-updates $(UDEB_COMPONENTS)"; \
fi; \
if [ "$(USE_UNRELEASED)" = 1 ]; then \
echo "deb $(MIRROR) unreleased $(UDEB_COMPONENTS)"; \
fi \
......@@ -744,6 +756,11 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd)
fi
endif
# We may have modified $(TREE)/lib, so re-clamp and normalise before
# placing these files into archives.
$(clamp_mtimes) $(TREE)/lib
$(normalise_permissions) $(TREE)/lib
install -d $(TEMP)
set -e; \
......
......@@ -7,6 +7,7 @@
MX53LOCO /usr/lib/u-boot/mx53loco/u-boot.imx 2
MX6_Cubox-i /usr/lib/u-boot/mx6cuboxi/SPL 2 /usr/lib/u-boot/mx6cuboxi/u-boot.img 138
Wandboard /usr/lib/u-boot/wandboard/SPL 2 /usr/lib/u-boot/wandboard/u-boot.img 138
Novena /usr/lib/u-boot/novena-rawsd/SPL 2 /usr/lib/u-boot/novena-rawsd/u-boot.img 138
#
# Images from u-boot-omap
BeagleBoneBlack /usr/lib/u-boot/am335x_boneblack/MLO 256 /usr/lib/u-boot/am335x_boneblack/u-boot.img 768
......@@ -20,6 +21,7 @@ A20-OLinuXino-Lime /usr/lib/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin
A20-OLinuXino-Lime2 /usr/lib/u-boot/A20-OLinuXino-Lime2/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
BananaPro /usr/lib/u-boot/Bananapro/u-boot-sunxi-with-spl.bin 16
Cubieboard /usr/lib/u-boot/Cubieboard/u-boot-sunxi-with-spl.bin 16
Cubieboard2 /usr/lib/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin 16
......@@ -31,3 +33,7 @@ pcDuino /usr/lib/u-boot/Linksprite_pcDuino/u-boot-sunxi-with-spl.bin 16
pcDuino3 /usr/lib/u-boot/Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin 16
NanoPiNeo /usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin 16
Sinovoip_BPI_M3 /usr/lib/u-boot/Sinovoip_BPI_M3/u-boot-sunxi-with-spl.bin 16
#
# Images from u-boot-rockchip
Firefly-RK3288 /usr/lib/u-boot/firefly-rk3288/u-boot.rksd 64
label expertdark
menu label E^xpert install
kernel ${KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} theme=dark --- ${CONSOLE}
include ${SYSDIR}rqdrk.cfg
label autodark
menu label ^Automated install
kernel ${KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} theme=dark --- quiet ${CONSOLE}
menu hshift 9
menu width 58
label expertdarkgui
menu label Graphical expert install
kernel ${KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} theme=dark --- ${CONSOLE}
include ${SYSDIR}rqdrkgtk.cfg
label autodarkgui
menu label Graphical automated install
kernel ${KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} theme=dark --- quiet ${CONSOLE}
label installdark
default installdark
menu label ^Install
menu default
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} theme=dark --- quiet ${CONSOLE}
label installdarkgui
default installdarkgui
menu label ^Graphical install
menu default
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} theme=dark --- quiet ${CONSOLE}
menu background #00000000
menu color title * #FFFFFFFF *
menu color border * #00000000 #00000000 none
menu color unsel * #ffffffff #ff000000 *
menu color hotkey * #ffdddd00 #ff000000 *
menu color sel * #ffffffff #ff808080 *
menu color hotsel * #ffdddd00 #ff808080 *
menu color tabmsg * #ffffffff #00000000 *
menu color help 37;40 #ffdddd00 #00000000 none
# XXX When adjusting vshift, take care that rows is set to a small
# enough value so any possible menu will fit on the screen,
# rather than falling off the bottom.
menu vshift 8
menu rows 12
# The help line must be at least one line from the bottom.
menu helpmsgrow 14
# The command line must be at least one line from the help line.
menu cmdlinerow 16
menu timeoutrow 16
menu tabmsgrow 18
menu tabmsg Press ENTER to boot or TAB to edit a menu entry
......@@ -11,7 +11,10 @@ if loadfont $prefix/font.pf2 ; then
fi
if background_image /isolinux/splash.png; then
set color_normal=green/black
set color_normal=light-gray/black
set color_highlight=white/black
elif background_image /splash.png; then
set color_normal=light-gray/black
set color_highlight=white/black
else
set menu_color_normal=cyan/blue
......
......@@ -17,6 +17,33 @@ menu begin advanced
include ${SYSDIR}adspkgtk.cfg
include ${SYSDIR}adspk.cfg
menu end
menu begin dark
menu label ^Dark theme installer menu
menu title Dark theme option
include ${SYSDIR}drkmenu.cfg
label mainmenu
menu label ^Back..
menu exit
include ${SYSDIR}drkgtk.cfg
include ${SYSDIR}drk.cfg
menu begin advanced
menu label ^Advanced options
menu title Advanced options
include ${SYSDIR}drkmenu.cfg
label mainmenu
menu label ^Back..
menu exit
include ${SYSDIR}addrkgtk.cfg
include ${SYSDIR}addrk.cfg
menu end
include ${SYSDIR}x86drkme.cfg
label help
menu label ^Help
text help
Display help screens; type 'menu' at boot prompt to return to this menu
endtext
config ${SYSDIR}prompt.cfg
menu end
include ${SYSDIR}x86menu.cfg
label help
menu label ^Help
......
label rescuedark
menu label ^Rescue mode
kernel ${KERNEL}
append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true theme=dark --- quiet ${CONSOLE}
label rescuedarkgui
menu label Graphical rescue mode
kernel ${KERNEL}
append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true theme=dark --- quiet ${CONSOLE}
menu background ${SYSDIR}splash.png
menu color title * #FFFFFFFF *
menu color border * #00000000 #00000000 none
menu color sel * #ffffffff #76a1d0ff *
menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
menu color tabmsg * #ffffffff #00000000 *
menu color help 37;40 #ffdddd00 #00000000 none
menu vshift 10
menu hshift 4
menu width 70
menu margin 5
menu rows 10
menu helpmsgrow 15
# The command line must be at least one line from the bottom.
menu color title * #FFFFFFFF *
menu color border * #00000000 #00000000 none
menu color sel * #ffffffff #76a1d0ff *
menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
menu color tabmsg * #ffffffff #00000000 *
menu color help 37;40 #ffdddd00 #00000000 none
# XXX When adjusting vshift, take care that rows is set to a small
# enough value so any possible menu will fit on the screen,
# rather than falling off the bottom.
menu vshift 8
menu rows 12
# The help line must be at least one line from the bottom.
menu helpmsgrow 14
# The command line must be at least one line from the help line.
menu cmdlinerow 16
menu timeoutrow 16
menu tabmsgrow 18
......
label install
menu label ^Install Parrot
menu label ^Install
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} --- quiet ${CONSOLE}
menu hshift 7
menu width 61
menu title ${BEEP}Parrot OS i386 installer menu
menu title ${BEEP}Debian GNU/Linux i386 installer menu
include ${SYSDIR}stdmenu.cfg
include ${SYSDIR}x86gtk.cfg
......@@ -18,6 +18,10 @@ menu begin advanced
include ${SYSDIR}x86asgtk.cfg
include ${SYSDIR}x86adspk.cfg
menu end
menu begin dark
menu label ^Dark theme option
include ${SYSDIR}x86drkm.cfg
menu end
label help
menu label ^Help
text help
......
menu hshift 9
menu width 58
label x86-expertdark
menu label E^xpert install (32-bit)
kernel ${X86_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${X86_INITRD} theme=dark --- ${CONSOLE}
include ${SYSDIR}x86rqdrk.cfg
label x86-autodark
menu label ^Automated install (32-bit)
kernel ${X86_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${X86_INITRD} theme=dark --- quiet ${CONSOLE}
label x86-expertdarkgui
menu label Graphical expert install (32-bit)
kernel ${X86_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} theme=dark --- ${CONSOLE}
include ${SYSDIR}x86rkgtk.cfg
label x86-autodarkgui
menu label Graphical automated inst (32-bit)
kernel ${X86_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} theme=dark --- quiet ${CONSOLE}
label x86-installdarkgui
default x86-installdarkgui
menu label ^Graphical install (32-bit)
menu default
kernel ${X86_KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} theme=dark --- quiet ${CONSOLE}
label x86-installdark
default x86-installdark
menu label ^Install (32-bit)
menu default
kernel ${X86_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${X86_INITRD} theme=dark --- quiet ${CONSOLE}
menu title Dark theme i386 installer menu
include ${SYSDIR}drkmenu.cfg
label mainmenu
menu label ^Back..
menu exit
include ${SYSDIR}x86dkgtk.cfg
include ${SYSDIR}x86drk.cfg
menu begin advanced
menu label ^Advanced options
menu title Advanced options
include ${SYSDIR}drkmenu.cfg
label mainmenu
menu label ^Back..
menu exit
include ${SYSDIR}x86akgtk.cfg
include ${SYSDIR}x86addrk.cfg
menu end
label help
menu label ^Help
text help
Display help screens; type 'menu' at boot prompt to return to this menu
endtext
config ${SYSDIR}prompt.cfg
menu begin x86dark
menu label ^32-bit install options
menu title 32-bit install options
include ${SYSDIR}x86drkm.cfg
menu end
label x86-rescuedarkgui
menu label Graphical rescue mode (32-bit)
kernel ${X86_KERNEL}
append ${VIDEO_MODE_GTK} initrd=${X86_INITRD_GTK} rescue/enable=true theme=dark --- quiet ${CONSOLE}
label x86-rescuedark
menu label ^Rescue mode (32-bit)
kernel ${X86_KERNEL}
append ${VIDEO_MODE} initrd=${X86_INITRD} rescue/enable=true theme=dark --- quiet ${CONSOLE}
label x86-install
menu label ^Install Parrot (32-bit)
menu label ^Install (32-bit)
kernel ${X86_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${X86_INITRD} --- quiet ${CONSOLE}
......@@ -8,6 +8,8 @@ KERNELNAME = vmlinuz-$(KERNELVERSION)
VERSIONED_SYSTEM_MAP = t
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
# include firmware files (qlogic, cciss, radeon)
......
......@@ -74,7 +74,7 @@ arch_netboot_dir: arm_grub_efi
if [ "$(GRUB_EFI)" = y ]; then \
set -e; \
mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_PLATFORM); \
cp -a $(TEMP_GRUB_EFI)/bootnet$(GRUB_EFI_NAME).efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
cp -a $(TEMP_GRUB_EFI)/*.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_PLATFORM)/* \
$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_PLATFORM)/; \
......
MEDIUM_SUPPORTED = hd-media netboot network-console netboot-gtk device-tree u-boot
MEDIUM_SUPPORTED = hd-media netboot network-console netboot-gtk device-tree u-boot cdrom
MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
......
# el-torito is too large at the moment, so is disabled.
FLAVOUR_SUPPORTED = grub
MEDIA_TYPE = CD-ROM
MEDIA_TYPE = CD-ROM
TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
MANIFEST-KERNEL = "kernel for use with EFI to build a CD"
MANIFEST-INITRD = "initrd for use with EFI to build a CD"
MANIFEST-DEBIAN_CD_INFO = "EFI config files for CD"
TYPE = cdrom/grub
......@@ -18,7 +18,7 @@ KERNEL_FLAVOUR ?= di
# List here any extra udebs that are not in the list file but that
# should still be included on the system.
EXTRAS ?= ca-certificates-udeb parrot-archive-keyring-udeb
EXTRAS ?=
# This variable can be used to copy in additional files from the system
# that is doing the build. Useful if you need to include strace, or gdb,
......@@ -44,13 +44,13 @@ MIRROR = http://deb.parrotsec.org/parrot
DPKG_UNPACK_OPTIONS = --force-overwrite
# The codename of the Debian release that should be installed by default.
DEBIAN_RELEASE = $(USE_UDEBS_FROM)
DEBIAN_RELEASE = parrot
# 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 = 4.6 (stable)
DEBIAN_VERSION ?= buster
DEBIAN_VERSION ?= stable
# Define here from what release (codename!) components (udebs) should be taken
# to build debian-installer. By default this is set to 'unstable' for building
......@@ -60,12 +60,20 @@ USE_UDEBS_FROM ?= testing
# Archive components from which to fetch debian-installer modules.
UDEB_COMPONENTS ?= main/debian-installer
# The date the installer is built.
BUILD_DATE ?= $(shell date -u '+%Y%m%d-%H:%M')
# The date the installer source was last changed; we prefer that the
# caller defines a meaningful value, but below is a safe fallback.
SOURCE_DATE_EPOCH ?= $(shell date '+%s')
# The date the installer was built. We use second-level resolution to ensure
# the generated image implicitly contains the SOURCE_DATE_EPOCH value required
# to reproduce the build.
BUILD_DATE ?= $(shell date -u '+%Y%m%d-%H:%M:%S' -d '@$(SOURCE_DATE_EPOCH)')
# Set consistent file creation modes for a reproducible build, taking care
# not to modify existing executable bits on files.
DIR_MODE = 755
FILE_MODE = u+rw,g+r-w,o+r-w
# Produce a beep at boot menu
BOOTMENU_BEEP ?= n
......@@ -90,7 +98,7 @@ TYPE = $(MEDIUM)
# Used to write a /etc/lsb-release file in the installer initrd.
LSB_DISTRIB_ID=Debian
LSB_DISTRIB_DESCRIPTION="Parrot $(shell uname -o) installer"
LSB_DISTRIB_DESCRIPTION="Parrot OS installer"
# Inlude the build date of the installer in here.
LSB_DISTRIB_RELEASE="$(DEBIAN_VERSION) - installer build $(BUILD_DATE)"
......
......@@ -7,6 +7,8 @@ KERNELNAME = $(foreach ver,${KERNELVERSION},vmlinuz-$(ver))
VERSIONED_SYSTEM_MAP = t
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
arch_boot_screens:
......
......@@ -3,7 +3,7 @@ MEDIUM_SUPPORTED_EXTRA = monolithic
# The version of the kernel to use.
BASEVERSION = $(LINUX_KERNEL_ABI)
KERNELVERSION = $(BASEVERSION)-686-pae
KERNELVERSION = $(BASEVERSION)-686
KERNELMAJOR = 2.6
KERNELNAME = vmlinuz
......
......@@ -8,6 +8,8 @@ KERNELMAJOR = 2.6
KERNELVERSION = $(LINUX_KERNEL_ABI)-itanium
KERNELNAME = vmlinuz
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
INITRD_FS = initramfs
......@@ -29,7 +31,7 @@ arch_tree:
.PHONY: arch_boot
arch_boot:
dd if=/dev/zero of=$@.new bs=1k count=$(FLOPPY_SIZE)
mkfs.msdos -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -C $(TEMP_BOOT) $(FLOPPY_SIZE)
mkfs.msdos --invariant -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -C $(TEMP_BOOT) $(FLOPPY_SIZE)
mmd -i$(TEMP_BOOT) ::/efi
mmd -i$(TEMP_BOOT) ::/efi/boot
......@@ -49,7 +51,7 @@ arch_boot:
mcopy -i$(TEMP_BOOT) $(TEMP)/elilo-cd.conf ::/elilo.conf
mcopy -i$(TEMP_BOOT) $(TEMP)/elilo-cd.conf ::/efi/boot/elilo.conf
$(foreach file,$(wildcard $(TEMP_BOOT_SCREENS)/*.msg), \
$(foreach file,$(sort $(wildcard $(TEMP_BOOT_SCREENS)/*.msg)), \
mcopy -i$(TEMP_BOOT) $(file) ::/efi/boot/`basename $(file)`; \
)
echo "elilo linux" | mcopy -i$(TEMP_BOOT) - ::/install.nsh
......
......@@ -10,6 +10,8 @@ KERNELVERSION = $(LINUX_KERNEL_ABI)-m68k
KERNELNAME = vmlinux-${KERNELVERSION}
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
arch_boot_screens:
......
......@@ -91,7 +91,7 @@ DOS_VOLUME_LABEL = "Debian Inst"
# msdos fat 12, auto/bootstra.prg, bootargs, linux
define atari_boot
mkfs.msdos -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)boot.img $(FLOPPY_SIZE)
mkfs.msdos --invariant -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)boot.img $(FLOPPY_SIZE)
# mkfs.msdos gets the mode wrong (bug filed)
chmod 644 $(TEMP)/$(SUB)boot.img
......@@ -118,7 +118,7 @@ endef
#
define atari_root
mkfs.msdos -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)root.img $(FLOPPY_SIZE)
mkfs.msdos --invariant -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -r 112 -F 12 -C $(TEMP)/$(SUB)root.img $(FLOPPY_SIZE)
# mkfs.msdos gets the mode wrong (bug filed)
chmod 644 $(TEMP)/$(SUB)root.img
......
......@@ -3,6 +3,8 @@ SUBARCH_SUPPORTED = powerpc powerpc64 # apus prep
KERNELMAJOR = 2.6
BASEVERSION = $(LINUX_KERNEL_ABI)
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
# create the kernels with builtin initrd.
......
......@@ -3,6 +3,8 @@ SUBARCH_SUPPORTED = powerpc64
KERNELMAJOR = 2.6
BASEVERSION = $(LINUX_KERNEL_ABI)
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
# create the kernels with builtin initrd.
......
......@@ -2,6 +2,8 @@ MEDIUM_SUPPORTED = netboot
MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-riscv64-lp64d.so.1
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
USE_UNRELEASED = 1
......
......@@ -7,5 +7,7 @@ KERNELVERSION = $(LINUX_KERNEL_ABI)-sparc64
KERNELNAME = vmlinuz-${KERNELVERSION}
DEBIAN_RELEASE = unstable
arch_boot_screens:
arch_tree:
......@@ -7,6 +7,8 @@ KERNELVERSION = $(LINUX_KERNEL_ABI)-sparc64
KERNELNAME = vmlinuz-${KERNELVERSION}
DEBIAN_RELEASE = unstable
KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
arch_boot_screens:
......
......@@ -54,7 +54,7 @@ arch_boot: x86_syslinux
ifdef UPX
$(UPX) -f -9 $(TEMP_KERNEL) || true
endif
mkfs.msdos -v -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -C $(TEMP_BOOT) $(FLOPPY_SIZE)
mkfs.msdos --invariant -v -i $(DOS_VOLUME_ID) -n $(DOS_VOLUME_LABEL) -C $(TEMP_BOOT) $(FLOPPY_SIZE)
# syslinux is used to make the image bootable
syslinux $(SYSLINUX_OPTS) $(TEMP_BOOT)
......@@ -100,7 +100,7 @@ endif
# syslinux help screens
if [ -z "$(OMIT_BOOT_HELP)" ]; then \
set -e; \
$(foreach file,$(wildcard $(TEMP_BOOT_SCREENS)/*.txt), \
$(foreach file,$(sort $(wildcard $(TEMP_BOOT_SCREENS)/*.txt)), \
if [ -e $(file).withgtk ] && [ -n "$(INITRD_GTK)" ]; then \
mcopy -i$(TEMP_BOOT) $(file).withgtk ::`basename $(file)`; \
else \
......@@ -411,7 +411,7 @@ arch_netboot_dir: x86_syslinux x86_grub_efi
if [ "$(GRUB_EFI)" = y ]; then \
set -e; \
mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_PLATFORM); \
cp -a $(TEMP_GRUB_EFI)/bootnet* $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
cp -a $(TEMP_GRUB_EFI)/*.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
cp -a $(TEMP_GRUB_EFI)/boot/grub/$(GRUB_PLATFORM)/* \
$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/$(GRUB_PLATFORM)/; \
......
......@@ -6,6 +6,7 @@ serial-modules-${kernel:Version} ?
usb-serial-modules-${kernel:Version} ?
uinput-modules-${kernel:Version} ?
console-setup-udeb
debian-ports-archive-keyring-udeb
kbd-udeb
scsi-core-modules-${kernel:Version}
......
......@@ -7,7 +7,7 @@ usb-modules-${kernel:Version}
#serial-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
uinput-modules-${kernel:Version} ?
virtio-modules-${kernel:Version}
virtio-modules-${kernel:Version} ?
# Support for usb cdroms
usb-storage-modules-${kernel:Version}
......
fat-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
input-modules-${kernel:Version}
console-setup-udeb
kbd-udeb
usb-modules-${kernel:Version}
#serial-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
uinput-modules-${kernel:Version} ?
virtio-modules-${kernel:Version} ?
# Support for usb cdroms
usb-storage-modules-${kernel:Version}
# USB and firewire cdroms both need this.
scsi-core-modules-${kernel:Version}
# Real ATA hardware needs this.
sata-modules-${kernel:Version}
# also support MMC/SD cards
mmc-modules-${kernel:Version} ?
# This image is based on the regular cdrom image, and gets all the packages
# from that one too.
......@@ -5,9 +5,10 @@ nic-modules-${kernel:Version}
scsi-modules-${kernel:Version}
usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
virtio-modules-${kernel:Version}
virtio-modules-${kernel:Version} ?
cdebconf-text-udeb
console-setup-pc-ekmap
console-setup-udeb
debian-ports-archive-keyring-udeb
kbd-udeb
......@@ -2,6 +2,7 @@ efi-reader
cdebconf-text-udeb
console-setup-pc-ekmap
console-setup-udeb
debian-ports-archive-keyring-udeb
kbd-udeb
fat-modules-${kernel:Version}
......
......@@ -9,4 +9,4 @@ sata-modules-${kernel:Version}
pata-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
scsi-modules-${kernel:Version}
hyperv-modules-${kernel:Version}
hyperv-modules-${kernel:Version} ?
......@@ -10,4 +10,4 @@ pata-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
scsi-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
hyperv-modules-${kernel:Version}
hyperv-modules-${kernel:Version} ?
......@@ -8,5 +8,6 @@ console-setup-pc-ekmap
console-setup-amiga-ekmap
console-setup-ataritt-ekmap
console-setup-udeb
debian-ports-archive-keyring-udeb
kbd-udeb
archdetect
......@@ -4,6 +4,7 @@ firewire-core-modules-${kernel:Version}
pata-modules-${kernel:Version}
console-setup-pc-ekmap
console-setup-udeb
debian-ports-archive-keyring-udeb
kbd-udeb
usb-modules-${kernel:Version}
serial-modules-${kernel:Version}
......@@ -16,7 +17,7 @@ eject-udeb
pcmcia-storage-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
pcmciautils-udeb
virtio-modules-${kernel:Version}
virtio-modules-${kernel:Version} ?
# Support for USB CD-ROMs
usb-storage-modules-${kernel:Version}
......
......@@ -4,6 +4,7 @@ firewire-core-modules-${kernel:Version}
pata-modules-${kernel:Version}
console-setup-pc-ekmap
console-setup-udeb
debian-ports-archive-keyring-udeb
kbd-udeb
usb-modules-${kernel:Version}
serial-modules-${kernel:Version}
......@@ -16,7 +17,7 @@ eject-udeb
pcmcia-storage-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
pcmciautils-udeb
virtio-modules-${kernel:Version}
virtio-modules-${kernel:Version} ?
# Support for USB CD-ROMs
usb-storage-modules-${kernel:Version}
......
......@@ -3,7 +3,7 @@ input-modules-${kernel:Version}
scsi-common-modules-${kernel:Version} ?
scsi-modules-${kernel:Version}