Christoph Egger
2013-May-15 14:05 UTC
[PATCH] build system: build kernels subsystem on Linux only
commit d59122a365ad40c3ff59a0be7427cccbc81aaa4a
Author: Christoph Egger <chegger@amazon.de>
Date: Wed Mar 20 13:46:38 2013 +0000
build: enable kernels subsystem on Linux only
Signed-off-by: Christoph Egger <chegger@amazon.de>
diff --git a/Makefile b/Makefile
index 5a7107e..e47f29c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
all: dist
-include config/Toplevel.mk
-SUBSYSTEMS?=xen kernels tools stubdom docs
+SUBSYSTEMS?=xen tools stubdom docs
TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS))
TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS))
diff --git a/configure.ac b/configure.ac
index ce06dad..9aafb8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,18 @@ case "$host_cpu" in
;;
esac
+dnl Enable kernel subsystem on Linux only
+case "$host_os" in
+ Linux)
+ os_enable_kernels=y
+ ;;
+ *)
+ os_enable_kernels=n
+ ;;
+esac
+
AX_SUBSYSTEM_DEFAULT_ENABLE([xen])
-AX_SUBSYSTEM_DEFAULT_ENABLE([kernels])
+AX_SUBSYSTEM_CONDITIONAL([kernels], $os_enable_kernels)
AX_SUBSYSTEM_DEFAULT_ENABLE([tools])
AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom)
AX_SUBSYSTEM_DEFAULT_ENABLE([docs])
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
Ian Campbell
2013-May-15 14:36 UTC
Re: [PATCH] build system: build kernels subsystem on Linux only
On Wed, 2013-05-15 at 16:05 +0200, Christoph Egger wrote:> commit d59122a365ad40c3ff59a0be7427cccbc81aaa4a > Author: Christoph Egger <chegger@amazon.de> > Date: Wed Mar 20 13:46:38 2013 +0000 > > build: enable kernels subsystem on Linux onlyThanks. These targets have been pretty useless even on Linux for ages, really they are an artefact of the time when Xen was an out of tree patch set. I think we should just disable them by default i.e. s/DEFAULT_ENABLE/DEFAULT_DISABLE/ plus the Makefile hunk of your patch. Ian.> diff --git a/Makefile b/Makefile > index 5a7107e..e47f29c 100644 > --- a/Makefile > +++ b/Makefile > @@ -7,7 +7,7 @@ > all: dist > > -include config/Toplevel.mk > -SUBSYSTEMS?=xen kernels tools stubdom docs > +SUBSYSTEMS?=xen tools stubdom docs > TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS)) > TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS)) > > diff --git a/configure.ac b/configure.ac > index ce06dad..9aafb8a 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -22,8 +22,18 @@ case "$host_cpu" in > ;; > esac > > +dnl Enable kernel subsystem on Linux only > +case "$host_os" in > + Linux) > + os_enable_kernels=y > + ;; > + *) > + os_enable_kernels=n > + ;; > +esac > + > AX_SUBSYSTEM_DEFAULT_ENABLE([xen]) > -AX_SUBSYSTEM_DEFAULT_ENABLE([kernels]) > +AX_SUBSYSTEM_CONDITIONAL([kernels], $os_enable_kernels) > AX_SUBSYSTEM_DEFAULT_ENABLE([tools]) > AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom) > AX_SUBSYSTEM_DEFAULT_ENABLE([docs])
Ian Campbell
2013-May-30 09:09 UTC
[PATCH] build: disable building kernel subsystem by default.
This support is obsolete and harks back to the days of out of tree Linux kernel trees. I think this could really be deleted entirely but for 4.3 lets just disable. The list of kernels to build is empty by default anyway. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Christoph Egger <chegger@amazon.de> Cc: Ian Jackson <Ian.Jackson@eu.citrix.com> Cc: George Dunlap <george.dunlap@eu.citrix.com> --- As well as George''s release Ack this needs confirmation from Ian J that it isn''t going to confuse the test system. --- Makefile | 2 +- configure | 5 ++--- configure.ac | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5a7107e..e47f29c 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ all: dist -include config/Toplevel.mk -SUBSYSTEMS?=xen kernels tools stubdom docs +SUBSYSTEMS?=xen tools stubdom docs TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS)) TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS)) diff --git a/configure b/configure index d15b539..07cac69 100755 --- a/configure +++ b/configure @@ -1245,7 +1245,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-xen Disable build and install of xen - --disable-kernels Disable build and install of kernels + --enable-kernels Enable build and install of kernels --disable-tools Disable build and install of tools --enable-stubdom Enable build and install of stubdom --disable-docs Disable build and install of docs @@ -1892,8 +1892,7 @@ fi else -kernels=y -SUBSYSTEMS="$SUBSYSTEMS kernels" +kernels=n fi diff --git a/configure.ac b/configure.ac index ce06dad..1164fbf 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ case "$host_cpu" in esac AX_SUBSYSTEM_DEFAULT_ENABLE([xen]) -AX_SUBSYSTEM_DEFAULT_ENABLE([kernels]) +AX_SUBSYSTEM_DEFAULT_DISABLE([kernels]) AX_SUBSYSTEM_DEFAULT_ENABLE([tools]) AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom) AX_SUBSYSTEM_DEFAULT_ENABLE([docs]) -- 1.7.2.5
George Dunlap
2013-May-30 09:40 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On 05/30/2013 10:09 AM, Ian Campbell wrote:> This support is obsolete and harks back to the days of out of tree Linux > kernel trees. > > I think this could really be deleted entirely but for 4.3 lets just disable. > The list of kernels to build is empty by default anyway. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Cc: Christoph Egger <chegger@amazon.de> > Cc: Ian Jackson <Ian.Jackson@eu.citrix.com> > Cc: George Dunlap <george.dunlap@eu.citrix.com>Does anything actually get built by default? I''m pretty sure "make deb" doesn''t clone me any Linux trees... Anyway, re release, and the intended effect: Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
Ian Campbell
2013-May-30 10:03 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On Thu, 2013-05-30 at 10:40 +0100, George Dunlap wrote:> On 05/30/2013 10:09 AM, Ian Campbell wrote: > > This support is obsolete and harks back to the days of out of tree Linux > > kernel trees. > > > > I think this could really be deleted entirely but for 4.3 lets just disable. > > The list of kernels to build is empty by default anyway. > > > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > Cc: Christoph Egger <chegger@amazon.de> > > Cc: Ian Jackson <Ian.Jackson@eu.citrix.com> > > Cc: George Dunlap <george.dunlap@eu.citrix.com> > > Does anything actually get built by default?Nope, the list is empty, see config/Linux.mk:KERNELS => I''m pretty sure "make deb" > doesn''t clone me any Linux trees... > > Anyway, re release, and the intended effect: > > Acked-by: George Dunlap <george.dunlap@eu.citrix.com>Thanks. Ian.
Egger, Christoph
2013-May-30 10:32 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On 30.05.13 11:09, Ian Campbell wrote:> This support is obsolete and harks back to the days of out of tree Linux > kernel trees. > > I think this could really be deleted entirely but for 4.3 lets just disable. > The list of kernels to build is empty by default anyway. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Cc: Christoph Egger <chegger@amazon.de> > Cc: Ian Jackson <Ian.Jackson@eu.citrix.com> > Cc: George Dunlap <george.dunlap@eu.citrix.com>Acked-by: Christoph Egger <chegger@amazon.de>> --- > As well as George''s release Ack this needs confirmation from Ian J that it > isn''t going to confuse the test system. > --- > Makefile | 2 +- > configure | 5 ++--- > configure.ac | 2 +- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/Makefile b/Makefile > index 5a7107e..e47f29c 100644 > --- a/Makefile > +++ b/Makefile > @@ -7,7 +7,7 @@ > all: dist > > -include config/Toplevel.mk > -SUBSYSTEMS?=xen kernels tools stubdom docs > +SUBSYSTEMS?=xen tools stubdom docs > TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS)) > TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS)) > > diff --git a/configure b/configure > index d15b539..07cac69 100755 > --- a/configure > +++ b/configure > @@ -1245,7 +1245,7 @@ Optional Features: > --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) > --enable-FEATURE[=ARG] include FEATURE [ARG=yes] > --disable-xen Disable build and install of xen > - --disable-kernels Disable build and install of kernels > + --enable-kernels Enable build and install of kernels > --disable-tools Disable build and install of tools > --enable-stubdom Enable build and install of stubdom > --disable-docs Disable build and install of docs > @@ -1892,8 +1892,7 @@ fi > else > > > -kernels=y > -SUBSYSTEMS="$SUBSYSTEMS kernels" > +kernels=n > > > fi > diff --git a/configure.ac b/configure.ac > index ce06dad..1164fbf 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -23,7 +23,7 @@ case "$host_cpu" in > esac > > AX_SUBSYSTEM_DEFAULT_ENABLE([xen]) > -AX_SUBSYSTEM_DEFAULT_ENABLE([kernels]) > +AX_SUBSYSTEM_DEFAULT_DISABLE([kernels]) > AX_SUBSYSTEM_DEFAULT_ENABLE([tools]) > AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom) > AX_SUBSYSTEM_DEFAULT_ENABLE([docs]) >
Ian Jackson
2013-May-30 11:22 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
Ian Campbell writes ("[Xen-devel] [PATCH] build: disable building kernel
subsystem by default."):> This support is obsolete and harks back to the days of out of tree Linux
> kernel trees.
...> As well as George''s release Ack this needs confirmation from Ian J
that it
> isn''t going to confuse the test system.
This will break the test system''s build of the ancient 2.6.18 kernels.
Everything else will be fine. How about I just drop those ?
We should probably retain buildconfigs/enable-xen-config and the
things it depends on. At the moment the test system uses that as part
of its arrangements for generating the kernel config - although
looking at what osstest does it does seem like the settings in
buildconfigs may be a bit out of date.
Ian.
Ian Campbell
2013-May-30 11:25 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On Thu, 2013-05-30 at 12:22 +0100, Ian Jackson wrote:> Ian Campbell writes ("[Xen-devel] [PATCH] build: disable building kernel subsystem by default."): > > This support is obsolete and harks back to the days of out of tree Linux > > kernel trees. > ... > > As well as George''s release Ack this needs confirmation from Ian J that it > > isn''t going to confuse the test system. > > This will break the test system''s build of the ancient 2.6.18 kernels. > Everything else will be fine. How about I just drop those ?Or you could safely add "--enable-kernels" to your existing runes (won''t harm the current tree). However the fact that we need to frotz with the test system at all suggests to me that this change is not 4.3 material at this stage.> We should probably retain buildconfigs/enable-xen-config and the > things it depends on. At the moment the test system uses that as part > of its arrangements for generating the kernel config - although > looking at what osstest does it does seem like the settings in > buildconfigs may be a bit out of date.enable-xen-config stopped getting updated (I''d forgotten it even existed) while we were still using Jeremy''s pvops 2.6.32 branch I think, it almost certainly hasn''t kept up with upstream branches. Ian.
Ian Jackson
2013-May-30 11:40 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
Ian Campbell writes ("Re: [Xen-devel] [PATCH] build: disable building
kernel subsystem by default."):> On Thu, 2013-05-30 at 12:22 +0100, Ian Jackson wrote:
> > This will break the test system''s build of the ancient 2.6.18
kernels.
> > Everything else will be fine. How about I just drop those ?
>
> Or you could safely add "--enable-kernels" to your existing runes
(won''t
> harm the current tree).
Yes. I''m more inclined to drop the shonky build-via-xen thing though.
The 2.6.18 tests haven''t shown us anything interesting for a very long
time.
> However the fact that we need to frotz with the test system at all
> suggests to me that this change is not 4.3 material at this stage.
Perhaps.
> > We should probably retain buildconfigs/enable-xen-config and the
> > things it depends on. At the moment the test system uses that as part
> > of its arrangements for generating the kernel config - although
> > looking at what osstest does it does seem like the settings in
> > buildconfigs may be a bit out of date.
>
> enable-xen-config stopped getting updated (I''d forgotten it even
> existed) while we were still using Jeremy''s pvops 2.6.32 branch I
think,
> it almost certainly hasn''t kept up with upstream branches.
Perhaps I should transpose its contents into the test system, which
already has a bunch of things it knows to add that enable-xen-config
doesn''t.
Ian.
Ian Campbell
2013-May-30 11:44 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On Thu, 2013-05-30 at 12:40 +0100, Ian Jackson wrote:> Ian Campbell writes ("Re: [Xen-devel] [PATCH] build: disable building kernel subsystem by default."): > > On Thu, 2013-05-30 at 12:22 +0100, Ian Jackson wrote: > > > This will break the test system''s build of the ancient 2.6.18 kernels. > > > Everything else will be fine. How about I just drop those ? > > > > Or you could safely add "--enable-kernels" to your existing runes (won''t > > harm the current tree). > > Yes. I''m more inclined to drop the shonky build-via-xen thing though. > The 2.6.18 tests haven''t shown us anything interesting for a very long > time.Jan does still commits patches there, so ultimately I think it is up to him if he thinks it still requires testing? Do we only build them and not run them?> > However the fact that we need to frotz with the test system at all > > suggests to me that this change is not 4.3 material at this stage. > > Perhaps. > > > > We should probably retain buildconfigs/enable-xen-config and the > > > things it depends on. At the moment the test system uses that as part > > > of its arrangements for generating the kernel config - although > > > looking at what osstest does it does seem like the settings in > > > buildconfigs may be a bit out of date. > > > > enable-xen-config stopped getting updated (I''d forgotten it even > > existed) while we were still using Jeremy''s pvops 2.6.32 branch I think, > > it almost certainly hasn''t kept up with upstream branches. > > Perhaps I should transpose its contents into the test system, which > already has a bunch of things it knows to add that enable-xen-config > doesn''t.That sounds like a good idea. Ian.
Christoph Egger
2013-May-30 12:36 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On 30.05.13 13:22, Ian Jackson wrote:> Ian Campbell writes ("[Xen-devel] [PATCH] build: disable building kernel subsystem by default."): >> This support is obsolete and harks back to the days of out of tree Linux >> kernel trees. > ... >> As well as George''s release Ack this needs confirmation from Ian J that it >> isn''t going to confuse the test system. > > This will break the test system''s build of the ancient 2.6.18 kernels. > Everything else will be fine. How about I just drop those ?The purpose of my original patch was to prevent 2.6.18 kernel to be build on non-Linux platforms. Christoph> > We should probably retain buildconfigs/enable-xen-config and the > things it depends on. At the moment the test system uses that as part > of its arrangements for generating the kernel config - although > looking at what osstest does it does seem like the settings in > buildconfigs may be a bit out of date. > > Ian. >
Ian Campbell
2013-May-30 13:02 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On Thu, 2013-05-30 at 14:36 +0200, Christoph Egger wrote:> On 30.05.13 13:22, Ian Jackson wrote: > > Ian Campbell writes ("[Xen-devel] [PATCH] build: disable building kernel subsystem by default."): > >> This support is obsolete and harks back to the days of out of tree Linux > >> kernel trees. > > ... > >> As well as George''s release Ack this needs confirmation from Ian J that it > >> isn''t going to confuse the test system. > > > > This will break the test system''s build of the ancient 2.6.18 kernels. > > Everything else will be fine. How about I just drop those ? > > The purpose of my original patch was to prevent 2.6.18 kernel to be > build on non-Linux platforms.But the 2.6.18 kernel isn''t built by default even on Linux, so why on earth are you seeing it on NetBSD? What build target(s) do you use? AFAICT the only one which should cause any Linux kernel to be built in the default case is "make linux26". None of dist or world etc should be building a kernel unless you''ve set something in Config.mk or .config or edited something under config/*.mk. Ian.
Pasi Kärkkäinen
2013-May-30 13:18 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On Thu, May 30, 2013 at 02:02:44PM +0100, Ian Campbell wrote:> On Thu, 2013-05-30 at 14:36 +0200, Christoph Egger wrote: > > On 30.05.13 13:22, Ian Jackson wrote: > > > Ian Campbell writes ("[Xen-devel] [PATCH] build: disable building kernel subsystem by default."): > > >> This support is obsolete and harks back to the days of out of tree Linux > > >> kernel trees. > > > ... > > >> As well as George''s release Ack this needs confirmation from Ian J that it > > >> isn''t going to confuse the test system. > > > > > > This will break the test system''s build of the ancient 2.6.18 kernels. > > > Everything else will be fine. How about I just drop those ? > > > > The purpose of my original patch was to prevent 2.6.18 kernel to be > > build on non-Linux platforms. > > But the 2.6.18 kernel isn''t built by default even on Linux, so why on > earth are you seeing it on NetBSD? > > What build target(s) do you use? AFAICT the only one which should cause > any Linux kernel to be built in the default case is "make linux26". None > of dist or world etc should be building a kernel unless you''ve set > something in Config.mk or .config or edited something under config/*.mk. >iirc "make world" builds kernels.. -- Pasi
Ian Jackson
2013-May-30 13:18 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
Ian Campbell writes ("Re: [Xen-devel] [PATCH] build: disable building
kernel subsystem by default."):> On Thu, 2013-05-30 at 12:40 +0100, Ian Jackson wrote:
> > Yes. I''m more inclined to drop the shonky build-via-xen
thing though.
> > The 2.6.18 tests haven''t shown us anything interesting for a
very long
> > time.
>
> Jan does still commits patches there, so ultimately I think it is up to
> him if he thinks it still requires testing?
>
> Do we only build them and not run them?
Indeed; we don''t run any actual tests.
> > Perhaps I should transpose its contents into the test system, which
> > already has a bunch of things it knows to add that enable-xen-config
> > doesn''t.
>
> That sounds like a good idea.
I''ll put it on my todo list...
Ian.
Ian Campbell
2013-May-30 13:34 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On Thu, 2013-05-30 at 16:18 +0300, Pasi Kärkkäinen wrote:> On Thu, May 30, 2013 at 02:02:44PM +0100, Ian Campbell wrote: > > On Thu, 2013-05-30 at 14:36 +0200, Christoph Egger wrote: > > > On 30.05.13 13:22, Ian Jackson wrote: > > > > Ian Campbell writes ("[Xen-devel] [PATCH] build: disable building kernel subsystem by default."): > > > >> This support is obsolete and harks back to the days of out of tree Linux > > > >> kernel trees. > > > > ... > > > >> As well as George's release Ack this needs confirmation from Ian J that it > > > >> isn't going to confuse the test system. > > > > > > > > This will break the test system's build of the ancient 2.6.18 kernels. > > > > Everything else will be fine. How about I just drop those ? > > > > > > The purpose of my original patch was to prevent 2.6.18 kernel to be > > > build on non-Linux platforms. > > > > But the 2.6.18 kernel isn't built by default even on Linux, so why on > > earth are you seeing it on NetBSD? > > > > What build target(s) do you use? AFAICT the only one which should cause > > any Linux kernel to be built in the default case is "make linux26". None > > of dist or world etc should be building a kernel unless you've set > > something in Config.mk or .config or edited something under config/*.mk. > > > > iirc "make world" builds kernels..make world == make {clean,kdelete,dist}, I use dist all the time and it doesn't build any kernels, so unless clean or kdelete are doing it... Update: I've tried world, it doesn't build kernels for me. In any case the list of kernels to build is in config/Linux.mk, which I sure hope isn't being looked at on other platforms. Even if I try and build the kernels manually: $ make kernels for i in ; do make $i-install || exit 1; done $ Christoph, what does this command do for you? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Pasi Kärkkäinen
2013-May-30 13:59 UTC
Re: [PATCH] build: disable building kernel subsystem by default.
On Thu, May 30, 2013 at 02:34:01PM +0100, Ian Campbell wrote:> > > > iirc "make world" builds kernels.. > > make world == make {clean,kdelete,dist}, I use dist all the time and it > doesn''t build any kernels, so unless clean or kdelete are doing it... > Update: I''ve tried world, it doesn''t build kernels for me. >Hmm, I guess that''s only in older Xen versions then. http://wiki.xen.org/wiki/Xen_4.0_Release_Notes That suggests "make world" in Xen 4.0 builds a pvops kernel. Sorry for the noise :) -- Pasi