From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kXajS-0001EZ-0Z for mharc-grub-devel@gnu.org; Tue, 27 Oct 2020 21:58:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXajO-0001Bc-Eu for grub-devel@gnu.org; Tue, 27 Oct 2020 21:58:31 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:43256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXajI-0007pw-66 for grub-devel@gnu.org; Tue, 27 Oct 2020 21:58:30 -0400 Received: by mail-pg1-x541.google.com with SMTP id r10so1841708pgb.10 for ; Tue, 27 Oct 2020 18:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uO53HjwsKEzsRHSCdFjLct6XVpGUvY8mW2uP3M54vEI=; b=SD/oPy7Nq6jAYzn1SW0Al3e52QH+jiCL7E/PvWhcmPf3jJqxTX+anEoM7SXuEj2Ru9 Q01HiEut+FUBewVBmvq/rM5tZTkeEFfZHYSbh+pNw64Qc5ZpDwAcI+I/3AYp25HiTuDK Bn8fuP/EJ3ri7hOEZ6HMPb3FCBPmx++C28ItQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uO53HjwsKEzsRHSCdFjLct6XVpGUvY8mW2uP3M54vEI=; b=XTJHtz7CQ16zvmzZa/RG8MW4lQO9GDbDSp/uKqPNozF6jAE3pLtF/bnqPPJbmw/gBA IhBYFOdM0sMWpUpQ+7nQFiKp3CWNwQ366Kfv89p8+cptEuAUxMNEeewU9g6HvZfwhmZK Ing27JzqzIhdmTAoEsNjtuY4YxY80EV6cYiLEpCjWH8aeryDzwiqhuhi+vXXhBHif5NB oNzNE2AzXMw4S1mDoya+dMactn/p55cnvra6hFMVbUxnn8HJr5/9M89QvPJwXORoaTD6 Q2hAT9rDygFvE+lnMksLTRMxw3vvzVlrpiHDIwnmUcALA3GpTLeK9LCGKsekGWHKU6lv OvzA== X-Gm-Message-State: AOAM531o8YPrx7gQPpEhpJ1QslSdfapmSv45AMLNT06443Yo9v+g5cjZ X6mHEgQuVVWJ2bvAK0e90Yuzv/DzSaHHHw== X-Google-Smtp-Source: ABdhPJz71lbA9fOCEeo+vGbyYaYiHBvaKgg/7fv7loRSPiRAAKJ1y9nThE2QNnfEnrkcJPopnJF3og== X-Received: by 2002:a65:6158:: with SMTP id o24mr4502289pgv.120.1603850302726; Tue, 27 Oct 2020 18:58:22 -0700 (PDT) Received: from localhost (2001-44b8-1113-6700-b4f7-e8d4-abaa-2197.static.ipv6.internode.on.net. [2001:44b8:1113:6700:b4f7:e8d4:abaa:2197]) by smtp.gmail.com with ESMTPSA id b5sm3299259pgi.55.2020.10.27.18.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 18:58:22 -0700 (PDT) From: Daniel Axtens To: grub-devel@gnu.org Cc: rashmica.g@gmail.com, alastair@d-silva.org, Daniel Axtens Subject: [PATCH v2 11/18] libtasn1: compile into asn1 module Date: Wed, 28 Oct 2020 12:57:28 +1100 Message-Id: <20201028015735.1131291-12-dja@axtens.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201028015735.1131291-1-dja@axtens.net> References: <20201028015735.1131291-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::541; envelope-from=dja@axtens.net; helo=mail-pg1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2020 01:58:32 -0000 Create a wrapper file that specifies the module license. Set up the makefile so it is built. Signed-off-by: Daniel Axtens --- 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 ad52e54098d6..7b248457ca7b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2542,3 +2542,18 @@ module = { common = commands/i386/wrmsr.c; enable = x86; }; + +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 000000000000..622ba942e33f --- /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 . + */ + +#include + +/* + * 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.25.1