From patchwork Tue May 19 19:02:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11558595 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A339F60D for ; Tue, 19 May 2020 19:09:56 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8A9302075F for ; Tue, 19 May 2020 19:09:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A9302075F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7c2-0005Zu-KO; Tue, 19 May 2020 19:09:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7c1-0005Zo-Gq for xen-devel@lists.xenproject.org; Tue, 19 May 2020 19:09:13 +0000 X-Inumbo-ID: 37edfa64-9a04-11ea-9887-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::3]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 37edfa64-9a04-11ea-9887-bc764e2007e4; Tue, 19 May 2020 19:09:10 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1jb7Vj-0001da-A8; Tue, 19 May 2020 20:02:43 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 29/38] mg-debian-installer-update: support overlay-intramfs-SUITE Date: Tue, 19 May 2020 20:02:21 +0100 Message-Id: <20200519190230.29519-30-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519190230.29519-1-ian.jackson@eu.citrix.com> References: <20200519190230.29519-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This lets us patch the installer more easily. No uses yet. Signed-off-by: Ian Jackson --- mg-debian-installer-update | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/mg-debian-installer-update b/mg-debian-installer-update index f1e682f9..fb4fe2ab 100755 --- a/mg-debian-installer-update +++ b/mg-debian-installer-update @@ -33,6 +33,8 @@ sbase=$site/dists/$suite src=$sbase/main/installer-$arch/current/images/netboot/ +osstest_dir="$(pwd)" + case ${suite}_${arch} in lenny_armhf|squeeze_armhf|lenny_arm64|squeeze_arm64|wheezy_arm64) # No such thing. @@ -188,6 +190,24 @@ if [ "x$specialkernel" != x ]; then rm -rf x fi +overlay_initrd=$osstest_dir/overlay-initrd-$suite +if [ -e "$overlay_initrd" ]; then + for f in $files; do + s=${f/:*} ; d=${f/*:} + case "$d" in + *initrd*) + echo "adding $overlay_initrd to $d" + ( + set -e + cd "$overlay_initrd" + find -print0 | cpio -0 -Hnewc -o \ + | gzip -9nf + ) >>$d.new + ;; + esac + done +fi + for f in $files; do s=${f/:*} ; d=${f/*:} mv -f $d.new $d