debian-installer

Merge lp:~tom-leiming/debian-installer/trusty-for-generating-netboot-tarball-v1 into lp:~ubuntu-core-dev/debian-installer/trusty-proposed

  1. trusty-for-generating-netboot-tarball-v1
  2. Merge into trusty-proposed
Proposed by Ming Lei
Status: Merged
Merged at revision: 2032
Proposed branch: lp:~tom-leiming/debian-installer/trusty-for-generating-netboot-tarball-v1
Merge into: lp:~ubuntu-core-dev/debian-installer/trusty-proposed
Diff against target: 155 lines (+57/-8)
5 files modified
build/boot/arm64/grub/grub-efi.cfg (+7/-0)
build/config/arm64/generic/netboot.cfg (+32/-2)
build/util/efi-image (+7/-1)
debian/changelog (+6/-0)
debian/control (+5/-5)
To merge this branch: bzr merge lp:~tom-leiming/debian-installer/trusty-for-generating-netboot-tarball-v1
Reviewer Review Type Date Requested Status
Adam Conrad Pending
Steve Langasek Pending
Review via email: mp+294319@code.launchpad.net

Description of the change

For generating grub.efi and netboot.tar.gz on arm64/trusty

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'build/boot/arm64'
=== added directory 'build/boot/arm64/grub'
=== added file 'build/boot/arm64/grub/grub-efi.cfg'
--- build/boot/arm64/grub/grub-efi.cfg 1970-01-01 00:00:00 +0000
+++ build/boot/arm64/grub/grub-efi.cfg 2016-05-11 02:19:32 +0000
@@ -0,0 +1,7 @@
1set menu_color_normal=cyan/blue
2set menu_color_highlight=white/blue
3menuentry 'Install' {
4 set background_color=black
5 linux /ubuntu-installer/arm64/linux --- quiet
6 initrd /ubuntu-installer/arm64/initrd.gz
7}
08
=== modified file 'build/config/arm64/generic/netboot.cfg'
--- build/config/arm64/generic/netboot.cfg 2015-06-02 20:49:49 +0000
+++ build/config/arm64/generic/netboot.cfg 2016-05-11 02:19:32 +0000
@@ -1,11 +1,19 @@
1MEDIA_TYPE = netboot image1MEDIA_TYPE = netboot image
2TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) all-generic2TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) all-generic
3EXTRANAME = $(MEDIUM)/3EXTRANAME = $(MEDIUM)/
4INITRD_FS = initramfs4INITRD_FS = initramfs
55
6MANIFEST-INITRD = "netboot initrd"6MANIFEST-INITRD = "netboot initrd"
7MANIFEST-KERNEL = "kernel image to netboot"7MANIFEST-KERNEL = "kernel image to netboot"
88
9NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
10MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
11MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
12GRUB_EFI=y
13GRUB_PLATFORM=arm64-efi
14GRUB_EFI_NAME=aa64
15GRUB_FONT = /usr/share/grub/ascii.pf2
16
9generic:17generic:
10 mkdir -p $(SOME_DEST)/$(EXTRANAME)/18 mkdir -p $(SOME_DEST)/$(EXTRANAME)/
11 cp $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/vmlinuz19 cp $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/vmlinuz
@@ -37,4 +45,26 @@
37 update-manifest $(INSTALL_PATH)/uInitrd "initrd for X-Gene Boards"45 update-manifest $(INSTALL_PATH)/uInitrd "initrd for X-Gene Boards"
38 update-manifest $(INSTALL_PATH)/apm-mustang.dtb "Device Tree file for APM X-Gene Mustang Board"46 update-manifest $(INSTALL_PATH)/apm-mustang.dtb "Device Tree file for APM X-Gene Mustang Board"
3947
40all-generic: generic xgene48arm64_grub_efi:
49ifeq ($(GRUB_EFI),y)
50 efi-image $(TEMP_GRUB_EFI) arm64-efi aa64 $(NETBOOT_PATH)
51endif
52
53arch_netboot_dir: arm64_grub_efi
54 -rm -f $(TEMP_NETBOOT_DIR)
55 mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
56 cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
57 cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/initrd.gz
58
59 if [ "$(GRUB_EFI)" = y ]; then \
60 set -e; \
61 mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi; \
62 cp -a $(TEMP_GRUB_EFI)/bootnetaa64.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
63 cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
64 cp -a $(TEMP_GRUB_EFI)/boot/grub/arm64-efi/* \
65 $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi/; \
66 cp -f boot/arm64/grub/grub-efi.cfg \
67 $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
68 fi
69
70all-generic: generic xgene arch_netboot_dir
4171
=== modified file 'build/util/efi-image'
--- build/util/efi-image 2012-10-15 20:03:40 +0000
+++ build/util/efi-image 2016-05-11 02:19:32 +0000
@@ -22,13 +22,14 @@
22# it exists.22# it exists.
2323
24if [ -z "$1" ] || [ -z "$2" ]; then24if [ -z "$1" ] || [ -z "$2" ]; then
25 echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM EFI-NAME"25 echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM EFI-NAME [NETBOOT-PREFIX]"
26 exit 126 exit 1
27fi27fi
2828
29outdir="$1"29outdir="$1"
30platform="$2"30platform="$2"
31efi_name="$3"31efi_name="$3"
32netboot_prefix="$4"
3233
33memdisk_img=34memdisk_img=
34workdir=35workdir=
@@ -144,6 +145,11 @@
144 search iso9660 configfile normal memdisk tar part_msdos fat145 search iso9660 configfile normal memdisk tar part_msdos fat
145fi146fi
146147
148[ -z "$netboot_prefix" ] || \
149grub-mkimage -O "$platform" \
150 -o "$outdir/bootnet$efi_name.efi" -p "$netboot_prefix/grub" \
151 search configfile normal efinet tftp net
152
147# Stuff it into a FAT filesystem, making it as small as possible. 24KiB153# Stuff it into a FAT filesystem, making it as small as possible. 24KiB
148# headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32.154# headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32.
149size=$(( $(stat -c %s "$workdir/boot$efi_name.efi") / 1024 ))155size=$(( $(stat -c %s "$workdir/boot$efi_name.efi") / 1024 ))
150156
=== modified file 'debian/changelog'
--- debian/changelog 2016-05-02 17:29:58 +0000
+++ debian/changelog 2016-05-11 02:19:32 +0000
@@ -1,3 +1,9 @@
1debian-installer (20101020ubuntu318.39) trusty; urgency=medium
2
3 * generate grub.efi and netboot.tar.gz for trusty on ARM64
4
5 -- Ming Lei <ming.lei@canonical.com> Wed, 11 May 2016 09:44:07 +0800
6
1debian-installer (20101020ubuntu318.38) trusty; urgency=medium7debian-installer (20101020ubuntu318.38) trusty; urgency=medium
28
3 * Enable lts-xenial builds (LP: #1568918)9 * Enable lts-xenial builds (LP: #1568918)
410
=== modified file 'debian/control'
--- debian/control 2014-02-10 19:47:21 +0000
+++ debian/control 2016-05-11 02:19:32 +0000
@@ -9,7 +9,7 @@
9Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu9Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu
10Build-Conflicts: libnewt-pic [mipsel]10Build-Conflicts: libnewt-pic [mipsel]
11# NOTE: Do not edit the next line by hand. See comment below.11# NOTE: Do not edit the next line by hand. See comment below.
12Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 2:4.02) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], module-init-tools [i386 arm64 armeb armel armhf amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64el s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-common [amd64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]12Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 2:4.02) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], module-init-tools [i386 arm64 armeb armel armhf amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64el s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64], grub-common [amd64 arm64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
13# This package has the worst Build-Depends in Debian, so it deserves some13# This package has the worst Build-Depends in Debian, so it deserves some
14# explanation. Note that this comment can also be used to generate a14# explanation. Note that this comment can also be used to generate a
15# Build-Depends line, by running the debian/genbuilddeps program.15# Build-Depends line, by running the debian/genbuilddeps program.
@@ -82,7 +82,7 @@
82# default.)82# default.)
83# - hfsutils [powerpc]83# - hfsutils [powerpc]
84# For making bootable HFS USB sticks for powerpc.84# For making bootable HFS USB sticks for powerpc.
85# - dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf]85# - dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64]
86# For creating FAT filesystems with mkfs.msdos.86# For creating FAT filesystems with mkfs.msdos.
87# Of course i386/amd64 use this for floppies, CDs etc.87# Of course i386/amd64 use this for floppies, CDs etc.
88# ia64 uses it for floppies (?)88# ia64 uses it for floppies (?)
@@ -148,7 +148,7 @@
148# - tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64]148# - tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
149# For todos, used on files that need to be accessible from149# For todos, used on files that need to be accessible from
150# DOS.150# DOS.
151# - mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf]151# - mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf]
152# mcopy is used to put files onto FAT filesystems w/o152# mcopy is used to put files onto FAT filesystems w/o
153# mounting them.153# mounting them.
154# - po4a [i386 amd64]154# - po4a [i386 amd64]
@@ -174,9 +174,9 @@
174# Used as the CD-ROM's bootloader174# Used as the CD-ROM's bootloader
175# - xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el]175# - xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el]
176# Used by grub-pc/grub-ieee1275-bin to create the CD-ROM images176# Used by grub-pc/grub-ieee1275-bin to create the CD-ROM images
177# - grub-efi-amd64-bin (>= 2.00) [amd64]177# - grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64]
178# EFI bootloader support.178# EFI bootloader support.
179# - grub-common [amd64]179# - grub-common [amd64 arm64]
180# For the GRUB font.180# For the GRUB font.
181# - debian-ports-archive-keyring [sh4 sparc64]181# - debian-ports-archive-keyring [sh4 sparc64]
182# Used for architectures hosted on debian-ports.org182# Used for architectures hosted on debian-ports.org

Subscribers

People subscribed via source and target branches