From patchwork Thu Apr 4 09:46:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5p2O5Zu9?= X-Patchwork-Id: 1077024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l69EATHt"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZMKcSMVr"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44ZdQG1q7Vz9sMQ for ; Thu, 4 Apr 2019 20:47:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Gl3atenWGDd2JAMOQNq+nC8hUwAH0obm+L9X4h43tlQ=; b=l69EATHtu50gL51Ip4+JzS7n4X df+4oonZmZX1XiYKrkgZYogD2b8aLqe1KHI1npxMtdn++uK+Hqdicpd82B/K4KP3hmFBEA2m2Brcp EaU0jPZXrYqVSqe8pw8Wxoa4NHrV1dyPem7+3Vyqssiyr1J0sOyc/ENUpHbikJm7837lHa0rvTSID rOa1EiqvKxSWwZKW2aZyYVq8kvOhJRrcdKH6xaDnBVJVOXbvsvjPrPPP55z2Al+XCScNUV0KioycT O0tTGFPBwlPXL91NyS3NGmhrzMCRuof5QRn0+2Lr/b80R+7cIlA/scI/C8VwjmUOrG0cPbM7tPpX4 8tOQr1cw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hByxK-0000UY-4q; Thu, 04 Apr 2019 09:46:46 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hByxA-0000KU-AM for openwrt-devel@lists.openwrt.org; Thu, 04 Apr 2019 09:46:38 +0000 Received: by mail-pl1-x642.google.com with SMTP id y6so913844plt.1 for ; Thu, 04 Apr 2019 02:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zLCPHmuOk1Oe4xyB3NGOZ/KlDkUCUVJsBfWK+Nwr2wE=; b=ZMKcSMVrf4yjQuLzO/dtUD8dzjcvd5uNBRLfQzWyvyx9RjShNa1jTu7zSsAfFplwA2 thHav/T2Fo2UkPETTV+E4arKits5XlOCX2FxvmTGLWeZhyGDd7vjyEhAORgxPaP8HYuo /YEKsv/YyaleMJIS/QusNkH8CkC7ZLVeGqfTjx0yJEyn8vQtlWX61YFnuhFiRQLlZV5I HXhCbtp1QnqIgHr2a0Z5Lwl8g7Sk9s1qHoTF2yOIyZ/Q8Mk4p000RE0nVfmn5XJDalfO EwWdZdRyLBzpXMtJot30zeZFgnjRU8H0ijZczsMiELIslAU11Qy9c+XuqtQK9mfaGwLd xqjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zLCPHmuOk1Oe4xyB3NGOZ/KlDkUCUVJsBfWK+Nwr2wE=; b=M1m7qlpgTpl5wqBYJPWckux4CMs2JVzmIcTgxK/RAIBuhpiQnAAOKRM/gBn23z6UZv xcLLLWqeNS4rA7P9t6J2CiSufnd0a4/7ufGpIiA6emSMdg05BRdJbBSb8y3Oa77S8NVI owEFbeYssehgG2zgx0DmWIUe3xARvCME1mimVDa2NDyUuMxYq8uX972PXA/RM82sG1Fe kc3CZOUFAMUDkOazrFw845yMipAOkQJ8txgAMhm2Yuk0eZA9eqa0AM8CfSKKtUgX3dUO 5kNV09uMC7PoEib7NmjT3wBwgAeBQJL+pWCLe9ePekWhPcrSYmqHyZMnQoFYKwaU70eg hMaQ== X-Gm-Message-State: APjAAAVsRZUhRZjFCnKRyomphswBXExndqU/y43grmE2G6itRogOTCNu AWLWIav9JvymDIa7ytQqVgu7A7cy X-Google-Smtp-Source: APXvYqxEZG5Mw8KbuZQv6cDrrdrK0vLmfJMQWwENCljPaP9//lCGSW++uCagMm1igBBCfxl6epSiPQ== X-Received: by 2002:a17:902:e912:: with SMTP id cs18mr5351303plb.130.1554371195207; Thu, 04 Apr 2019 02:46:35 -0700 (PDT) Received: from www3.ntcmd.org ([104.128.68.178]) by smtp.gmail.com with ESMTPSA id q86sm45325714pfi.171.2019.04.04.02.46.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 02:46:34 -0700 (PDT) From: =?utf-8?b?5p2O5Zu9?= To: openwrt-devel@lists.openwrt.org Date: Thu, 4 Apr 2019 17:46:25 +0800 Message-Id: <1554371186-25036-2-git-send-email-uxgood.org@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1554371186-25036-1-git-send-email-uxgood.org@gmail.com> References: <1554371186-25036-1-git-send-email-uxgood.org@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190404_024636_554690_F3CA7759 X-CRM114-Status: GOOD ( 10.20 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:642 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (uxgood.org[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH 2/3] grub2: split to grub2 and grub2-efi packages X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org EFI bootable images need grub2 host packages with efi platform, but grub2 can not build efi platform and pc platform together, so we split it to grub2 and grub2-efi packages. Signed-off-by: 李国 --- package/boot/grub2/Makefile | 93 ----------------------------------- package/boot/grub2/common.mk | 55 +++++++++++++++++++++ package/boot/grub2/grub2-efi/Makefile | 19 +++++++ package/boot/grub2/grub2/Makefile | 46 +++++++++++++++++ 4 files changed, 120 insertions(+), 93 deletions(-) delete mode 100644 package/boot/grub2/Makefile create mode 100644 package/boot/grub2/common.mk create mode 100644 package/boot/grub2/grub2-efi/Makefile create mode 100644 package/boot/grub2/grub2/Makefile diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile deleted file mode 100644 index d6af651..0000000 --- a/package/boot/grub2/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=grub -PKG_CPE_ID:=cpe:/a:gnu:grub2 -PKG_VERSION:=2.02 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNU/grub -PKG_HASH:=810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f - -PKG_FIXUP:=autoreconf -HOST_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=grub2/host - -PKG_SSP:=0 - -PKG_FLAGS:=nonshared - -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/package.mk - -define Package/grub2 - CATEGORY:=Boot Loaders - SECTION:=boot - TITLE:=GRand Unified Bootloader - URL:=http://www.gnu.org/software/grub/ - DEPENDS:=@TARGET_x86 -endef - -define Package/grub2-editenv - CATEGORY:=Utilities - SECTION:=utils - SUBMENU:=Boot Loaders - TITLE:=Grub2 Environment editor - URL:=http://www.gnu.org/software/grub/ - DEPENDS:=@TARGET_x86 -endef - -define Package/grub2-editenv/description - Edit grub2 environment files. -endef - -HOST_BUILD_PREFIX := $(STAGING_DIR_HOST) - -CONFIGURE_VARS += \ - grub_build_mkfont_excuse="don't want fonts" - -CONFIGURE_ARGS += \ - --target=$(REAL_GNU_TARGET_NAME) \ - --disable-werror \ - --disable-nls \ - --disable-device-mapper \ - --disable-libzfs \ - --disable-grub-mkfont \ - --with-platform=none - -HOST_CONFIGURE_VARS += \ - grub_build_mkfont_excuse="don't want fonts" - -HOST_CONFIGURE_ARGS += \ - --disable-grub-mkfont \ - --target=$(REAL_GNU_TARGET_NAME) \ - --sbindir="$(STAGING_DIR_HOST)/bin" \ - --disable-werror \ - --disable-libzfs \ - --disable-nls - -HOST_MAKE_FLAGS += \ - TARGET_RANLIB=$(TARGET_RANLIB) \ - LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a - -define Host/Configure - $(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in - $(Host/Configure/Default) -endef - -define Package/grub2-editenv/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,grub2)) -$(eval $(call BuildPackage,grub2-editenv)) diff --git a/package/boot/grub2/common.mk b/package/boot/grub2/common.mk new file mode 100644 index 0000000..5c7e65d --- /dev/null +++ b/package/boot/grub2/common.mk @@ -0,0 +1,55 @@ +# +# Copyright (C) 2006-2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=grub +PKG_CPE_ID:=cpe:/a:gnu:grub2 +PKG_VERSION:=2.02 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@GNU/grub +PKG_HASH:=810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f + +PKG_FIXUP:=autoreconf +HOST_BUILD_PARALLEL:=1 + +PKG_SSP:=0 + +PKG_FLAGS:=nonshared + +PATCH_DIR:=../patches + +HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)-$(GRUB_PLATFORM)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) +HOST_BUILD_PREFIX := $(STAGING_DIR_HOST) + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + + +HOST_CONFIGURE_VARS += \ + grub_build_mkfont_excuse="don't want fonts" + +HOST_CONFIGURE_ARGS += \ + --disable-grub-mkfont \ + --target=$(REAL_GNU_TARGET_NAME) \ + --sbindir="$(STAGING_DIR_HOST)/bin" \ + --disable-werror \ + --disable-libzfs \ + --disable-nls \ + --with-platform=$(GRUB_PLATFORM) + +HOST_MAKE_FLAGS += \ + TARGET_RANLIB=$(TARGET_RANLIB) \ + LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a + +define Host/Configure + $(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in + $(Host/Configure/Default) +endef diff --git a/package/boot/grub2/grub2-efi/Makefile b/package/boot/grub2/grub2-efi/Makefile new file mode 100644 index 0000000..2fc21fd --- /dev/null +++ b/package/boot/grub2/grub2-efi/Makefile @@ -0,0 +1,19 @@ +GRUB_PLATFORM:=efi + +PKG_BUILD_DEPENDS:=grub2-efi/host +include ../common.mk + +define Package/grub2-efi + CATEGORY:=Boot Loaders + SECTION:=boot + TITLE:=GRand Unified Bootloader(EFI) + URL:=http://www.gnu.org/software/grub/ + DEPENDS:=@TARGET_x86 +endef + +define Host/Install + $(call Host/Compile/Default,install-data) +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,grub2-efi)) diff --git a/package/boot/grub2/grub2/Makefile b/package/boot/grub2/grub2/Makefile new file mode 100644 index 0000000..b1db132 --- /dev/null +++ b/package/boot/grub2/grub2/Makefile @@ -0,0 +1,46 @@ +GRUB_PLATFORM:=pc + +PKG_BUILD_DEPENDS:=grub2/host +include ../common.mk + +define Package/grub2 + CATEGORY:=Boot Loaders + SECTION:=boot + TITLE:=GRand Unified Bootloader + URL:=http://www.gnu.org/software/grub/ + DEPENDS:=@TARGET_x86 +endef + +define Package/grub2-editenv + CATEGORY:=Utilities + SECTION:=utils + SUBMENU:=Boot Loaders + TITLE:=Grub2 Environment editor + URL:=http://www.gnu.org/software/grub/ + DEPENDS:=@TARGET_x86 +endef + +define Package/grub2-editenv/description + Edit grub2 environment files. +endef + +CONFIGURE_VARS += \ + grub_build_mkfont_excuse="don't want fonts" + +CONFIGURE_ARGS += \ + --target=$(REAL_GNU_TARGET_NAME) \ + --disable-werror \ + --disable-nls \ + --disable-device-mapper \ + --disable-libzfs \ + --disable-grub-mkfont \ + --with-platform=none + +define Package/grub2-editenv/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,grub2)) +$(eval $(call BuildPackage,grub2-editenv))