debian-installer

Merge lp:~dannf/debian-installer/xgene-uboot-gzip-support into lp:~ubuntu-core-dev/debian-installer/ubuntu

  1. xgene-uboot-gzip-support
  2. Merge into ubuntu
Proposed by dann frazier on 2016-07-20
Status: Merged
Merged at revision: 2171
Proposed branch: lp:~dannf/debian-installer/xgene-uboot-gzip-support
Merge into: lp:~ubuntu-core-dev/debian-installer/ubuntu
Diff against target: 36 lines (+12/-1)
2 files modified
build/config/arm64/netboot.cfg (+5/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~dannf/debian-installer/xgene-uboot-gzip-support
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2016-07-20 Pending
Review via email: mp+300645@code.launchpad.net
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
1=== modified file 'build/config/arm64/netboot.cfg'
2--- build/config/arm64/netboot.cfg 2015-02-24 05:45:09 +0000
3+++ build/config/arm64/netboot.cfg 2016-07-20 17:27:20 +0000
4@@ -8,6 +8,10 @@
5 MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
6 MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
7
8+gzipmagic = 8b1f
9+magic = $(shell od -x -N2 $(1) | head -1 | cut -d' ' -f2)
10+compress-type = $(if $(findstring $(gzipmagic),$(call magic,$(1))),gzip,none)
11+
12 .PHONY: arch_netboot_dir
13 arch_netboot_dir:
14 -rm -f $(TEMP_NETBOOT_DIR)
15@@ -33,5 +37,5 @@
16 # They don't currently support bootz.
17 $(eval XU_INSTALL_PATH=$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/xgene-uboot)
18 mkdir -p $(XU_INSTALL_PATH)
19- mkimage -A arm -O linux -T kernel -C none -a 0x80000 -e 0x80000 -n "Ubuntu kernel" -d $(TEMP_KERNEL) $(XU_INSTALL_PATH)/uImage
20+ mkimage -A arm -O linux -T kernel -C $(call compress-type,$(TEMP_KERNEL)) -a 0x80000 -e 0x80000 -n "Ubuntu kernel" -d $(TEMP_KERNEL) $(XU_INSTALL_PATH)/uImage
21 mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(XU_INSTALL_PATH)/uInitrd
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2016-07-19 16:53:19 +0000
25+++ debian/changelog 2016-07-20 17:27:20 +0000
26@@ -1,3 +1,10 @@
27+debian-installer (20101020ubuntu467) UNRELEASED; urgency=medium
28+
29+ * arm64/xgene-uboot: Set the correct compression flag when generating
30+ a uImage of a gzip'd kernel.
31+
32+ -- dann frazier <dannf@ubuntu.com> Wed, 20 Jul 2016 11:12:07 -0600
33+
34 debian-installer (20101020ubuntu466) yakkety; urgency=medium
35
36 * Strop stripping modules; it removes the signatures (LP: #1604441)

Subscribers

People subscribed via source and target branches