From patchwork Wed Jul 8 06:26:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 492737 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 67304140773 for ; Wed, 8 Jul 2015 16:26:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=G/UMNxRT; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 09CB428436A; Wed, 8 Jul 2015 08:26:23 +0200 (CEST) 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 71EE2283F62 for ; Wed, 8 Jul 2015 08:25:54 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-wg0-f46.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 8 Jul 2015 08:25:53 +0200 (CEST) Received: by wgov12 with SMTP id v12so1556856wgo.1 for ; Tue, 07 Jul 2015 23:26:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=iw335oXWFdKG3OSmypIVvVxhC5XfiQ2Ee61aL28zxDk=; b=G/UMNxRTN/apSwu8+CQFjOYXa77/Jtf06aIqfMg1RpVelYYl9XZo8vrv88HC6DaxCI mINBVCyXRISbPNiET8kfkoftO4gloXozQOXinVZkYj/w8THbNaxXf+aLp/Gf+9vK7kyi BU4Mhwn3loTgfZRoul9gOeo9JTlf9On4Y3eOzZgIL7u6d4OOCVzEdSKylW7yG2L9yTRw gwh7nJPKh1DNilH65XBLzo6Ex5I7oi35EMpvSh/Pn6ifWnJNRwhPdnObGU/RLI+rSvvt kvp0jew8V8oObDhhyVPbOudNmV7f7RSU5iB5BVLitJjNMKp216cdbB99UkApDDf2k0xI 9k6w== X-Received: by 10.195.13.113 with SMTP id ex17mr16750284wjd.17.1436336771444; Tue, 07 Jul 2015 23:26:11 -0700 (PDT) Received: from orion.ocedo.cluj.local ([5.2.198.78]) by smtp.gmail.com with ESMTPSA id ka7sm1636657wjc.36.2015.07.07.23.26.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 23:26:10 -0700 (PDT) From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Wed, 8 Jul 2015 09:26:04 +0300 Message-Id: <1436336764-17470-1-git-send-email-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.1.4 Cc: Helmut Schaa Subject: [OpenWrt-Devel] [PATCH] swconfig: Split libsw out of swconfig for reuse in other packages 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" From: Helmut Schaa Also a bit of an RFC. We use this patch internally. --- package/network/config/swconfig/Makefile | 9 +++++++++ package/network/config/swconfig/src/Makefile | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/network/config/swconfig/Makefile b/package/network/config/swconfig/Makefile index 50d395c..5af31f7 100644 --- a/package/network/config/swconfig/Makefile +++ b/package/network/config/swconfig/Makefile @@ -41,9 +41,18 @@ define Build/Compile LIBS="$(TARGET_LDFLAGS) -lnl-tiny -lm -luci" endef +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/swlib.h $(1)/usr/include/ + + $(INSTALL_DIR) $(1)/lib + $(CP) $(PKG_BUILD_DIR)/libsw.so $(1)/lib/ +endef + define Package/swconfig/install $(INSTALL_DIR) $(1)/sbin $(1)/lib/network $(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/sbin/swconfig + $(INSTALL_BIN) $(PKG_BUILD_DIR)/libsw.so $(1)/lib $(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/ endef diff --git a/package/network/config/swconfig/src/Makefile b/package/network/config/swconfig/src/Makefile index 0d56f43..1176bf0 100644 --- a/package/network/config/swconfig/src/Makefile +++ b/package/network/config/swconfig/src/Makefile @@ -6,7 +6,10 @@ LIBS=-lnl -lnl-genl all: swconfig %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $^ + $(CC) $(CFLAGS) -fPIC -c -o $@ $^ -swconfig: cli.o swlib.o uci.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) +libsw.so: swlib.o + $(CC) $(CFLAGS) -fPIC -shared -o $@ swlib.o + +swconfig: libsw.so cli.o uci.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -L./ -lsw