From patchwork Fri Feb 7 22:33:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1235152 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=cHF7E2XJ; 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 48DqpM1vc5z9sRQ for ; Sat, 8 Feb 2020 09:33:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7F0C788076; Fri, 7 Feb 2020 22:33:42 +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 yyHKcH5jJx9Q; Fri, 7 Feb 2020 22:33:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5E865880C4; Fri, 7 Feb 2020 22:33:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5DE5C1BF57C for ; Fri, 7 Feb 2020 22:33:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5A57220416 for ; Fri, 7 Feb 2020 22:33:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C5NI8Hyhashx for ; Fri, 7 Feb 2020 22:33:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by silver.osuosl.org (Postfix) with ESMTPS id 52DAC20385 for ; Fri, 7 Feb 2020 22:33:36 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id l19so627122qtq.8 for ; Fri, 07 Feb 2020 14:33: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=cHF7E2XJj8lQRjj7NLrV2aahaJieT2Ni8pfuEacnutS0VfifsL3ds4rWOGsu4rnI+3 R66tKhQCM6oNI/YZnJ5rPI+0X/i4tjcDg1znXWwkmnxIU/lqc2qoiSQ8LVBR6MzzHq13 cOz/B6ec23Eqsn+K21SdTCKsu8K7TtjaAQsAFX5tEAPjYv9WmkEve3+SuifawJszMwCz OqUnn4nM507g+Dso1/txIoUZgBDVmZDVAdmbUVpTeGYQ8q9A1jso+7BrsgQGaeGogQIi jhyESXB+XajE3NFjMgeHC66qpk8JUHsmB9pmQa4DTn80ft1h+V+FdMBJaGMy+6ONYbMx 2HKg== 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=Of+MIcb4OVdtJzWfT7HT2lTRBzOLaezq2/DmQ3+fCgUnN23kziehKs1G+OIdEaVYbK Yo2XilLXnUM8wFKM4rftn0Fsc8ip/VOI/UJXej6J7SWz0cdgBL0nNKfgT670kVJvEof3 DQ09jwsuZjhrfBPF6cb1K3THwN0NaWtRrU7BVTjaB0pIIYDHtavfo3UzLECmfQCzhzsj foCq/sNhyjxv9f9s/jIe1+lB22pAP3VQBcOSUlB2zw33yNUP8nIcFKU7UZGO3Lkw6xQs 404crBZvrcV8j0SX5Ggcgt/mYb5on6rtaguQAs5psblJxL4aUgYLUnWKUbR0t7FFHkeW uJOA== X-Gm-Message-State: APjAAAUj6mV3Z2pjlhHG2Fwd/NK1G2VaXF0IVO1KrUmoZGNbL7cs4cyc /qzsCkkiXOxLsrN2sqnLdpD8TIV14m0= X-Google-Smtp-Source: APXvYqyS+DzQM1CkCqTpGNF7CmXQ34dzwsuE42QGsVpQSIBSKUmlaLHVI7CD3f0i9wPatBYU2xldQQ== X-Received: by 2002:aed:3286:: with SMTP id z6mr559551qtd.303.1581114814855; Fri, 07 Feb 2020 14:33:34 -0800 (PST) Received: from casantos.remote.com ([191.32.34.199]) by smtp.gmail.com with ESMTPSA id g37sm2185261qte.60.2020.02.07.14.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 14:33:34 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:33:21 -0300 Message-Id: <20200207223322.7182-2-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200207223322.7182-1-unixmania@gmail.com> References: <20200207223322.7182-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH v2 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