From: Ross Lagerwall <ross.lagerwall@citrix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xen.org
Subject: Re: [PATCH 2/3] Update to use a .config file
Date: Mon, 18 Jul 2016 10:33:49 +0100 [thread overview]
Message-ID: <b05566c2-a9c8-6c43-a0e1-0ad2a58d9cc7@citrix.com> (raw)
In-Reply-To: <20160716015522.GB18828@char.us.oracle.com>
On 07/16/2016 02:55 AM, Konrad Rzeszutek Wilk wrote:
>>> OK, I'll split it into two. Feel free to create a stable-47 branch in
>>> livepatch-build-tools.git with only the .config patch. Personally, I'd
>>> rather not spend much time backporting stuff to support a tech preview
>>> feature on an older branch.
>>
>> We will need to update the Wiki a bit too...
>>
>> What if I we do something simpler?
>
> And the offical patch:
>
> From 929a92b3dbb8467e0a69b50706b69fb206b51ff3 Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Fri, 15 Jul 2016 09:36:23 -0400
> Subject: [PATCH] Check .config for CONFIG_DEBUG. If not found use --xen-debug
> (if specified)
>
> Xen 4.8 ditched the 'debug=y' and now has CONFIG_DEBUG in the
> .config. To still support 4.7 lets just poke the .config
> file and see.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Is the intention that this gets applied on top of "[PATCH
LIVEPATCH-BUILD-TOOLS v2 1/3] Update to use a .config file" and that
"[PATCH LIVEPATCH-BUILD-TOOLS v2 2/3] Remove --xen-debug" is dropped?
If so, then the approach looks OK to me.
> ---
> livepatch-build | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/livepatch-build b/livepatch-build
> index 6254c29..2165e3b 100755
> --- a/livepatch-build
> +++ b/livepatch-build
> @@ -66,7 +66,7 @@ function build_full()
> {
> cd "${SRCDIR}/xen" || die
> make "-j$CPUS" clean &> "${OUTPUT}/build_full_clean.log" || die
> - make "-j$CPUS" debug="$XEN_DEBUG" &> "${OUTPUT}/build_full_compile.log" || die
> + make "-j$CPUS" "$XEN_DEBUG" &> "${OUTPUT}/build_full_compile.log" || die
$XEN_DEBUG needs to be unquoted, otherwise you get a build error from make:
make: *** empty string invalid as file name. Stop.
> cp xen-syms "$OUTPUT"
> }
>
> @@ -87,7 +87,7 @@ function build_special()
> cd "${SRCDIR}/xen" || die
> sed -i 's/CFLAGS += -nostdinc/CFLAGS += -nostdinc -ffunction-sections -fdata-sections/' Rules.mk
> sed -i 's/--section-alignment=0x200000/--section-alignment=0x1000/' arch/x86/Makefile
> - make "-j$CPUS" debug="$XEN_DEBUG" &> "${OUTPUT}/build_${name}_compile.log" || die
> + make "-j$CPUS" "$XEN_DEBUG" &> "${OUTPUT}/build_${name}_compile.log" || die
Same here.
> sed -i 's/CFLAGS += -nostdinc -ffunction-sections -fdata-sections/CFLAGS += -nostdinc/' Rules.mk
> sed -i 's/--section-alignment=0x1000/--section-alignment=0x200000/' arch/x86/Makefile
>
> @@ -165,7 +165,7 @@ usage() {
> echo " -j, --cpus Number of CPUs to use" >&2
> echo " -k, --skip Skip build or diff phase" >&2
> echo " -d, --debug Enable debug logging" >&2
> - echo " --xen-debug Build debug Xen" >&2
> + echo " --xen-debug Build debug Xen (if your .config does not have the options)" >&2
> echo " --xen-syms Build against a xen-syms" >&2
> echo " --depends Required build-id" >&2
> echo " --prelink Prelink" >&2
> @@ -277,6 +277,20 @@ if [ "${SKIP}" != "build" ]; then
> cp -f "${CONFIGFILE}" "${OUTPUT}/.config"
> cp -f "${OUTPUT}/.config" "xen/.config"
>
> + grep -q CONFIG_DEBUG "xen/.config"
> + if [ $? -eq 0 ]; then
> + if [ "$XEN_DEBUG" == "y" ]; then
> + grep -q "CONFIG_DEBUG=y" "xen/.config"
> + if [ $? -ne 0 ]; then
> + echo "CONFIG_DEBUG and --xen-debug mismatch!"
> + die
> + fi
This would be cleaner as a oneliner:
grep -q "CONFIG_DEBUG=y" "xen/.config" || die "CONFIG_DEBUG and
--xen-debug mismatch!"
--
Ross Lagerwall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-18 9:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 11:02 [PATCH 1/3] Don't accept fuzz when patching Ross Lagerwall
2016-06-10 11:02 ` [PATCH 2/3] Update to use a .config file Ross Lagerwall
2016-06-14 15:35 ` Konrad Rzeszutek Wilk
2016-06-15 8:08 ` Ross Lagerwall
2016-06-15 14:00 ` Konrad Rzeszutek Wilk
2016-07-14 8:05 ` Ross Lagerwall
2016-07-15 13:36 ` Konrad Rzeszutek Wilk
2016-07-16 1:55 ` Konrad Rzeszutek Wilk
2016-07-18 9:33 ` Ross Lagerwall [this message]
2016-07-18 10:28 ` Konrad Rzeszutek Wilk
2016-06-10 11:02 ` [PATCH 3/3] Update README.md Ross Lagerwall
2016-06-14 15:36 ` Konrad Rzeszutek Wilk
2016-06-13 10:08 ` [PATCH 1/3] Don't accept fuzz when patching George Dunlap
2016-06-13 10:16 ` Andrew Cooper
2016-06-13 10:57 ` George Dunlap
2016-06-13 10:23 ` Ross Lagerwall
2016-06-14 15:33 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b05566c2-a9c8-6c43-a0e1-0ad2a58d9cc7@citrix.com \
--to=ross.lagerwall@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.