From patchwork Thu Feb 6 17:32:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1234474 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; 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=H6KXv+E5; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.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 48D59Q743gz9sRG for ; Fri, 7 Feb 2020 04:32:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 43D728735C; Thu, 6 Feb 2020 17:32:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Oxujlo1bw0sD; Thu, 6 Feb 2020 17:32:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B345A87ADB; Thu, 6 Feb 2020 17:32:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 746551BF326 for ; Thu, 6 Feb 2020 17:32:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 70A1D867A1 for ; Thu, 6 Feb 2020 17:32:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KT7TnXvdv-ic for ; Thu, 6 Feb 2020 17:32:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9E3008679A for ; Thu, 6 Feb 2020 17:32:36 +0000 (UTC) Received: by mail-qk1-f172.google.com with SMTP id b7so6325970qkl.7 for ; Thu, 06 Feb 2020 09:32:36 -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=tWHZ1UjJKgSSAHOwuki5awuGi2QlYxs+bNdLhYFDhtk=; b=H6KXv+E5ifSMYY3y9HMJJ2wbKj9Q/o/4+BZm+Q2l+SFqsmkT8976s2OKk3nwMqi7xt 1B0WL8ILjVDcCn6pyfF/h002fqy2RZhPy//J6Qbj5/tDiyGm6haVvRnTtyHsl7ystina kJHQvRjQsNJ9gPCdJq56AR2a9gV/cEiTJgRFPwmFVsIatrAhUDEq+bwUVnFfoNg6aKkT E+9sZhzskoQrm5is2RL9hWThrTRDRMdJQSqPh4FpLeZYnBPoQL3tf68XZYWoNoXENOGL NigGaK47w0VFeHaod9VJUT+2cx2wXDonZY7Dq3jKOZA6oT4cCn4/SyFJjYoRT2aA9b7/ kwMw== 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=tWHZ1UjJKgSSAHOwuki5awuGi2QlYxs+bNdLhYFDhtk=; b=misUh7gptXKmqqcxtA8EvMC//vXogOvrNdjdn1fAcs7xqYCJ+GtwxJhBrgdBonUlyW xH/OKM87+Lc/XnOIaz1lLufHlP9JenWV1llfdP0qZIbxUqCQtwFbwgyGXti5VeejTC9u zeQJzFLwzKBpk2QHpTvG+0MOqkV/5vwfQG0S5BLfttM4HUKZP2fpGez6+9iANneuQNI6 4ZCx0TpIwYABwlqMsRw2plgvzGlK1vTUBicsBntAX4lBxN5t+JhsDA2qF7Kuk0WBiVzL /XxP/JRCFSTKIu/X7I4r0gKkN40F9BjUDuD+BGFXkePTz+vxIJia+q9TH+at3S1M1YvA 6b6Q== X-Gm-Message-State: APjAAAWNY/qnE7I0gGf+0K3GlSn6zyq4jEQOjSV7JA1Uko0Mo78QUJ3f JxU8MhFZzim09p91smRUF+K9+uXUslU= X-Google-Smtp-Source: APXvYqy+EvM/jnGP9PGKClKXmkwtawhWU87OoFaieLmY0RgHbAubN9SdW6EQj6vjkLuTxdt9yWMzvQ== X-Received: by 2002:a37:8505:: with SMTP id h5mr3478388qkd.281.1581010355347; Thu, 06 Feb 2020 09:32:35 -0800 (PST) Received: from casantos.remote.com ([179.181.67.11]) by smtp.gmail.com with ESMTPSA id d20sm1968417qto.2.2020.02.06.09.32.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 09:32:34 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 14:32:24 -0300 Message-Id: <20200206173225.25677-2-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200206173225.25677-1-unixmania@gmail.com> References: <20200206173225.25677-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 1/2] Revert "system: don't attempt swapon/swapoff in inittab if not available" X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Thomas De Schampheleire , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos This reverts commit c4dce0ae0f5d5d7fecb6f493e974e131a6df43da. A different fix will be provided in a forthcoming patch. --- CC: Thomas De Schampheleire CC: Peter Korsgaard --- package/busybox/busybox.mk | 1 - package/sysvinit/sysvinit.mk | 1 - system/system.mk | 13 ------------- 3 files changed, 15 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 45f74271f2..6283bc96ea 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -226,7 +226,6 @@ endif # BR2_TARGET_GENERIC_GETTY BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB -BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB endif # BR2_INIT_BUSYBOX diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index a717ae0459..c778a9cde5 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -45,6 +45,5 @@ endif # BR2_TARGET_GENERIC_GETTY SYSVINIT_TARGET_FINALIZE_HOOKS += SYSVINIT_SET_GETTY SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB -SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB $(eval $(generic-package)) diff --git a/system/system.mk b/system/system.mk index 6f1f5c27b1..8fe2c138b0 100644 --- a/system/system.mk +++ b/system/system.mk @@ -96,19 +96,6 @@ define SYSTEM_REMOUNT_ROOT_INITTAB endef endif -define SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB - if [ -x $(TARGET_DIR)/sbin/swapon ]; then \ - $(SED) '\%:/sbin/swapon%s/^#*//' $(TARGET_DIR)/etc/inittab ; \ - else \ - $(SED) '\%:/sbin/swapon%s/^#*/#/' $(TARGET_DIR)/etc/inittab ; \ - fi - if [ -x $(TARGET_DIR)/sbin/swapoff ]; then \ - $(SED) '\%:/sbin/swapoff%s/^#*//' $(TARGET_DIR)/etc/inittab ; \ - else \ - $(SED) '\%:/sbin/swapoff%s/^#*/#/' $(TARGET_DIR)/etc/inittab ; \ - fi -endef - ifeq ($(BR_BUILDING)$(BR2_SYSTEM_DEFAULT_PATH),y"") $(error BR2_SYSTEM_DEFAULT_PATH can't be empty) endif