From patchwork Sun Jun 12 21:55:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 634259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rSVCD22Ghz9snl for ; Mon, 13 Jun 2016 07:58:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=mX9puFYP; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BE6A72F603; Sun, 12 Jun 2016 21:57:58 +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 igFaoT3kQb05; Sun, 12 Jun 2016 21:57:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 72C092F935; Sun, 12 Jun 2016 21:56:45 +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 030011C120C for ; Sun, 12 Jun 2016 21:55:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EDDA62F54C for ; Sun, 12 Jun 2016 21:55:58 +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 7WkqcKgSJuhh for ; Sun, 12 Jun 2016 21:55:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by silver.osuosl.org (Postfix) with ESMTPS id ED8F32DF09 for ; Sun, 12 Jun 2016 21:55:42 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id n184so10729122wmn.1 for ; Sun, 12 Jun 2016 14:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=26RrnWBElXvZdpNyHk+8n5dM+OtYg4mi0mRif4dDLD8=; b=mX9puFYPe3rVRkBlvrKeQdHgVFdxbl0MlBK9K0uyze4Gpb8iQtdxmShUlBVd4EP3ye 0a4eeOOhO+Kg+ZnwNGtKh6bbOFxwfW2FtgzECR0WW9iV4gYQ2BOheJdoPBvrmTPhxqz9 jjk3V13cgx5tnUS8Aski2nv+gsTUGZqqdgjFVFfPMa9+DttWuXtXF0fPaW1Uc+KMHCdt xSIeFOqZLXeQWodKAIs0IX2qPaGiFTgxGNN8kJnu1VxJVON3/3QoWaBd1mG16Wi+iPVH dmuj2lMD0wPXW+sKE/Nh60vIpB+8j66HHSLzRY2aRId2sZSEZhBxaTIYc8lJ5poQuCGl 4BZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=26RrnWBElXvZdpNyHk+8n5dM+OtYg4mi0mRif4dDLD8=; b=F9YafN8fcBvRGxsfKdhSegGmBd1XRAzFHwW56iJ+ULG/lbfUqD7SjLUMwWl581TQXh JydJG2cobIVRtYkPyotmsz0ydo+DjwodNb3DbbkOO6j5pkTj7MRJkQH3TNgnvVgilojX 1ypao8/htzhOli+hvPmA5d+i3sNih7U6HTi+UlWJ7shf8CutJ5cQmxE6TWiFoQNxf3JQ 51nhQREeO3MNBFdIy1RNRBymqEs/jjrzaM3ZA92lQXRjVo8f9HFq1kpRu0Xr3wKUML3l 4bv/+Tdw3x6AXqAcLIizp4FM8tBZ68FulQKaUVOvPFf2qDmKwpoT7wA0eINoGkA8ThKd oO0w== X-Gm-Message-State: ALyK8tL4Lm5jjaenmA0kyJjyNXXSUZlf4rZQzG7A9i/3SG3dKwPXDAJWnY6x/zPLea9Q7w== X-Received: by 10.194.39.202 with SMTP id r10mr10969334wjk.93.1465768541571; Sun, 12 Jun 2016 14:55:41 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id e133sm10954151wma.6.2016.06.12.14.55.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Jun 2016 14:55:40 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 12 Jun 2016 23:55:14 +0200 Message-Id: <462a9abc03b184248420c3e95f6d4718e22314b9.1465766789.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 09/24] system: do not handle network settings for custom skeleton X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: "Yann E. MORIN" --- package/skeleton/skeleton.mk | 8 ++++---- system/Config.in | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 3852448..144b759 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -138,6 +138,10 @@ endef TARGET_FINALIZE_HOOKS += SKELETON_SET_ISSUE endif +# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the +# default skeleton. +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) + define SKELETON_SET_NETWORK_LOCALHOST ( \ echo "# interface file auto-generated by buildroot"; \ @@ -171,10 +175,6 @@ endef TARGET_FINALIZE_HOOKS += SKELETON_SET_NETWORK -# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the -# default skeleton. -ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) - ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y) ifeq ($(SKELETON_TARGET_GENERIC_ROOT_PASSWD),) SKELETON_ROOT_PASSWORD = diff --git a/system/Config.in b/system/Config.in index 662443b..c02f394 100644 --- a/system/Config.in +++ b/system/Config.in @@ -352,9 +352,6 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW read-only. If unsure, say Y. -endif # BR2_ROOTFS_SKELETON_DEFAULT - - config BR2_SYSTEM_DHCP string "Network interface to configure through DHCP" default "" @@ -374,6 +371,8 @@ comment "automatic network configuration via DHCP is not compatible with network comment "automatic network configuration via DHCP needs ifupdown or busybox" depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN) +endif # BR2_ROOTFS_SKELETON_DEFAULT + config BR2_TARGET_TZ_INFO bool "Install timezone info" # No timezone for musl; only for uClibc or (e)glibc.