...
 
Commits (25)
# Directory to create; and file to copy
dockstar /usr/lib/u-boot/dockstar/u-boot.kwb
dreamplug /usr/lib/u-boot/dreamplug/u-boot.kwb
guruplug /usr/lib/u-boot/guruplug/u-boot.kwb
sheevaplug /usr/lib/u-boot/sheevaplug/u-boot.kwb
......@@ -9,16 +9,16 @@ if [ ! -e kernel ]; then
exit 1
fi
if [ ! -e initrd.gz ]; then
echo "You have to download the initrd.gz file from the debian-installer for QNAP."
if [ ! -e initrd ]; then
echo "You have to download the initrd file from the debian-installer for QNAP."
exit 1
fi
ifilesize=$(ls -l initrd.gz | awk '{print $5}')
ifilesize=$(ls -l initrd | awk '{print $5}')
# The ramdisk partition is 4 MB on the QNAP TS-109 and TS-209, and
# 9 MB on the QNAP TS-119, TS-219 and TS-219P.
if [ $ifilesize -ne 4194304 -a $ifilesize -ne 9437184 ]; then
echo "The initrd.gz file is corrupt"
echo "The initrd file is corrupt"
exit 1
fi
......@@ -134,7 +134,7 @@ rmdir $path
# 5) Finally, write the installer to flash
printf "Writing debian-installer to flash... "
cat kernel > /dev/mtdblock1
cat initrd.gz > /dev/mtdblock2
cat initrd > /dev/mtdblock2
echo "done."
echo "Please reboot your QNAP device."
......@@ -26,6 +26,9 @@ else
set menu_color_highlight=white/blue
fi
insmod play
play 480 440 1
menuentry "Debian GNU/Hurd installer boot menu" {
true
}
......
......@@ -17,6 +17,9 @@ else
set menu_color_highlight=white/blue
fi
insmod play
play 480 440 1
menuentry "Debian GNU/Hurd installer boot menu" {
true
}
......
......@@ -26,6 +26,9 @@ else
set menu_color_highlight=white/blue
fi
insmod play
play 480 440 1
menuentry "Debian GNU/kFreeBSD installer boot menu" {
true
}
......
......@@ -17,6 +17,9 @@ else
set menu_color_highlight=white/blue
fi
insmod play
play 480 440 1
menuentry "Debian GNU/kFreeBSD installer boot menu" {
true
}
......
......@@ -17,3 +17,5 @@ else
set menu_color_highlight=white/blue
fi
insmod play
play 480 440 1
MEDIUM_SUPPORTED = netboot netboot-gtk network-console device-tree
MEDIUM_SUPPORTED = netboot netboot-gtk network-console device-tree u-boot
# The version of the kernel to use.
KERNELVERSION := $(KERNELVERSION)-kirkwood
......
MEDIA_TYPE = netboot image
TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) openrd sheevaplug dreamplug
TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) openrd sheevaplug sheevaplug-esata guruplug dreamplug dockstar
EXTRANAME = $(MEDIUM)
# OpenRD
openrd:
mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/openrd
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uImage
mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uInitrd
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uImage "Linux kernel for OpenRD"
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/openrd/uInitrd "initrd for OpenRD"
ln -s openrd $(SOME_DEST)/$(EXTRANAME)/marvell/openrd-base
ln -s openrd $(SOME_DEST)/$(EXTRANAME)/marvell/openrd-client
ln -s openrd $(SOME_DEST)/$(EXTRANAME)/marvell/openrd-ultimate
# SheevaPlug and GuruPlug
sheevaplug:
mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uImage
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-sheevaplug.dtb > $(TEMP)/vmlinuz-sheevaplug
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-sheevaplug $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uImage
mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uInitrd
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uImage "Linux kernel for SheevaPlug"
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uInitrd "initrd for SheevaPlug"
ln -nfs sheevaplug $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug
sheevaplug-esata: sheevaplug
mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug-esata
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-sheevaplug-esata.dtb > $(TEMP)/vmlinuz-sheevaplug-esata
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-sheevaplug-esata $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug-esata/uImage
ln -nfs ../sheevaplug/uInitrd $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug-esata/uInitrd
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug-esata/uImage "Linux kernel for SheevaPlug eSATA"
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug-esata/uInitrd "initrd for SheevaPlug eSATA"
guruplug: sheevaplug
mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-guruplug-server-plus.dtb > $(TEMP)/vmlinuz-guruplug
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-guruplug $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uImage
ln -nfs ../sheevaplug/uInitrd $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uInitrd
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uImage "Linux kernel for GuruPlug"
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uInitrd "initrd for GuruPlug"
......@@ -29,3 +44,11 @@ dreamplug: sheevaplug
ln -nfs ../sheevaplug/uInitrd $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug/uInitrd
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug/uImage "Linux kernel for DreamPlug"
update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug/uInitrd "initrd for DreamPlug"
dockstar:
mkdir -p $(SOME_DEST)/$(EXTRANAME)/seagate/dockstar
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dockstar.dtb > $(TEMP)/vmlinuz-dockstar
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-dockstar $(SOME_DEST)/$(EXTRANAME)/seagate/dockstar/uImage
mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/seagate/dockstar/uInitrd
update-manifest $(SOME_DEST)/$(EXTRANAME)/seagate/dockstar/uImage "Linux kernel for Seagate DockStar"
update-manifest $(SOME_DEST)/$(EXTRANAME)/seagate/dockstar/uInitrd "initrd for Seagate DockStar"
......@@ -25,12 +25,12 @@ ts219:
cat $(TEMP_KERNEL) >> $(TEMP)/ts-219/kernel
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-219/kernel $(TEMP)/ts-219/kernel.uboot
cp $(TEMP)/ts-219/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/kernel
cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz
util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz 9437184
cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd
util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd 9437184
install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/flash-debian
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/flash-debian "Script to flash debian-installer"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/kernel "Linux kernel for QNAP TS-119, TS-219 and TS-219P"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz "initrd for QNAP TS-119, TS-219 and TS-219P"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd "initrd for QNAP TS-119, TS-219 and TS-219P"
ln -s ts-219 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-119
ln -s ts-219 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219p
......@@ -44,20 +44,45 @@ ts41x:
cat $(TEMP_KERNEL) >> $(TEMP)/ts-41x/kernel
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-41x/kernel $(TEMP)/ts-41x/kernel.uboot
cp $(TEMP)/ts-41x/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/kernel
cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz
util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz 9437184
cp $(TEMP_INITRD) $(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/flash-debian "Script to flash debian-installer"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/kernel "Linux kernel for QNAP TS-41x"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz "initrd for QNAP TS-41x"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd "initrd for QNAP TS-41x"
# LaCie NAS series: Network Space v2 (and parents), d2 Network v2 and *Big Network v2
lacie:
mkdir -p $(SOME_DEST)/$(EXTRANAME)/lacie
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/lacie/uImage
mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/lacie/uInitrd
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/uImage "Linux kernel for LaCie NAS"
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/uInitrd "initrd for LaCie NAS"
# LaCie 2Big Network v2
mkdir -p $(SOME_DEST)/$(EXTRANAME)/lacie/net2big
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/lacie/net2big/uImage
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/net2big/uImage "Linux kernel for LaCie 2Big Network v2"
# LaCie 5Big Network v2
mkdir -p $(SOME_DEST)/$(EXTRANAME)/lacie/net5big
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/lacie/net5big/uImage
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/net5big/uImage "Linux kernel for LaCie 5Big Network v2"
# LaCie Internet Space v2
mkdir -p $(SOME_DEST)/$(EXTRANAME)/lacie/is2
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-is2.dtb > $(TEMP)/vmlinuz-is2
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-is2 $(SOME_DEST)/$(EXTRANAME)/lacie/is2/uImage
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/is2/uImage "Linux kernel for LaCie Internet Space v2"
# LaCie Network Space v2
mkdir -p $(SOME_DEST)/$(EXTRANAME)/lacie/ns2
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ns2.dtb > $(TEMP)/vmlinuz-ns2
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ns2 $(SOME_DEST)/$(EXTRANAME)/lacie/ns2/uImage
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/ns2/uImage "Linux kernel for LaCie Network Space v2"
# LaCie Network Space Max v2
mkdir -p $(SOME_DEST)/$(EXTRANAME)/lacie/ns2max
cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-ns2max.dtb > $(TEMP)/vmlinuz-ns2max
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/vmlinuz-ns2max $(SOME_DEST)/$(EXTRANAME)/lacie/ns2max/uImage
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/ns2max/uImage "Linux kernel for LaCie Network Space Max v2"
# LaCie d2 Network v2
mkdir -p $(SOME_DEST)/$(EXTRANAME)/lacie/d2net
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/lacie/d2net/uImage
update-manifest $(SOME_DEST)/$(EXTRANAME)/lacie/d2net/uImage "Linux kernel for LaCie d2 Network v2"
# Buffalo Linkstation LS-CHLv2
lschlv2:
......
MEDIA_TYPE = u-boot binaries
TARGET = u-boot-binaries
EXTRANAME = $(MEDIUM)/
.PHONY: u-boot-binaries
u-boot-binaries:
while read LINE; \
do \
if [ -n "$${LINE}" ] && ! echo $${LINE} | grep -q -e "^#"; then \
set -- $${LINE}; \
mkdir -p "$(SOME_DEST)/$(EXTRANAME)/$$1"; \
echo "Providing u-boot binaries for $$1 ..."; \
cp "$$2" "$(SOME_DEST)/$(EXTRANAME)/$$1/"; \
update-manifest "$(SOME_DEST)/$(EXTRANAME)$$1" "u-boot image for $$1"; \
fi; \
done < boot/arm/armel-kirkwood-u-boot-image-config
MEDIA_TYPE = netboot image
TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-323 kuroboxpro lslive lsmini lspro mv2120
TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-323 kuroboxpro lslive lsmini lspro mv2120 ts209 ts409
EXTRANAME = $(MEDIUM)
TYPE = netboot/network-console
TEMP_INITRD_XZ = $(TEMP)/initrd.xz
$(TEMP_INITRD_XZ): $(TEMP_INITRD)
zcat $(TEMP_INITRD) | xz --check=crc32 -9 > $(TEMP_INITRD_XZ)
# D-Link DNS-323 / Conceptronic CH3SNAS
dns-323:
mkdir -p $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323
......@@ -94,3 +99,37 @@ mv2120:
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"
# QNAP TS-109/TS-209
ts209: $(TEMP_INITRD_XZ)
mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209
mkdir -p $(TEMP)/ts-209
echo "TS-109/TS-209" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/model
# Set machine id 1565 (0x061d)
devio > $(TEMP)/ts-209/kernel 'wl 0xe3a01c06,4' 'wl 0xe381101d,4'
cat $(TEMP_KERNEL) >> $(TEMP)/ts-209/kernel
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-209/kernel $(TEMP)/ts-209/kernel.uboot
cp $(TEMP)/ts-209/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/kernel
cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd
util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd 4194304
install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/flash-debian
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/flash-debian "Script to flash debian-installer"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/kernel "Linux kernel for QNAP TS-109/TS-209"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd "initrd for QNAP TS-109/TS-209"
ln -s ts-209 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-109
# QNAP TS-409
ts409: $(TEMP_INITRD_XZ)
mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409
mkdir -p $(TEMP)/ts-409
echo "TS-409" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/model
# Set machine id 1601 (0x0641)
devio > $(TEMP)/ts-409/kernel 'wl 0xe3a01c06,4' 'wl 0xe3811041,4'
cat $(TEMP_KERNEL) >> $(TEMP)/ts-409/kernel
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "Debian kernel" -d $(TEMP)/ts-409/kernel $(TEMP)/ts-409/kernel.uboot
cp $(TEMP)/ts-409/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/kernel
cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd
util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd 4194304
install -m 744 boot/arm/qnap-flash-debian $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/flash-debian
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/flash-debian "Script to flash debian-installer"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/kernel "Linux kernel for QNAP TS-409"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd "initrd for QNAP TS-409"
......@@ -11,7 +11,7 @@
# Default kernel ABI version to use. Append a kernel flavour to
# produce KERNELVERSION.
LINUX_KERNEL_ABI ?= 3.16.0-4
LINUX_KERNEL_ABI ?= 3.16.0-6
# Always "di" these days
KERNEL_FLAVOUR ?= di
......
......@@ -33,7 +33,7 @@ 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 gfxterm gfxterm_background gzio minicmd normal png vbe
GRUB_MODULES_PXE=pxe tftp multiboot cpuid echo play gfxterm gfxterm_background gzio minicmd normal png vbe
# Location for Xen example configuration.
XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg
......
......@@ -15,7 +15,7 @@ GRUB_CFG_PXE=boot/kfreebsd/grub-kfreebsd-pxe.cfg
# GRUB modules
GRUB_PLATFORM=i386-pc
GRUB_MODDIR=/usr/lib/grub/$(GRUB_PLATFORM)
GRUB_MODULES_PXE=pxe tftp bsd cpuid echo gfxterm gfxterm_background gzio minicmd normal png vbe
GRUB_MODULES_PXE=pxe tftp bsd cpuid echo play gfxterm gfxterm_background gzio minicmd normal png vbe
# Location for Xen example configuration.
XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg
......
......@@ -13,6 +13,8 @@ virtio-modules-${kernel:Version}
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} ?
# Exclude framebuffer related modules that are listed in netboot/armel.cfg
fb-modules-${kernel:Version} -
input-modules-${kernel:Version} -
usb-serial-modules-${kernel:Version} ?
usb-serial-modules-${kernel:Version} -
......@@ -11,3 +11,5 @@ event-modules-${kernel:Version}
qcontrol-udeb
# To control the LED and beeper on Buffalo devices
micro-evtd-udeb
# Exclude usb-modules explicitly to work around bug in util/pkg-list (#809300)
usb-modules-${kernel:Version} -
......@@ -64,7 +64,7 @@ mkdir -p "$outdir/boot/grub/$platform"
(cd "$workdir"; tar -cf - boot) >"$memdisk_img"
grub-mkimage -O "$platform" -m "$memdisk_img" \
-o "$workdir/boot$efi_name.efi" -p '(memdisk)/boot/grub' \
search iso9660 configfile normal memdisk tar part_msdos fat
search iso9660 configfile normal memdisk tar part_msdos part_gpt fat
grub-mkimage -O "$platform" \
-o "$outdir/bootnet$efi_name.efi" -p "$netboot_prefix/grub" \
......
......@@ -86,6 +86,9 @@ for mirror in $MIRRORS; do
fi
else
echo "$mirror $SUITE $UDEB_COMPONENTS"
if [ "$USE_PROPOSED_UPDATES" = 1 ]; then
echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS"
fi
fi
done | perl -ne 'print unless $seen{$_}; $seen{$_}=1'
......@@ -116,6 +116,8 @@ sub menuentry ($;%)
$xattr{SixtyFour} ||= 0;
$xattr{Graphical} ||= 0;
$xattr{Hotkey} ||= 0;
$xattr{Expert} ||= 0;
$xattr{Auto} ||= 0;
$xattr{Rescue} ||= 0;
......@@ -149,8 +151,12 @@ sub menuentry ($;%)
my $cmdline = join(" ", @cmdline);
my $hotkey = "";
$hotkey = " --hotkey=".$xattr{Hotkey}
if $xattr{Hotkey};
print_indented (<<EOE);
menuentry '$title' {
menuentry$hotkey '$title' {
set background_color=black
linux $kernel $cmdline
initrd $initrd
......@@ -200,11 +206,11 @@ start_submenu("Advanced options ..."); {
} end_submenu(); # $desktop advanced
$one->("... Install with speech synthesis", Speach => 1);
$one->("... Install with speech synthesis", Graphical => 1, Speach => 1);
$one->("... Install with speech synthesis", Graphical => 1, Speach => 1, Hotkey => 's');
$one->("... 64 bit speech install", SixtyFour => 1, Graphical => 1, Speach => 1)
if $sixtyfour;
} end_submenu(); # $desktop submenu
} # Desktop loop
} end_submenu(); # Desktop submenu
} end_submenu(); # Advanced
menuentry('Install with speech synthesis', Graphical => $graphical, Speach => 1);
menuentry('Install with speech synthesis', Graphical => $graphical, Speach => 1, Hotkey => 's')
debian-installer (20150422+deb8u5) jessie; urgency=medium
* Bump Linux kernel ABI from 3.16.0-4 to 3.16.0-6
-- Cyril Brulebois <kibi@debian.org> Mon, 18 Jun 2018 18:00:16 +0000
debian-installer (20150422+deb8u4) jessie; urgency=medium
[ Steve McIntyre ]
* Add sata-modules for arm64 - some machines do have SATA CD
-- Cyril Brulebois <kibi@debian.org> Thu, 02 Jun 2016 01:21:28 +0200
debian-installer (20150422+deb8u3) jessie; urgency=medium
[ Samuel Thibault ]
* Add beep to UEFI x86 boot menu (Closes: #796591).
* Add 's' shortcut for speech to UEFI x86 boot menu.
[ Steve McIntyre ]
* Add the part_gpt module into the core grub image to make it easier
for users doing slightly different things with our images; include
support for GPT partition tables as well as msdos (Closes: #789600).
[ Martin Michlmayr ]
* Exclude usb-serial-modules from the armel network-console image
since it's not useful there (Closes: #809301).
* Exclude usb-modules explicitly on armel/orion5x network-console
to work around bug in util/pkg-list.
* Drop the file extension from the initrd for QNAP devices.
* Re-introduce installer images for QNAP TS-x09.
* Provide u-boot images for plug computers.
[ Cyril Brulebois ]
* Adjust p-u support to handle file:// instead of (f|ht)tp:// only,
thanks to Łukasz Stelmach for both the report and the patch
(Closes: #803711).
-- Cyril Brulebois <kibi@debian.org> Mon, 18 Jan 2016 05:04:12 +0100
debian-installer (20150422+deb8u2) jessie; urgency=medium
[ Martin Michlmayr ]
* Add image for Seagate DockStar.
* Add symlinks for OpenRD variants.
* Append DTB for LaCie NAS devices that require it.
-- Cyril Brulebois <kibi@debian.org> Mon, 31 Aug 2015 21:40:45 +0200
debian-installer (20150422+deb8u1) jessie; urgency=medium
[ Martin Michlmayr ]
* Append DTB for SheevaPlug, SheevaPlug eSATA and GuruPlug. (Closes:
#785588)
[ Cyril Brulebois ]
* Enable p-u in debian/rules for the jessie point releases.
-- Cyril Brulebois <kibi@debian.org> Thu, 04 Jun 2015 14:07:52 +0200
debian-installer (20150422) unstable; urgency=medium
* Update translation-status for the release.
......
......@@ -138,6 +138,8 @@ Build-Depends:
u-boot-omap [armhf],
u-boot-sunxi [armhf],
# U-boot binaries for armhf systems without u-boot in flash memory
u-boot [armel],
# U-boot binaries for armel systems
#
# Architecture specific build dependencies:
tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
......
......@@ -10,7 +10,7 @@ TRANSSTATUS=
BOOTMENU_BEEP=n
else
USE_UDEBS_FROM=jessie
USE_PROPOSED_UPDATES=0
USE_PROPOSED_UPDATES=1
TRANSSTATUS=translation-status
BOOTMENU_BEEP=y
endif
......