From patchwork Sun Jul 28 21:31:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1138078 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=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="exALy5H7"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45xbcl06Lwz9s3l for ; Mon, 29 Jul 2019 07:32:06 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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=82yCpDizlOy47btH4/uhpyJmkx3HilP0hkyYj2iDqm0=; b=exALy5H75HmJXJ sKHGMVhLwdMEhpufjkJQ5CtiK4501A/1srT7D23WWWvFyu+8EWiaa/JPcll5LUBA9K0nmpCECQw0g CMhpiw0sovndKD5kYjhWJStDu36xAXZdsuf1P6+n5HX6pNzJKP0MCyIAXXzQdhl+x5AfIzA7T7PqF LRWOBjno8b+IHJMbAAivgWzYZXHVJfwcncSvaeYBbb1fab6p9P8JguVV5AY2oNiIV2+oI1R/xCyo/ Miwwla/9mib12uWPGUbEqPt3xMtiRGBNMuCEjky014VCRqrba7XtVRiimeL3JDckjSTlupyHbHwe4 6ujkw11DSLSs9lsVhrbw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hrqlf-0001rg-W5; Sun, 28 Jul 2019 21:31:47 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hrqlb-0001rN-7h for openwrt-devel@lists.openwrt.org; Sun, 28 Jul 2019 21:31:45 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 81B203EB8; Sun, 28 Jul 2019 23:31:38 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id c90fa94a; Sun, 28 Jul 2019 23:31:31 +0200 (CEST) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Sun, 28 Jul 2019 23:31:34 +0200 Message-Id: <20190728213134.4937-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190728_143143_579145_D4C91483 X-CRM114-Status: UNSURE ( 7.67 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH] scons: move to packages feed X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This patch removes scons host build tool, as commit 0c090fde68b2 ("scons: move host build tool to a proper place") in the packages feed has moved scons into the new home. There are currently no packages in the master tree which would need scons, yet scons is build always as part of host tools, just in order to satisfy host build dependency of few packages in the packages feeds. Signed-off-by: Petr Štetiar Acked-by: Hauke Mehrtens --- tools/Makefile | 2 +- tools/scons/Makefile | 35 ---------------------- tools/scons/files/pywrap.sh | 15 ---------- tools/scons/patches/001-platform_env.patch | 11 ------- 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 tools/scons/Makefile delete mode 100755 tools/scons/files/pywrap.sh delete mode 100644 tools/scons/patches/001-platform_env.patch diff --git a/tools/Makefile b/tools/Makefile index d7207ba89dd9..a161154b806b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,7 @@ tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage tools-y += firmware-utils patch-image quilt padjffs2 -tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt patchelf +tools-y += mm-macros missing-macros cmake bc findutils gengetopt patchelf tools-y += mtools dosfstools libressl tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_TARGET_x86) += qemu diff --git a/tools/scons/Makefile b/tools/scons/Makefile deleted file mode 100644 index 5ec655416585..000000000000 --- a/tools/scons/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2011-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=scons -PKG_VERSION:=3.0.5 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/scons \ - http://fossies.org/linux/misc/ -PKG_HASH:=df676f23dc6d4bfa384fc389d95dcd21ab907e6349d4c848958ba4befb73c73e - -include $(INCLUDE_DIR)/host-build.mk - -define Host/Configure -endef - -define Host/Compile -endef - -define Host/Install - ./files/pywrap.sh $(HOST_BUILD_DIR)/setup.py install --prefix=$(STAGING_DIR_HOST) - rm -f $(STAGING_DIR_HOST)/bin/scons*.py - for bin in $(STAGING_DIR_HOST)/bin/scons*; do \ - mv "$$$$bin" "$$$$bin.py"; \ - cp ./files/pywrap.sh "$$$$bin"; \ - done -endef - -$(eval $(call HostBuild)) diff --git a/tools/scons/files/pywrap.sh b/tools/scons/files/pywrap.sh deleted file mode 100755 index 53910e947209..000000000000 --- a/tools/scons/files/pywrap.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -case "${0##*/}" in - pywrap.sh) arg1="";; - *) arg1="$0.py" ;; -esac - -for bin in python python3; do - case "$($bin -V 2>&1)" in - "Python 3"*) exec $bin $arg1 "$@" ;; - esac -done - -echo "Unable to find a Python 3.x interpreter for executing ${arg1:+$arg1 }$@ !" >&2 -exit 1 diff --git a/tools/scons/patches/001-platform_env.patch b/tools/scons/patches/001-platform_env.patch deleted file mode 100644 index 2be31470c27d..000000000000 --- a/tools/scons/patches/001-platform_env.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/engine/SCons/Platform/__init__.py -+++ b/engine/SCons/Platform/__init__.py -@@ -65,6 +65,8 @@ def platform_default(): - care about the machine architecture. - """ - osname = os.name -+ if 'PLATFORM' in os.environ: -+ return os.environ['PLATFORM'] - if osname == 'java': - osname = os._osType - if osname == 'posix':