[oe] [PATCH] netmap-modules: make deterministic builds for drivers
Martin Jansa
martin.jansa at gmail.com
Wed Nov 18 10:25:55 UTC 2015
On Wed, Nov 18, 2015 at 06:02:21PM +0800, jackie.huang at windriver.com wrote:
> From: Jackie Huang <jackie.huang at windriver.com>
>
> The driver builds are optional, but for deterministic builds,
> we should should be able to explicitly enable/disable the
> builds for them in a proper place (maybe in BSP).
> But we can't use PACKAGECONFIG since there is no option for
> each driver, and the options are:
> --no-drivers do not compile any driver
> --no-drivers= do not compile the given drivers (comma sep.)
> --drivers= only compile the given drivers (comma sep.)
>
> So use NETMAP_DRIVERS to list the needed drivers and add proper
> configs to EXTRA_OECONF, the default is no drivers, and all
> supported drivers are listed in NETMAP_ALL_DRIVERS.
>
> Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
> ---
> .../recipes-kernel/netmap/netmap-modules_git.bb | 31 +++++++++++++++++++++-
> 1 file changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
> index 6365fee..cfe5ce9 100644
> --- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
> +++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
> @@ -15,7 +15,36 @@ EXTRA_OECONF = "--kernel-dir=${STAGING_KERNEL_BUILDDIR} \
> --driver-suffix="-netmap" \
> "
>
> -EXTRA_OECONF += "--no-drivers=ixgbe --no-drivers=virtio_net.c"
> +# The driver builds are optional, but for deterministic builds,
> +# we should be able to explicitly enable/disable the builds
> +# for them in a proper place (maybe in BSP).
> +# But we can't use PACKAGECONFIG since there is no option for
> +# each driver, and the options are:
> +# --no-drivers do not compile any driver
> +# --no-drivers= do not compile the given drivers (comma sep.)
> +# --drivers= only compile the given drivers (comma sep.)
> +#
> +# So use NETMAP_DRIVERS and the following python code to add proper
> +# configs to EXTRA_OECONF and skip arch test for kernel modules.
> +#
> +# The default is no-drivers, and all supported drivers are listed
> +# in NETMAP_ALL_DRIVERS.
> +NETMAP_DRIVERS ??= ""
> +NETMAP_ALL_DRIVERS = "ixgbe igb e1000e e1000 veth.c forcedeth.c virtio_net.c r8169.c"
> +
> +python __anonymous () {
> + drivers_list = d.getVar("NETMAP_DRIVERS", True).split()
> + all_drivers_list = d.getVar("NETMAP_ALL_DRIVERS", True).split()
> + config_drivers = "--drivers=" + ",".join(drivers_list)
> +
> + extra_oeconf_drivers = bb.utils.contains_any('NETMAP_DRIVERS', all_drivers_list, config_drivers, '--no-drivers', d)
> + d.appendVar("EXTRA_OECONF", extra_oeconf_drivers)
This part looks good to me, thanks for fixing virtio_net.c change (I've
merged that one by accident).
> +
> + # skip the arch test for kernel modules
> + if drivers_list:
> + for driver in drivers_list:
> + d.setVar("INSANE_SKIP_kernel-module-%s-netmap" % driver, "arch")
Why is this needed? Shouldn't the kernel modules build with correct
architecture? And e.g. r8169.c creates kernel-module-r8169.c-netmap package?
I hope the .c is stripped somewhere in the build.
> +}
>
> LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,-O1', '')}"
> LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,--as-needed', '')}"
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20151118/e8b97a1e/attachment-0002.sig>
More information about the Openembedded-devel
mailing list