From patchwork Fri Jan 23 13:52:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 432173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3B96F1402A0 for ; Sat, 24 Jan 2015 01:05:56 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 65D3F28BE89; Fri, 23 Jan 2015 15:01:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A9C4828BE31 for ; Fri, 23 Jan 2015 15:00:53 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com [209.85.220.51]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 23 Jan 2015 15:00:41 +0100 (CET) Received: by mail-pa0-f51.google.com with SMTP id fb1so8778228pad.10 for ; Fri, 23 Jan 2015 06:03:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pJnnx7GDZ6rE7LeZwqMECMbNGB3fRY7zU8JIZXIXxRk=; b=wYlHqUBR3CRnRyWd/cy7fpB34tSbUcYopz6NZRe8huupXRfvw1EbFrJYOQ0bIds+3v h6R5Oq3OCLV20La+edQjgwSDkH/jqScD4o2BQks1RgFzYwNhm0y1agAtpx23F3QvQe9b YlytrDvKHwZuU83MxO/skDTAaHCQ6UUsQIsuWBsaZvNJTu19gSqIgx5n9EGBcWbS6jDH b8cG4+AsGagoPHNKqge+gKD7ntuKBaL1JOHh+s/j44tUbrMsbNNPBWHbg4aj7zZgQJS/ zEsvxEZJxDjNe98QY53xKXa6oDwv2jMaOMveZKc2PyXgfv5A6QY8dNjVJpdnoLG3I5tv mNzw== X-Received: by 10.66.244.174 with SMTP id xh14mr11565931pac.24.1422021781629; Fri, 23 Jan 2015 06:03:01 -0800 (PST) Received: from debian.corp.sankuai.com ([103.29.140.56]) by mx.google.com with ESMTPSA id pb6sm1459568pdb.93.2015.01.23.06.02.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jan 2015 06:03:00 -0800 (PST) From: Yousong Zhou To: blogic@openwrt.org Date: Fri, 23 Jan 2015 21:52:11 +0800 Message-Id: <1422021132-24526-7-git-send-email-yszhou4tech@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1422021132-24526-1-git-send-email-yszhou4tech@gmail.com> References: <1422021132-24526-1-git-send-email-yszhou4tech@gmail.com> Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [RFC 6/7] kexec-tools: add choice for selecting lzma support. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Yousong Zhou --- package/boot/kexec-tools/Config.in | 5 +++++ package/boot/kexec-tools/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/boot/kexec-tools/Config.in b/package/boot/kexec-tools/Config.in index 2642171..6c7558f 100644 --- a/package/boot/kexec-tools/Config.in +++ b/package/boot/kexec-tools/Config.in @@ -23,4 +23,9 @@ config KEXEC_ZLIB prompt "zlib support" default y +config KEXEC_LZMA + bool + prompt "lzma support" + default n + endmenu diff --git a/package/boot/kexec-tools/Makefile b/package/boot/kexec-tools/Makefile index e884661..4a8900d 100644 --- a/package/boot/kexec-tools/Makefile +++ b/package/boot/kexec-tools/Makefile @@ -17,14 +17,14 @@ PKG_MD5SUM:=05992bc8c0673fc55be7b6d27e48a8db PKG_FIXUP:=autoreconf -PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB +PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB CONFIG_KEXEC_LZMA include $(INCLUDE_DIR)/package.mk define Package/kexec-tools SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@KERNEL_KEXEC @armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib + DEPENDS:=@KERNEL_KEXEC @armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib +KEXEC_LZMA:liblzma TITLE:=Kernel boots kernel URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/ MAINTAINER:=Florian Fainelli @@ -55,7 +55,7 @@ CONFIGURE_ARGS = \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ $(if $(CONFIG_KEXEC_ZLIB),--with,--without)-zlib \ - --without-lzma + $(if $(CONFIG_KEXEC_LZMA),--with,--without)-lzma TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections