From patchwork Sun Jul 12 17:43:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1327578 X-Patchwork-Delegate: rsalvaterra@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=YSIltwGg; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BjMMkXlP; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4B4Z0v2S5Kz9sQt for ; Mon, 13 Jul 2020 03:44:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=wXly/Ue29YaQxxvYgc0yEDHprDrhWs/Gh2nldnrwLOA=; b=YSIltwGgIYi0/gZ5kNccmBr22t p1KJAdVlSq7wPmckz8bMDw+S6IxR2cXirx4egsKWmJmW/lIulIbYfdlKrklwMjuoq0RSxQ6m2vntX ED3gY0uN8gfdEmGqlZagflovF3utRKiFRMhFOFu2pPSEuFLjrnh1UE06S8wkHEWc9LQFuRG3wBUbR T9hu+mhaulkKuEaDBz56T1FDljf19zbwBrpnm9PitkwUtGN7avgblakBcysCxfWXeiiGF2u5/8mpx azMPYR+HGygaOE7fmWg9UHiyc8CaD1+km17yrUIg6liTwvhaFNOwpaqAii2l//sFG59gjVFJdDctN /3sgIZ9A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jug0z-0001Vx-2E; Sun, 12 Jul 2020 17:43:49 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jug0w-0001VD-IC for openwrt-devel@lists.openwrt.org; Sun, 12 Jul 2020 17:43:47 +0000 Received: by mail-wm1-x343.google.com with SMTP id j18so10992821wmi.3 for ; Sun, 12 Jul 2020 10:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hTFW0lWZ13u+6ml3ltPjWW4oZQdmSgmQfgjuG1AF++I=; b=BjMMkXlPVkXjP8/AqfM7CcUTwIgBU+UFnVm1afM8b7i6sN0RA8lgtWmEMNu0c9JR5k f96zqrOVeyu6IPGUGo5AfcQpfnS2mh5qBsuF5lKrcQcVdm2GFJerhMUdQf5lGuDqeVyG Nzg6JYMz3XObW4z685Q3Rcc0WdOp58VsuFPjmubqbX3469d0u64w2CVjamW8+mMnJNX7 HTIuoGgNVjRvW/mrrg6KTIrN79GcwWIkD3W5gA3nN7fjgbxLR9DrEH+QgmxG7JXoehpg oOhxrcK+rBr7hhmMoa7zBaqJeCuYVI6AkwR3mv5mPo+oU6qMWOLaFnG+Ogd25imUWnqM u95Q== 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:mime-version :content-transfer-encoding; bh=hTFW0lWZ13u+6ml3ltPjWW4oZQdmSgmQfgjuG1AF++I=; b=IrnYdcTnGobNOpPa85ooU16wEaE5RT1I73CRs3JUG48EKGjYmuF8kIri4vTm9uycZH 307+PimjgNVS3I5SgsbijT6k/VEcDVi0FyL+b6XCO319PLyuhnGbmYmw4itBsi9RwjLU iQqyJ9opMjA+yrnywBLqjSpkHFZWXhd8ilIF7vXcw7mS2Rs+T1E25o43PGoMlJXJLRU3 7LWYRhbOWOETDZvo2bQK+lnj9iFlLQcg7XNCkqJ/y9g87av0j/1Z/D9290ESbuoiv2jT HXm44qsexXbY6sxe+lPtULm9NMFOK2oNuiaE5JB2ASuyguiHBd31bmWvn8UVmYnIRIev gviw== X-Gm-Message-State: AOAM532cg2AA0xaFsns30M0uZ4S1eRbI8wvVYuapXF/V8Gq0WXJXzNS+ HZEziHyEdclaxXWjENvfTiRhnXI= X-Google-Smtp-Source: ABdhPJxo1IelyNCEdnF9eIEetHwJc0/wkD0vf5Nd+WA28gQucwV7+1au62x5exzFbROCKRRt975VGA== X-Received: by 2002:a7b:c246:: with SMTP id b6mr16155216wmj.161.1594575825371; Sun, 12 Jul 2020 10:43:45 -0700 (PDT) Received: from presler.lan (a95-93-116-221.cpe.netcabo.pt. [95.93.116.221]) by smtp.gmail.com with ESMTPSA id 33sm21675723wri.16.2020.07.12.10.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2020 10:43:45 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] procd: Remove the remnants of tmp-on-zram from the makefile Date: Sun, 12 Jul 2020 18:43:33 +0100 Message-Id: <20200712174332.1583-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200712_134346_626680_A2D53D99 X-CRM114-Status: UNSURE ( 7.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:343 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -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 -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Now that this feature is gone, clean-up the makefile accordingly. This patch is a follow-up to "procd: completely remove tmp-on-zram support" Signed-off-by: Rui Salvaterra --- package/system/procd/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 78b2450a04..e090842eb0 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -24,8 +24,7 @@ PKG_MAINTAINER:=John Crispin PKG_ASLR_PIE_REGULAR:=1 PKG_CONFIG_DEPENDS:= \ - CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP \ - CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \ + CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP CONFIG_PROCD_SHOW_BOOT \ CONFIG_KERNEL_NAMESPACES CONFIG_PACKAGE_procd-ujail CONFIG_PACKAGE_procd-seccomp include $(INCLUDE_DIR)/package.mk @@ -87,9 +86,6 @@ config PROCD_SHOW_BOOT default n prompt "Print the shutdown to the console as well as logging it to syslog" -config PROCD_ZRAM_TMPFS - bool - default n endmenu endef @@ -98,10 +94,6 @@ ifeq ($(CONFIG_PROCD_SHOW_BOOT),y) CMAKE_OPTIONS += -DSHOW_BOOT_ON_CONSOLE=1 endif -ifeq ($(CONFIG_PROCD_ZRAM_TMPFS),y) - CMAKE_OPTIONS += -DZRAM_TMPFS=1 -endif - ifdef CONFIG_PACKAGE_procd-ujail CMAKE_OPTIONS += -DJAIL_SUPPORT=1 endif