From patchwork Wed Jun 22 19:07:33 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: 639353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rZZ013rp3z9t0S for ; Thu, 23 Jun 2016 05:09:21 +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=yEXP5Cpm; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1A075C13A9; Wed, 22 Jun 2016 19:09:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NmeTUMMQPQ10; Wed, 22 Jun 2016 19:09:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CA7F0C12DC; Wed, 22 Jun 2016 19:08:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9318D1C1F78 for ; Wed, 22 Jun 2016 19:08:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8F89CC11E1 for ; Wed, 22 Jun 2016 19:08:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AOZeo-WMLlfv for ; Wed, 22 Jun 2016 19:08:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id EF7A3C11F4 for ; Wed, 22 Jun 2016 19:08:04 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id r201so4095122wme.0 for ; Wed, 22 Jun 2016 12:08:04 -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=2IZwn40tGM3Kdea3OXcDeh6AvOkLNIP7t22KGF2Hu5w=; b=yEXP5CpmgyAr996LHxEwtc3ulvYY1EcZ08dMwBPMWTA0pEHob9BQNxveFwCrqoCL9p JhXoVEIb7K92B53xB1MZanbmr82F95ctAHGhcqOKrrXcbcyI9W4j4nGhHPKtDU4x7x7P BR9QRKchLZ0vCchvRa+1Ost4Vd+J05GkeVeNysOzaSyRZ6S1AQHKFY6OtqcDhukEwCb3 5He9cMjeUmFKEGVOAi2d2CnVDAdo4BDC1cwjs4fjNFhPRq1nP2jDqcW5XNmv0mh0Wpmn ArB5CX/vUidJq7YsmX3e53FliG+Disi3jESNYKWkX99p4C+wrODKDypkbs3c+5rTryok SNUg== 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=2IZwn40tGM3Kdea3OXcDeh6AvOkLNIP7t22KGF2Hu5w=; b=bxAplzGhyr+fSe9qwO03NWbSrn4muDNCGOScH8qYPK/+lYxKlfDwR2oFkpzKQD5weM rJNxpXvldMDwnQw+GAcdz6HSK6txTkBKU3ZEkyShsLbuLS+I8mgVancNrKgUq469uAlh dlaFO7cYlMt/Qz3hnAM8bFYeW/jziY167qyS025m0vWY2URJOA1luVPzL+ZthHtmtMLg lj0GQq6fmog4zjV325ZnaX8KXJyecQXldUYYnY0RQG0I9o07nQXq3zE8jQp8tCGp5XRk l2c1+mga85GXEYC3dqS4YTgiaM/nJEaKEzfqvDm/JK5UT2JIWgYoiSCIPhy/SEk/heKs pPjA== X-Gm-Message-State: ALyK8tLlSZUeD1UkD7hE5BzwlAXND3v2EBf2femq5G8nb0pZE+U8tnE/xBPhpJN0q6842Q== X-Received: by 10.194.89.138 with SMTP id bo10mr26195359wjb.122.1466622483363; Wed, 22 Jun 2016 12:08:03 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id f140sm184565wmf.22.2016.06.22.12.08.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jun 2016 12:08:02 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 22 Jun 2016 21:07:33 +0200 Message-Id: <4fb0c79b53f137cd3f1362b3f3ebab44f8b1d782.1466622379.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 11/24 v2] system: do not set hostname and issue 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" We expect the custom skeleton to be fully filled with the necessary files, now. There is definitely no reason we should handle setting the hostname and the issue file in there. A user using a custom skeleton should be fully responsible for providing a functional skeleton. Signed-off-by: "Yann E. MORIN" Reviewed-by: Romain Naour --- Note: beside the skeleton, the only other user of the hostname was the perl package, and it was just previously changed not to use it anymore. --- package/skeleton/skeleton.mk | 8 ++++---- system/Config.in | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 144b759..e67a477 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -110,6 +110,10 @@ define SKELETON_INSTALL_STAGING_CMDS ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK) endef +# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the +# default skeleton. +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) + SKELETON_TARGET_GENERIC_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) SKELETON_TARGET_GENERIC_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE)) SKELETON_TARGET_GENERIC_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD)) @@ -138,10 +142,6 @@ 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"; \ diff --git a/system/Config.in b/system/Config.in index c02f394..3a38bd4 100644 --- a/system/Config.in +++ b/system/Config.in @@ -28,6 +28,8 @@ config BR2_ROOTFS_MERGED_USR endif +if BR2_ROOTFS_SKELETON_DEFAULT + config BR2_TARGET_GENERIC_HOSTNAME string "System hostname" default "buildroot" @@ -46,6 +48,8 @@ config BR2_TARGET_GENERIC_ISSUE Leave empty to not create /etc/issue, or to keep the one from a custom skeleton. +endif + choice bool "Passwords encoding" default BR2_TARGET_GENERIC_PASSWD_MD5