From patchwork Sun Mar 5 09:31:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 735410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3vbdBh1Z5Mz9s7k for ; Sun, 5 Mar 2017 20:38:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="D6B7CTfJ"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r/I86dYl"; dkim-atps=neutral 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2LH8jTQz7knng2P0v0D7cclxXJGFaAPttohZpAShGkM=; b=D6B7CTfJIqI6O4 YINJ0b+4FRHDqXYSL3ZntfTRVNKCCoq/Dc4TnrtFKNEhJT/8gwrXpiX4pJsGTwu2h0bMq+zIpavjV a7brEOOJTVbxGQcJRbOR71KArsEApD4QSt47H1N0i0XAirL2zd2pdAJulWmw2srVWiyvlQvoqWuih 9HPz7rqhF7tQBstd0BNdk4GvykxzYGDgc3ydf5IYpijIKmUZ6eOCPDHCPcrD16nP4WJ9Tmr1hGFRd 9lADkxOxF506G92/67Dp+4aeOX6fAenOFliM2K4kKG6eGi8dR510w3b6dpQ0gCfd5vsLfopgy+Cti ydQlZVzofjcs8dbpkbzg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ckSbw-00081Y-K8; Sun, 05 Mar 2017 09:37:52 +0000 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ckSWe-0003wn-TA for lede-dev@lists.infradead.org; Sun, 05 Mar 2017 09:32:27 +0000 Received: by mail-pg0-x244.google.com with SMTP id 25so16928648pgy.3 for ; Sun, 05 Mar 2017 01:32:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k1SUdyl+gYW5DL80CCNandHw42jqwMY08f0WFscKesA=; b=r/I86dYlgvA3Izy2w3/naNgVIouP8da/+M+nVrjt7OaNvaO/vwMcNWPimB2DH0de5O 6sNG950ETARhCwvlmDzsx7NUPAOGsoIzHk2J8kv9eldd5KauEPlpxuadFm99ErrHkOc1 E6HwmnxoVsos4XkqU8xdjmS1fN9ZrGKq9K4EUO9BpptLrPJ1zgBG0c2jHW9NoUKbj5ns oAP4wZVPIAWlMbGKs7R0DNnDi3yedxjMNAqmZ/Ytmkrbx86t/g0OgXfMgFksuEocCWFv WgDZeQVvhTZMwCCRJkoxeDBEeEgIOHf9cHSyaT5CVxo+OiFRN67aoh7Payd1O/Q0kxoH BcyQ== 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; bh=k1SUdyl+gYW5DL80CCNandHw42jqwMY08f0WFscKesA=; b=raWt6sssi/zMmWmHt5mT+wKE1xB500NTcTiyeSfIGRkgeAMmIJD3nZVB5VDv6n4cIE xAThncLr7MoT8S/EefaSfLG4ipYS6MrRsEoPdM1sR0WsEy344D9Fv4OSCtpoBAiO50wu 3QU85uYa8BUoKpLoIPtE3irOXDekzmlohLBod590y54kMvnRt7w6Lc+xiD4HOOnq2mJl votuEPSbJ2I/SyN1C/BF3IrxGDCCcJ6K9x4zUAHJNSqxpmeMsxrCR4IlsKQ8dEzGmvyo GGwFh9l3sVjOT4x1FcFVGoF57P8tAiHnWV85csxpqawEeJox26sAvSRTRBc/mwcDXjjc cEaA== X-Gm-Message-State: AMke39kkR9Y9iw+56nO7faYF93gAEk57BHsfDuHStnVi8re3zH+cP/G2myP/vD1Lp3JFFQ== X-Received: by 10.98.222.2 with SMTP id h2mr14080042pfg.113.1488706327077; Sun, 05 Mar 2017 01:32:07 -0800 (PST) Received: from titan.office.mos ([103.29.140.58]) by smtp.gmail.com with ESMTPSA id s65sm33042717pgb.64.2017.03.05.01.32.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Mar 2017 01:32:06 -0800 (PST) From: Yousong Zhou To: jow@mein.io Date: Sun, 5 Mar 2017 17:31:43 +0800 Message-Id: <1488706303-32211-13-git-send-email-yszhou4tech@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1488706303-32211-1-git-send-email-yszhou4tech@gmail.com> References: <1488706303-32211-1-git-send-email-yszhou4tech@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170305_013225_000938_98FF8ECE X-CRM114-Status: UNSURE ( 6.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (yszhou4tech[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH 12/12] iproute2: add ip-tiny, ip-full as alternatives of /sbin/ip X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , lede-dev@lists.infradead.org MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org They will not be in conflict anymore ;) Signed-off-by: Yousong Zhou --- package/network/utils/iproute2/Makefile | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index af8e64c..efc6051 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 PKG_VERSION:=4.4.0 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 @@ -22,23 +22,29 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI include $(INCLUDE_DIR)/package.mk define Package/iproute2/Default - TITLE:=Routing control utility ($(2)) SECTION:=net CATEGORY:=Network URL:=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 SUBMENU:=Routing and Redirection MAINTAINER:=Russell Senior DEPENDS:= +libnl-tiny - VARIANT:=$(1) - PROVIDES:=$(3) endef define Package/ip-tiny -$(call Package/iproute2/Default,tiny,Minimal,ip) - CONFLICTS:=ip-full +$(call Package/iproute2/Default) + TITLE:=Routing control utility (Minimal) + VARIANT:=tiny + PROVIDES:=ip + ALTERNATIVES:=200:/sbin/ip:/sbin/ip-tiny endef -Package/ip-full:=$(call Package/iproute2/Default,full,Full,ip) +define Package/ip-full +$(call Package/iproute2/Default) + TITLE:=Routing control utility (Full) + VARIANT:=full + PROVIDES:=ip + ALTERNATIVES:=300:/sbin/ip:/sbin/ip-full +endef define Package/tc $(call Package/iproute2/Default) @@ -103,13 +109,13 @@ define Build/InstallDev endef define Package/ip-tiny/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/sbin/ip-tiny endef define Package/ip-full/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/sbin/ip-full endef define Package/tc/install