From patchwork Wed Apr 17 17:54:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McDermott X-Patchwork-Id: 1087099 X-Patchwork-Delegate: ynezz@true.cz 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=none (p=none dis=none) header.from=libiquity.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fSnvAkyw"; 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 44kqfF2zDkz9s4Y for ; Thu, 18 Apr 2019 03:55:49 +1000 (AEST) 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:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=U+DeMe+vYjSBhUTXAS5yU9TUzhLKCZUh1PZAVLRmoRE=; b=fSnvAkyw9pFGRo cj9kX1T+BQO53k2S9TYf7FM62VsqdFPrMKbH2350mC3SVybgy317efMrEyTXLAXi/3IqSI4biU96n KG35WM4iOz69gpr24cZWI9Vjx2NYeS6DyX3HGl3n1Y9e/xrzelF1Jeta/rd7O6GyC8OfZkF/ktLKo +esFAHN6xVSQG5Un0XTVPeOJaBvEiJUva33w7OlphIBkwZ1LO0F2tUfNOeKgyz5ZIKOKBxd2yeBVF CIHPmZpmPvrrtqocdx9s2tH9OQuGXCttHtMHbzZ6JX1EdGUFGSsjFJgsV7bjG9o4TBALid90XKbOi Pjpad97zhGrk0hD2bwRQ==; 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 1hGomS-0008Ty-0j; Wed, 17 Apr 2019 17:55:32 +0000 Received: from lib1.libiquity.com ([24.229.5.118]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGomO-0008TY-GL for openwrt-devel@lists.openwrt.org; Wed, 17 Apr 2019 17:55:29 +0000 Received: from localhost.localdomain (unknown [24.229.5.114]) by lib1.libiquity.com (Postfix) with ESMTP id 86675C07CB; Wed, 17 Apr 2019 13:55:27 -0400 (EDT) From: Patrick McDermott To: Jo-Philipp Wich Date: Wed, 17 Apr 2019 13:54:05 -0400 Message-Id: <20190417175405.2659-1-patrick.mcdermott@libiquity.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190417_105528_632073_3E4B9CC5 X-CRM114-Status: UNSURE ( 5.36 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH][opkg-lede] build: Allow overriding opkg state dir prefix 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: , Cc: openwrt-devel@lists.openwrt.org, Patrick McDermott MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Signed-off-by: Patrick McDermott --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26230b3..f57fe10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ INCLUDE(TestBigEndian) SET(HOST_CPU "" CACHE STRING "Override Host CPU") SET(BUILD_CPU "" CACHE STRING "Override Host CPU") SET(LOCK_FILE "/var/lock/opkg.lock" CACHE STRING "Override lock file path") +SET(STATE_DIR_PREFIX "/usr/lib" CACHE STRING "Override opkg state directory prefix") SET(PATH_SPEC "/usr/sbin:/usr/bin:/sbin:/bin" CACHE STRING "Override default PATH value") SET(VERSION "" CACHE STRING "Override version") @@ -39,7 +40,7 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations -DDATADIR="/usr/share" -DOPKGETCDIR="/etc" -DOPKGLOCKFILE="${LOCK_FILE}" - -DOPKGLIBDIR="/usr/lib" + -DOPKGLIBDIR="${STATE_DIR_PREFIX}" -DHOST_CPU_STR="${HOST_CPU}" -DBUILD_CPU=${BUILD_CPU} -DPATH_SPEC="${PATH_SPEC}"