debian-cd

Merge lp:~xnox/debian-cd/s390x into lp:~ubuntu-cdimage/debian-cd/ubuntu

  1. s390x
  2. Merge into ubuntu
Proposed by Dimitri John Ledkov on 2015-12-11
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp:~xnox/debian-cd/s390x
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 41 lines (+3/-4)
2 files modified
tools/boot/xenial/boot-s390x (+2/-3)
tools/grab_md5 (+1/-1)
To merge this branch: bzr merge lp:~xnox/debian-cd/s390x
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team 2015-12-11 Pending
Review via email: mp+280369@code.launchpad.net

Description of the Change

fixes of the two identified errors.

To post a comment you must log in.
lp:~xnox/debian-cd/s390x updated on 2015-12-12
1923. By Steve Langasek on 2015-12-11

Merge latest fixes from lp:~xnox/debian-cd/s390x/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/xenial/boot-s390x'
2--- tools/boot/xenial/boot-s390x 2015-12-11 12:28:40 +0000
3+++ tools/boot/xenial/boot-s390x 2015-12-11 22:29:21 +0000
4@@ -55,7 +55,7 @@
5 # - generic/initrd.debian : initrd; to be used for both VM-reader
6 # - generic/kernel.debian : kernel for WM-reader
7
8-images_S390="MANIFEST.udebs generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
9+images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
10
11 for image in $images_S390; do
12 case $image in
13@@ -65,14 +65,13 @@
14 imagedest=root.bin ;;
15 generic/kernel.debian)
16 imagedest=linux_vm ;;
17- MANIFEST.udebs)
18- imagedest=$image ;;
19 esac
20 imagedest="$imagedir/$imagedest"
21
22 cp "$DI_DIR/$image" "$imagedest"
23 done
24
25+cp "$DI_DIR/MANIFEST.udebs" .
26 list_kernel_abis $images_S390 | check_kernel_sync
27
28 # Copy the different boot files
29
30=== modified file 'tools/grab_md5'
31--- tools/grab_md5 2014-01-30 16:48:42 +0000
32+++ tools/grab_md5 2015-12-11 22:29:21 +0000
33@@ -42,7 +42,7 @@
34 DIR = ""
35 }' | sort | uniq >> $OUT
36 ;;
37- alpha|amd64|arm|armel|armhf|hppa|i386|ia64|lpia|m68k|mips|mipsel|powerpc|ppc64el|s390|sparc)
38+ alpha|amd64|arm|armel|armhf|hppa|i386|ia64|lpia|m68k|mips|mipsel|powerpc|ppc64el|s390|s390x|sparc)
39 FILES=`find -L $MIRROR/dists/$SUITE/ -name Packages -o -name Packages.gz | grep binary-$ARCH`
40 echo -e "Using MD5 sums from Packages files:\n$FILES"
41 zcat -f $FILES | awk -v MIRROR=$MIRROR '

Subscribers

People subscribed via source and target branches