[PATCH 0/2] Xen: start using PACKAGECONFIG

[PATCH 0/2] Xen: start using PACKAGECONFIG

[Philip Tricca]

This is a first pass at cleaning up the DEPENDS and do_configure in
the xen_4.3.0 recipe. Adding XSM stuff made it clear that directly
interacting with DISTRO_FEATURES was the wrong way to do it. That and
when Chris and I ment up at LinuxCon he told me I should have used
PACKAGECONFIG in the first place :P

This small patch series is the first step to handling features (like
sdl) using PACKAGECONFIG.

Philip Tricca (2):
  Convert direct call to ./configure with oe_runconf and EXTRA_OECONF.
  Use PACKAGECONFIG to deal with XSM policy.

 recipes-extended/xen/xen_4.3.0.bb |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

-- 
1.7.10.4

[PATCH 1/2] Convert direct call to ./configure with oe_runconf and EXTRA_OECONF.

[Philip Tricca]

enable/disable stuff will eventually be replaced with appropriate
use of PACKAGECONFIG.

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-extended/xen/xen_4.3.0.bb |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/recipes-extended/xen/xen_4.3.0.bb b/recipes-extended/xen/xen_4.3.0.bb
index 078b39c..7a0e408 100644
--- a/recipes-extended/xen/xen_4.3.0.bb
+++ b/recipes-extended/xen/xen_4.3.0.bb
@@ -563,6 +563,17 @@ export CROSS_COMPILE="${TARGET_PREFIX}"
 # overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: unrecognized option '-Wl,-O1'"
 export LDFLAGS=""
 
