From patchwork Sat Aug 12 12:35:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cam Hutchison X-Patchwork-Id: 800910 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xdna.net header.i=@xdna.net header.b="c9Ppq3li"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xV1gw4kDVz9t2Z for ; Sat, 12 Aug 2017 22:41:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2CC7C8A02C; Sat, 12 Aug 2017 12:40:58 +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 1uChiujRHwnV; Sat, 12 Aug 2017 12:40:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 20CB38A041; Sat, 12 Aug 2017 12:40:57 +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 528531C2578 for ; Sat, 12 Aug 2017 12:40:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4CCFE87BBD for ; Sat, 12 Aug 2017 12:40:54 +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 zMlQ-gGn3top for ; Sat, 12 Aug 2017 12:40:53 +0000 (UTC) X-Greylist: delayed 00:05:10 by SQLgrey-1.7.6 Received: from mail-pf0-f169.google.com (mail-pf0-f169.google.com [209.85.192.169]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A557C87B97 for ; Sat, 12 Aug 2017 12:40:53 +0000 (UTC) Received: by mail-pf0-f169.google.com with SMTP id t86so25684262pfe.2 for ; Sat, 12 Aug 2017 05:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xdna.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s4ghwZFodShoBZ6p6KYuY0PuibQpZJiexcOH0xgpt0A=; b=c9Ppq3liEZucPCo1ahT80g+He8K/bzNmlPYaKSCkwbmS3IqDvkIrMxKehPwA1tn2F0 4S4A837zTzKeA+tuVB5Blsj+0hhW+6rADHY/MvxLXOOiHZ1yA5vIsN//RbMdJcuF3LMI 2zGfxIHS+xm0HkwEg3WuGJWCstY9A457h54Ec= 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=s4ghwZFodShoBZ6p6KYuY0PuibQpZJiexcOH0xgpt0A=; b=NXh8Eomo9cXCloias8nr7Y5WzPX3qlWY5dlWc4ZkW6SKkUUU9XnETE+p/F/u7H0Xnj 5wuQDApvFlOUvvvSJc9pL7kU/uw3hz6tO977DUyX+WV2Dra033OiUfvlXq2rIo/xDbwQ 8SBL1RJ/aaOLUNn+QnZKCwr5b/p7HyHyn5vtyH/AQA1gwJpBdj5FzwqKWNsycVBou8Kz kqprBhm+/MzM9j1SDmg/88hdf+v8VLJripfM7iN/l9gSnh1uTnIEVXMekOBpKFfuYDpT DBqFVej+jLoVaRqTrzFIPHOxAu0r4PVPxvTOtyk7astWxVLSNAJHy7ZGKoJLaGSsgKwR R3sA== X-Gm-Message-State: AHYfb5jhRS2qCo3ZFLPVkeY2FmL5nc7mEHW38ah3ZFbizMhDV4AwYSYV znE94E3uD2qPMv3vPRRX+g== X-Received: by 10.84.225.134 with SMTP id u6mr20901079plj.176.1502541346705; Sat, 12 Aug 2017 05:35:46 -0700 (PDT) Received: from xdna.net (107-220-181-180.cpe.skymesh.net.au. [180.181.220.107]) by smtp.gmail.com with ESMTPSA id o125sm6737182pfg.32.2017.08.12.05.35.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Aug 2017 05:35:46 -0700 (PDT) From: Cam Hutchison To: buildroot@buildroot.org Date: Sat, 12 Aug 2017 22:35:03 +1000 Message-Id: <20170812123505.14714-3-camh@xdna.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170812123505.14714-1-camh@xdna.net> References: <20170812123505.14714-1-camh@xdna.net> Cc: Cam Hutchison , "Yann E . MORIN" Subject: [Buildroot] [PATCH 2/4] skeleton: Rename skeleton-systemd to skeleton-init-systemd 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" The skeletons are based on the selection of BR2_INIT_*, so add init- to the package name to make this clearer. While skeleton-systemd is relatively clear, skeleton-common and skeleton-none are less clear on their relationship to BR2_INIT_*. So rename skeleton-systemd to conform to clearer pattern. Signed-off-by: Cam Hutchison --- package/Config.in | 2 +- .../Config.in | 4 ++-- .../skeleton-init-systemd.mk} | 26 +++++++++++----------- system/Config.in | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) rename package/{skeleton-systemd => skeleton-init-systemd}/Config.in (50%) rename package/{skeleton-systemd/skeleton-systemd.mk => skeleton-init-systemd/skeleton-init-systemd.mk} (72%) diff --git a/package/Config.in b/package/Config.in index b48eac65ca..4bdfeeaedd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -5,7 +5,7 @@ menu "Target packages" source "package/skeleton-common/Config.in" source "package/skeleton-custom/Config.in" source "package/skeleton-init-none/Config.in" - source "package/skeleton-systemd/Config.in" + source "package/skeleton-init-systemd/Config.in" source "package/skeleton-sysv/Config.in" menu "Audio and video applications" diff --git a/package/skeleton-systemd/Config.in b/package/skeleton-init-systemd/Config.in similarity index 50% rename from package/skeleton-systemd/Config.in rename to package/skeleton-init-systemd/Config.in index c507264598..2d8845c281 100644 --- a/package/skeleton-systemd/Config.in +++ b/package/skeleton-init-systemd/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_SKELETON_SYSTEMD +config BR2_PACKAGE_SKELETON_INIT_SYSTEMD bool select BR2_PACKAGE_HAS_SKELETON select BR2_PACKAGE_SKELETON_COMMON config BR2_PACKAGE_PROVIDES_SKELETON - default "skeleton-systemd" if BR2_PACKAGE_SKELETON_SYSTEMD + default "skeleton-init-systemd" if BR2_PACKAGE_SKELETON_INIT_SYSTEMD diff --git a/package/skeleton-systemd/skeleton-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk similarity index 72% rename from package/skeleton-systemd/skeleton-systemd.mk rename to package/skeleton-init-systemd/skeleton-init-systemd.mk index 860ebea2cd..b2a6e266b4 100644 --- a/package/skeleton-systemd/skeleton-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -1,6 +1,6 @@ ################################################################################ # -# skeleton-systemd +# skeleton-init-systemd # ################################################################################ @@ -8,16 +8,16 @@ # skeleton and the toolchain is a target package, as is skeleton. # Hence, skeleton would depends on the toolchain and the toolchain would depend # on skeleton. -SKELETON_SYSTEMD_ADD_TOOLCHAIN_DEPENDENCY = NO -SKELETON_SYSTEMD_ADD_SKELETON_DEPENDENCY = NO +SKELETON_INIT_SYSTEMD_ADD_TOOLCHAIN_DEPENDENCY = NO +SKELETON_INIT_SYSTEMD_ADD_SKELETON_DEPENDENCY = NO -SKELETON_SYSTEMD_DEPENDENCIES = skeleton-common +SKELETON_INIT_SYSTEMD_DEPENDENCIES = skeleton-common -SKELETON_SYSTEMD_PROVIDES = skeleton +SKELETON_INIT_SYSTEMD_PROVIDES = skeleton ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) -define SKELETON_SYSTEMD_ROOT_RO_OR_RW +define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW echo "/dev/root / auto rw 0 1" >$(TARGET_DIR)/etc/fstab mkdir -p $(TARGET_DIR)/var endef @@ -29,7 +29,7 @@ else # filesystem gets created, the /var symlink will be replaced with # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. -define SKELETON_SYSTEMD_ROOT_RO_OR_RW +define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW mkdir -p $(TARGET_DIR)/etc/systemd/tmpfiles.d mkdir -p $(TARGET_DIR)/usr/share/factory/var ln -s usr/share/factory/var $(TARGET_DIR)/var @@ -37,7 +37,7 @@ define SKELETON_SYSTEMD_ROOT_RO_OR_RW echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab endef -define SKELETON_SYSTEMD_PRE_ROOTFS_VAR +define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -f $(TARGET_DIR)/var mkdir $(TARGET_DIR)/var for i in $(TARGET_DIR)/usr/share/factory/var/*; do \ @@ -52,20 +52,20 @@ define SKELETON_SYSTEMD_PRE_ROOTFS_VAR fi; \ done >$(TARGET_DIR)/etc/tmpfiles.d/var-factory.conf endef -SKELETON_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_SYSTEMD_PRE_ROOTFS_VAR +SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR -define SKELETON_SYSTEMD_POST_ROOTFS_VAR +define SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR rm -rf $(TARGET_DIR)/var ln -s usr/share/factory/var $(TARGET_DIR)/var endef -SKELETON_SYSTEMD_ROOTFS_POST_CMD_HOOKS += SKELETON_SYSTEMD_POST_ROOTFS_VAR +SKELETON_INIT_SYSTEMD_ROOTFS_POST_CMD_HOOKS += SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR endif -define SKELETON_SYSTEMD_INSTALL_TARGET_CMDS +define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home mkdir -p $(TARGET_DIR)/srv - $(SKELETON_SYSTEMD_ROOT_RO_OR_RW) + $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef $(eval $(generic-package)) diff --git a/system/Config.in b/system/Config.in index 45326f0985..cbde411895 100644 --- a/system/Config.in +++ b/system/Config.in @@ -11,7 +11,7 @@ config BR2_ROOTFS_SKELETON_DEFAULT bool "default target skeleton" select BR2_PACKAGE_SKELETON_SYSV if BR2_INIT_SYSV select BR2_PACKAGE_SKELETON_SYSV if BR2_INIT_BUSYBOX - select BR2_PACKAGE_SKELETON_SYSTEMD if BR2_INIT_SYSTEMD + select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE help Use default target skeleton