From patchwork Tue May 19 19:02:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11558643 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 E49B260D for ; Tue, 19 May 2020 19:12:03 +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 CC52E2075F for ; Tue, 19 May 2020 19:12:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC52E2075F 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 1jb7e3-00081x-SL; Tue, 19 May 2020 19:11:19 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7e2-00080z-La for xen-devel@lists.xenproject.org; Tue, 19 May 2020 19:11:18 +0000 X-Inumbo-ID: 62b144ea-9a04-11ea-b07b-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::3]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 62b144ea-9a04-11ea-b07b-bc764e2007e4; Tue, 19 May 2020 19:10:21 +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 1jb7Vi-0001da-Nc; Tue, 19 May 2020 20:02:42 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 26/38] 20_linux_xen: Adhoc template substitution Date: Tue, 19 May 2020 20:02:18 +0100 Message-Id: <20200519190230.29519-27-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 file is a template that various build-time variables get substituted into. Make thos substitutions by hand (actually, by copying the values our file for stretch). And rename the file. So now we are using our file instead of the grub package's. But it is the same... Signed-off-by: Ian Jackson --- .../etc/grub.d/{20_linux_xen.in => 20_linux_xen} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename overlay-buster/etc/grub.d/{20_linux_xen.in => 20_linux_xen} (98%) mode change 100644 => 100755 diff --git a/overlay-buster/etc/grub.d/20_linux_xen.in b/overlay-buster/etc/grub.d/20_linux_xen old mode 100644 new mode 100755 similarity index 98% rename from overlay-buster/etc/grub.d/20_linux_xen.in rename to overlay-buster/etc/grub.d/20_linux_xen index 98ef163c..fb3ed82f --- a/overlay-buster/etc/grub.d/20_linux_xen.in +++ b/overlay-buster/etc/grub.d/20_linux_xen @@ -17,14 +17,14 @@ set -e # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix="@prefix@" -exec_prefix="@exec_prefix@" -datarootdir="@datarootdir@" +prefix="/usr" +exec_prefix="/usr" +datarootdir="/usr/share" . "$pkgdatadir/grub-mkconfig_lib" -export TEXTDOMAIN=@PACKAGE@ -export TEXTDOMAINDIR="@localedir@" +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" CLASS="--class gnu-linux --class gnu --class os --class xen" SUPPORTED_INITS="sysvinit:/lib/sysvinit/init systemd:/lib/systemd/systemd upstart:/sbin/upstart"