LGTM
Reviewed-by: Vladimir Serbinenko <phco...@gmail.com>
Le mar. 16 janv. 2024, 12:22, Gary Lin via Grub-devel <grub-devel@gnu.org>
a écrit :
> From: Daniel Axtens <d...@axtens.net>
>
> Create a wrapper file that specifies the module license.
> Set up the makefile so it is built.
>
> Signed-off-by: Daniel Axtens <d...@axtens.net>
> Signed-off-by: Gary Lin <g...@suse.com>
> ---
> grub-core/Makefile.core.def | 15 +++++++++++++++
> grub-core/lib/libtasn1_wrap/wrap.c | 26 ++++++++++++++++++++++++++
> 2 files changed, 41 insertions(+)
> create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c
>
> diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
> index 1571421d7..b1294e0f7 100644
> --- a/grub-core/Makefile.core.def
> +++ b/grub-core/Makefile.core.def
> @@ -2595,3 +2595,18 @@ module = {
> efi = commands/bli.c;
> enable = efi;
> };
> +
> +module = {
> + name = asn1;
> + common = lib/libtasn1/lib/decoding.c;
> + common = lib/libtasn1/lib/coding.c;
> + common = lib/libtasn1/lib/element.c;
> + common = lib/libtasn1/lib/structure.c;
> + common = lib/libtasn1/lib/parser_aux.c;
> + common = lib/libtasn1/lib/gstr.c;
> + common = lib/libtasn1/lib/errors.c;
> + common = lib/libtasn1_wrap/wrap.c;
> + cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
> + // -Wno-type-limits comes from libtasn1's configure.ac
> + cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)
> -I$(srcdir)/lib/libtasn1/lib -Wno-type-limits';
> +};
> diff --git a/grub-core/lib/libtasn1_wrap/wrap.c
> b/grub-core/lib/libtasn1_wrap/wrap.c
> new file mode 100644
> index 000000000..622ba942e
> --- /dev/null
> +++ b/grub-core/lib/libtasn1_wrap/wrap.c
> @@ -0,0 +1,26 @@
> +/*
> + * GRUB -- GRand Unified Bootloader
> + * Copyright (C) 2020 IBM Corporation
> + *
> + * GRUB is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation, either version 3 of the License, or
> + * (at your option) any later version.
> + *
> + * GRUB is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <grub/dl.h>
> +
> +/*
> + * libtasn1 is provided under LGPL2.1+, which is compatible
> + * with GPL3+. As Grub as a whole is under GPL3+, this module
> + * is therefore under GPL3+ also.
> + */
> +GRUB_MOD_LICENSE ("GPLv3+");
> --
> 2.35.3
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
>
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
