On Fri, Jun 14, 2024 at 02:45:39PM +0800, Gary Lin wrote:
> 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>
> Reviewed-by: Vladimir Serbinenko <phco...@gmail.com>
Due to amount of changes to the patch I think this RB should be dropped now.
Though Reviewed-by: Daniel Kiper <daniel.ki...@oracle.com>...
Two nits below...
> ---
> autogen.sh | 16 ++++++++++++++++
> grub-core/Makefile.core.def | 15 +++++++++++++++
> grub-core/lib/libtasn1_wrap/wrap.c | 26 ++++++++++++++++++++++++++
> 3 files changed, 57 insertions(+)
> create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c
>
> diff --git a/autogen.sh b/autogen.sh
> index 195daa541..43272722f 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -51,6 +51,22 @@ for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c
> mpih-mul1.c mpih-mul2.c mpih-mul
> cp grub-core/lib/libgcrypt-grub/mpi/generic/"$x"
> grub-core/lib/libgcrypt-grub/mpi/"$x"
> done
>
> +echo "Importing libtasn1..."
> +if [ -d grub-core/lib/libtasn1-grub ]; then
> + rm -rf grub-core/lib/libtasn1-grub
> +fi
> +
> +mkdir -p grub-core/lib/libtasn1-grub/lib
> +cp grub-core/lib/libtasn1/lib/*.[ch] grub-core/lib/libtasn1-grub/lib
> +cp grub-core/lib/libtasn1/libtasn1.h grub-core/lib/libtasn1-grub/
> +
> +for patch in \
> + 0001-libtasn1-disable-code-not-needed-in-grub.patch \
> + 0002-libtasn1-changes-for-grub-compatibility.patch \
> + 0003-libtasn1-fix-the-potential-buffer-overrun.patch ; do
> + patch -p1 -i grub-core/lib/libtasn1-patches/$patch
> +done
> +
> echo "Generating Automake input..."
>
> # Automake doesn't like including files from a path outside the project.
> diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
> index 7fa9446bd..89944004b 100644
> --- a/grub-core/Makefile.core.def
> +++ b/grub-core/Makefile.core.def
> @@ -2605,3 +2605,18 @@ module = {
> enable = efi;
> depends = part_gpt;
> };
> +
> +module = {
> + name = asn1;
> + common = lib/libtasn1-grub/lib/decoding.c;
> + common = lib/libtasn1-grub/lib/coding.c;
> + common = lib/libtasn1-grub/lib/element.c;
> + common = lib/libtasn1-grub/lib/structure.c;
> + common = lib/libtasn1-grub/lib/parser_aux.c;
> + common = lib/libtasn1-grub/lib/gstr.c;
> + common = lib/libtasn1-grub/lib/errors.c;
> + common = lib/libtasn1_wrap/wrap.c;
> + cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
> + // -Wno-type-limits comes from libtasn1's configure.ac
Please use "/* ... */" for comments.
> + cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)
> -I$(srcdir)/lib/libtasn1-grub -I$(srcdir)/lib/libtasn1-grub/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
s/Grub/GRUB/
Daniel
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
