Xen project Mailing List

[Xen-devel] [PATCH OSSTEST v2 02/11] mg-debian-installer-update: updates to better handle Jessie onwards.

To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>

Date: Mon, 15 Jun 2015 14:36:30 +0100

Cc: Wei Liu <wei.liu2@xxxxxxxxxx>, ian.jackson@xxxxxxxxxxxxx, Ian Campbell <ian.campbell@xxxxxxxxxx>

Delivery-date: Mon, 15 Jun 2015 13:36:57 +0000

List-id: Xen developer discussion <xen-devel.lists.xen.org>

From: Ian Campbell <ian.campbell@xxxxxxxxxx> In mg-debian-installer-update: - Expand the list of (suite,arch) combinations which don't exist and move it to the top. - Tweak the backports.org handling to allow it to be specified on a per (suite,arch) basis, and specify it only for (wheezy,armhf) since it is not currently needed for jessie. Make the initramfs-tools fetching conditional too. - Only extract backports-dtbs if they are present in the package. - Handle arm64. - Collect the correct armhf kernel for Jessie onwards (vexpress removed from path). Have mg-debian-installer-update-all fetch arm64 too. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> Cc: Wei Liu <wei.liu2@xxxxxxxxxx> --- Osstest/Debian.pm | 2 +- mg-debian-installer-update | 59 ++++++++++++++++++++++++++---------------- mg-debian-installer-update-all | 2 +- ts-host-install | 4 +-- 4 files changed, 41 insertions(+), 26 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 9b733d7..c26f88e 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -820,7 +820,7 @@ END foreach my $kp (keys %{ $ho->{Flags} }) { # Backwards compatibility $kp = "need-kernel-deb-wheezy-backports" if $kp eq "need-kernel-deb-armmp"; - $kp =~ s/need-kernel-deb-$ho->{Suite}// or next; + $kp =~ s/need-kernel-deb-$ho->{Suite}-// or next; my $kern = "$d_i/$kp.deb"; my $kurl = create_webfile($ho, "kernel", sub { diff --git a/mg-debian-installer-update b/mg-debian-installer-update index f21f216..f6bf962 100755 --- a/mg-debian-installer-update +++ b/mg-debian-installer-update @@ -38,20 +38,28 @@ fetch () { } case ${suite}_${arch} in + lenny_armhf|squeeze_armhf|lenny_arm64|squeeze_arm64|wheezy_arm64) + # No such thing. + exit 0 + ;; *_i386|*_amd64) src=$sbase/main/installer-$arch/current/images/netboot/ files="debian-installer/$arch/initrd.gz:initrd.gz debian-installer/$arch/linux:linux xen/vmlinuz:vmlinuz-xen xen/initrd.gz:initrd.gz-xen" ;; - lenny_armhf|squeeze_armhf) - # No such thing. - exit 0 + *_arm64) + src=$sbase/main/installer-$arch/current/images/netboot/ + files="debian-installer/$arch/initrd.gz:initrd.gz debian-installer/$arch/linux:linux" ;; - *_armhf) + wheezy_armhf) # Use the vexpress image, we are going to bash in our own # kernel+modules anyway. src=$sbase/main/installer-$arch/current/images/vexpress/netboot files='initrd.gz' # no kernel -- needs a newer kernel ;; + *_armhf) + src=$sbase/main/installer-$arch/current/images/netboot + files='vmlinuz initrd.gz' + ;; esac pfile=$sbase/non-free/binary-$arch/Packages.gz @@ -89,28 +97,33 @@ for p in $packages; do rm -rf x done -# armhf requires a newer kernel than was in Wheezy for most -# platforms. Construct something suitable from the latest kernel in -# wheezy-backports. -if [ $arch = armhf ]; then +# Some platforms require a newer kernel than is in Debian. Construct +# something suitable from the latest kernel ($bpok=flavour) in +# backports. +case $suite_$arch in + wheezy_armhf) bpok=armmp; need_initramfs=y;; +esac +if [ x$bpok != x ]; then bp="$sbase-backports" - pfile=$bp/main/binary-armhf/Packages.gz + pfile=$bp/main/binary-$arch/Packages.gz fetch $pfile >Packages.gz - # Newer kernel often needs a newer initramfs-tools. Make that available - echo >&2 "collecting backports initramfs-tools" - pkgfile=`zcat Packages.gz | grep-dctrl -PX initramfs-tools -nsFilename | sort -n -r | head -n1` - rc=$? - set -e - if [ $rc != 0 ]; then fail "initramfs-tools package not found"; fi - fetch "$site/$pkgfile" >initramfs-tools.deb + if [ x$need_initramfs = xy ]; then + # Newer kernel often needs a newer initramfs-tools. Make that available + echo >&2 "collecting backports initramfs-tools" + pkgfile=`zcat Packages.gz | grep-dctrl -PX initramfs-tools -nsFilename | sort -n -r | head -n1` + rc=$? + set -e + if [ $rc -ne 0 ] || [ x$pkgfile = x ]; then fail "initramfs-tools package not found"; fi + fetch "$site/$pkgfile" >initramfs-tools.deb + fi set +e echo >&2 "collecting backports kernel" # Be careful to pickup the actual kernel package from the 'linux' # source and not a meta package from 'linux-latest' - pkgfile=`zcat Packages.gz | grep-dctrl -S linux | grep-dctrl -Pe ^linux-image-.*-armmp$ -nsFilename | sort -n -r | head -n1` + pkgfile=`zcat Packages.gz | grep-dctrl -S linux | grep-dctrl -Pe ^linux-image-.*-${bpok}$ -nsFilename | sort -n -r | head -n1` rc=$? set -e if [ $rc != 0 ]; then fail "backports kernel package not found"; fi @@ -143,11 +156,13 @@ if [ $arch = armhf ]; then |pax -x sv4cpio -s '%lib%/lib%' -d -w -M norm >../cpio; cd .. gzip -9nf cpio mv cpio.gz backports.cpio.gz - rm -rf backports-dtbs/ - mkdir backports-dtbs/ - mv x/usr/lib/linux-image-*-armmp/*.dtb backports-dtbs/ - tar --mtime=./x/usr/lib -cf backports-dtbs.tar backports-dtbs - gzip -9nf backports-dtbs.tar + if [ -d x/usr/lib/linux-image-*-${bpok}/ ] ; then + rm -rf backports-dtbs/ + mkdir backports-dtbs/ + mv x/usr/lib/linux-image-*-${bpok}/*.dtb backports-dtbs/ + tar --mtime=./x/usr/lib -cf backports-dtbs.tar backports-dtbs + gzip -9nf backports-dtbs.tar + fi rm -rf x fi diff --git a/mg-debian-installer-update-all b/mg-debian-installer-update-all index eca4a5f..241e2e3 100755 --- a/mg-debian-installer-update-all +++ b/mg-debian-installer-update-all @@ -24,7 +24,7 @@ set -e suite=`getconfig DebianSuite` fws=`getconfig DebianNonfreeFirmware` -arches="armhf amd64 i386" +arches="arm64 armhf amd64 i386" for arch in $arches ; do ./mg-debian-installer-update $suite $arch $fws diff --git a/ts-host-install b/ts-host-install index 2fea451..242bfb0 100755 --- a/ts-host-install +++ b/ts-host-install @@ -200,7 +200,7 @@ sub setup_pxeboot_firstboot($) { foreach my $kp (keys %{ $ho->{Flags} }) { # Backwards compatibility $kp = "need-kernel-deb-wheezy-backports" if $kp eq "need-kernel-deb-armmp"; - $kp =~ s/need-kernel-deb-$ho->{Suite}// or next; + $kp =~ s/need-kernel-deb-$ho->{Suite}-// or next; my $kern= "$ho->{Tftp}{Path}/$d_i/linux.$kp"; if (stat $kern) { logm("using kernel from: $kern"); @@ -249,7 +249,7 @@ END foreach my $kp (keys %{ $ho->{Flags} }) { # Backwards compatibility $kp = "need-kernel-deb-wheezy-backports" if $kp eq "need-kernel-deb-armmp"; - $kp =~ s/need-kernel-deb-$ho->{Suite}// or next; + $kp =~ s/need-kernel-deb-$ho->{Suite}-// or next; $dtbs = "fdtdir /$d_i/$kp-dtbs" if -e "$ho->{Tftp}{Path}/$d_i/$kp-dtbs"; -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.