+EXTRA_OECONF += " \
+    --exec-prefix=/usr \
+    --prefix=/usr \
+    --host=${HOST_SYS} \
+    --disable-stubdom \
+    --disable-ioemu-stubdom \
+    --disable-pv-grub \
+    --disable-xenstore-stubdom \
+    ${@base_contains('DISTRO_FEATURES', 'xsm', '--enable-xsmpolicy', '--disable-xsmpolicy',d)} \
+"
+
 do_configure() {
     # fixup qemu-xen-traditional pciutils check hardcoded to test ${includedir}/pci
     sed -i 's/\/usr\/include\/pci/$(STAGING_INCDIR)\/pci/g' ${S}/tools/qemu-xen-traditional/xen-hooks.mak
@@ -580,7 +591,7 @@ do_configure() {
     fi
 
     # do configure
-    ./configure --exec-prefix=/usr --prefix=/usr --host=${HOST_SYS} --disable-stubdom --disable-ioemu-stubdom --disable-pv-grub --disable-xenstore-stubdom "${@base_contains('DISTRO_FEATURES', 'xsm', '--enable-xsmpolicy', '--disable-xsmpolicy',d)}"
+    oe_runconf
 
     # seabios needs a patch to specify correct compiler - pull and patch Makefile
     make -C ${S}/tools/firmware seabios-dir
-- 
1.7.10.4

[PATCH 2/2] Use PACKAGECONFIG to deal with XSM policy.

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-extended/xen/xen_4.3.0.bb |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/xen/xen_4.3.0.bb b/recipes-extended/xen/xen_4.3.0.bb
index 7a0e408..09c25aa 100644
--- a/recipes-extended/xen/xen_4.3.0.bb
+++ b/recipes-extended/xen/xen_4.3.0.bb
@@ -20,7 +20,12 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
 
 inherit autotools gettext setuptools update-rc.d
 
-DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native libsdl ${@base_contains('DISTRO_FEATURES', 'xsm', 'checkpolicy-native', '', d )}"
+PACKAGECONFIG ??= " \
+    xsm \
+"
+PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
+
+DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native libsdl"
 
 # inherit setuptools adds python to RDEPENDS, override it
 RDEPENDS_${PN} = ""
@@ -571,7 +576,6 @@ EXTRA_OECONF += " \
     --disable-ioemu-stubdom \
     --disable-pv-grub \
     --disable-xenstore-stubdom \
-    ${@base_contains('DISTRO_FEATURES', 'xsm', '--enable-xsmpolicy', '--disable-xsmpolicy',d)} \
 "
 
 do_configure() {
-- 
1.7.10.4

Re: [PATCH 0/2] Xen: start using PACKAGECONFIG

[Bruce Ashfield]

On Mon, Oct 28, 2013 at 6:10 PM, Philip Tricca <flihp@twobit.us> wrote:
> This is a first pass at cleaning up the DEPENDS and do_configure in
> the xen_4.3.0 recipe. Adding XSM stuff made it clear that directly
> interacting with DISTRO_FEATURES was the wrong way to do it. That and
> when Chris and I ment up at LinuxCon he told me I should have used
> PACKAGECONFIG in the first place :P

:)

>
> This small patch series is the first step to handling features (like
> sdl) using PACKAGECONFIG.

Agreed. Small steps are good. This looks fine to me. I grabbed the series,
since no one has offered an objection!

Bruce

>
> Philip Tricca (2):
>   Convert direct call to ./configure with oe_runconf and EXTRA_OECONF.
>   Use PACKAGECONFIG to deal with XSM policy.
>
>  recipes-extended/xen/xen_4.3.0.bb |   19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
>
> --
> 1.7.10.4
>
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH 0/2] Xen: start using PACKAGECONFIG

[Chris Patterson]

[-- Attachment #1: Type: text/plain, Size: 1748 bytes --]

I would remove xsm from the default PACKAGECONFIG list.  As it stands with
the defaults, the recipe now requires checkpolicy-native (in meta-selinux)
to build.

Cheers,
-Chris

On Tue, Oct 29, 2013 at 2:20 PM, Bruce Ashfield <bruce.ashfield@gmail.com>wrote:

> On Mon, Oct 28, 2013 at 6:10 PM, Philip Tricca <flihp@twobit.us> wrote:
> > This is a first pass at cleaning up the DEPENDS and do_configure in
> > the xen_4.3.0 recipe. Adding XSM stuff made it clear that directly
> > interacting with DISTRO_FEATURES was the wrong way to do it. That and
> > when Chris and I ment up at LinuxCon he told me I should have used
> > PACKAGECONFIG in the first place :P
>
> :)
>
> >
> > This small patch series is the first step to handling features (like
> > sdl) using PACKAGECONFIG.
>
> Agreed. Small steps are good. This looks fine to me. I grabbed the series,
> since no one has offered an objection!
>
> Bruce
>
> >
> > Philip Tricca (2):
> >   Convert direct call to ./configure with oe_runconf and EXTRA_OECONF.
> >   Use PACKAGECONFIG to deal with XSM policy.
> >
> >  recipes-extended/xen/xen_4.3.0.bb |   19 +++++++++++++++++--
> >  1 file changed, 17 insertions(+), 2 deletions(-)
> >
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > meta-virtualization mailing list
> > meta-virtualization@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-virtualization
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>

[-- Attachment #2: Type: text/html, Size: 2851 bytes --]

Re: [PATCH 0/2] Xen: start using PACKAGECONFIG

[Philip Tricca]

Agree. PACKAGECONFIG is still new to me and I didn't realize this was
the net result. I'll send out a patch soon ... unless you beat me to it.

- Philip

On 11/04/2013 09:55 PM, Chris Patterson wrote:
> I would remove xsm from the default PACKAGECONFIG list.  As it stands
> with the defaults, the recipe now requires checkpolicy-native (in
> meta-selinux) to build.
> 
> Cheers,
> -Chris
> 
> On Tue, Oct 29, 2013 at 2:20 PM, Bruce Ashfield
> <bruce.ashfield@gmail.com <mailto:bruce.ashfield@gmail.com>> wrote:
> 
>     On Mon, Oct 28, 2013 at 6:10 PM, Philip Tricca <flihp@twobit.us
>     <mailto:flihp@twobit.us>> wrote:
>     > This is a first pass at cleaning up the DEPENDS and do_configure in
>     > the xen_4.3.0 recipe. Adding XSM stuff made it clear that directly
>     > interacting with DISTRO_FEATURES was the wrong way to do it. That and
>     > when Chris and I ment up at LinuxCon he told me I should have used
>     > PACKAGECONFIG in the first place :P
> 
>     :)
> 
>     >
>     > This small patch series is the first step to handling features (like
>     > sdl) using PACKAGECONFIG.
> 
>     Agreed. Small steps are good. This looks fine to me. I grabbed the
>     series,
>     since no one has offered an objection!
> 
>     Bruce
> 
>     >
>     > Philip Tricca (2):
>     >   Convert direct call to ./configure with oe_runconf and EXTRA_OECONF.
>     >   Use PACKAGECONFIG to deal with XSM policy.
>     >
>     >  recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb> |   19
>     +++++++++++++++++--
>     >  1 file changed, 17 insertions(+), 2 deletions(-)
>     >
>     > --
>     > 1.7.10.4
>     >
>     > _______________________________________________
>     > meta-virtualization mailing list
>     > meta-virtualization@yoctoproject.org
>     <mailto:meta-virtualization@yoctoproject.org>
>     > https://lists.yoctoproject.org/listinfo/meta-virtualization
> 
> 
> 
>     --
>     "Thou shalt not follow the NULL pointer, for chaos and madness await
>     thee at its end"
>     _______________________________________________
>     meta-virtualization mailing list
>     meta-virtualization@yoctoproject.org
>     <mailto:meta-virtualization@yoctoproject.org>
>     https://lists.yoctoproject.org/listinfo/meta-virtualization
> 
>