skeleton: Rename skeleton-sysv to skeleton-init-sysv

The skeletons are based on the selection of BR2_INIT_*, so add init- to
the package name to make this clearer. While skeleton-sysv is relatively
clear, skeleton-common and skeleton-none are less clear on their
relationship to BR2_INIT_*. So rename skeleton-sysv to conform to a
clearer pattern.

Signed-off-by: Cam Hutchison <camh@xdna.net>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Config.in b/package/Config.in
index 4bdfeeaedda51bbe368ff461b14a508a479ec37d..ed2a472cef2837aa594e5eee34f8b5961417558d 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -6,7 +6,7 @@ menu "Target packages"
        source "package/skeleton-custom/Config.in"
        source "package/skeleton-init-none/Config.in"
        source "package/skeleton-init-systemd/Config.in"
-       source "package/skeleton-sysv/Config.in"
+       source "package/skeleton-init-sysv/Config.in"
 
 menu "Audio and video applications"
        source "package/alsa-utils/Config.in"

diff --git a/package/skeleton-sysv/Config.in b/package/skeleton-init-sysv/Config.in
similarity index 52%
rename from package/skeleton-sysv/Config.in
rename to package/skeleton-init-sysv/Config.in
index 2f6dbd967311ae44879940cdc034828b6ea3f337..60000e0e92b949900e391cebf326af7b58b5bf6f 100644 (file)
--- a/package/skeleton-sysv/Config.in
+++ b/package/skeleton-init-sysv/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_SKELETON_SYSV
+config BR2_PACKAGE_SKELETON_INIT_SYSV
        bool
        select BR2_PACKAGE_HAS_SKELETON
        select BR2_PACKAGE_SKELETON_COMMON
 
 config BR2_PACKAGE_PROVIDES_SKELETON
-       default "skeleton-sysv" if BR2_PACKAGE_SKELETON_SYSV
+       default "skeleton-init-sysv" if BR2_PACKAGE_SKELETON_INIT_SYSV

diff --git a/package/skeleton-sysv/skeleton-sysv.mk b/package/skeleton-init-sysv/skeleton-init-sysv.mk
similarity index 57%
rename from package/skeleton-sysv/skeleton-sysv.mk
rename to package/skeleton-init-sysv/skeleton-init-sysv.mk
index b5fa396ac2e52b0b12f45c50d62100bbd0923408..dcff2b8edfb9fea7cae9206f954c3de7a888d7a4 100644 (file)
--- a/package/skeleton-sysv/skeleton-sysv.mk
+++ b/package/skeleton-init-sysv/skeleton-init-sysv.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# skeleton-sysv
+# skeleton-init-sysv
 #
 ################################################################################
 
@@ -8,15 +8,15 @@
 # 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_SYSV_ADD_TOOLCHAIN_DEPENDENCY = NO
-SKELETON_SYSV_ADD_SKELETON_DEPENDENCY = NO
+SKELETON_INIT_SYSV_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_SYSV_ADD_SKELETON_DEPENDENCY = NO
 
-SKELETON_SYSV_DEPENDENCIES = skeleton-common
+SKELETON_INIT_SYSV_DEPENDENCIES = skeleton-common
 
-SKELETON_SYSV_PROVIDES = skeleton
+SKELETON_INIT_SYSV_PROVIDES = skeleton
 
-define SKELETON_SYSV_INSTALL_TARGET_CMDS
-       $(call SYSTEM_RSYNC,$(SKELETON_SYSV_PKGDIR)/skeleton,$(TARGET_DIR))
+define SKELETON_INIT_SYSV_INSTALL_TARGET_CMDS
+       $(call SYSTEM_RSYNC,$(SKELETON_INIT_SYSV_PKGDIR)/skeleton,$(TARGET_DIR))
 endef
 
 $(eval $(generic-package))

diff --git a/package/skeleton-sysv/skeleton/dev/log b/package/skeleton-init-sysv/skeleton/dev/log
similarity index 100%
rename from package/skeleton-sysv/skeleton/dev/log
rename to package/skeleton-init-sysv/skeleton/dev/log

diff --git a/package/skeleton-sysv/skeleton/dev/pts/.empty b/package/skeleton-init-sysv/skeleton/dev/pts/.empty
similarity index 100%
rename from package/skeleton-sysv/skeleton/dev/pts/.empty
rename to package/skeleton-init-sysv/skeleton/dev/pts/.empty

diff --git a/package/skeleton-sysv/skeleton/dev/shm/.empty b/package/skeleton-init-sysv/skeleton/dev/shm/.empty
similarity index 100%
rename from package/skeleton-sysv/skeleton/dev/shm/.empty
rename to package/skeleton-init-sysv/skeleton/dev/shm/.empty

diff --git a/package/skeleton-sysv/skeleton/etc/fstab b/package/skeleton-init-sysv/skeleton/etc/fstab
similarity index 100%
rename from package/skeleton-sysv/skeleton/etc/fstab
rename to package/skeleton-init-sysv/skeleton/etc/fstab

diff --git a/package/skeleton-sysv/skeleton/var/cache b/package/skeleton-init-sysv/skeleton/var/cache
similarity index 100%
rename from package/skeleton-sysv/skeleton/var/cache
rename to package/skeleton-init-sysv/skeleton/var/cache

diff --git a/package/skeleton-sysv/skeleton/var/lib/misc b/package/skeleton-init-sysv/skeleton/var/lib/misc
similarity index 100%
rename from package/skeleton-sysv/skeleton/var/lib/misc
rename to package/skeleton-init-sysv/skeleton/var/lib/misc

diff --git a/package/skeleton-sysv/skeleton/var/lock b/package/skeleton-init-sysv/skeleton/var/lock
similarity index 100%
rename from package/skeleton-sysv/skeleton/var/lock
rename to package/skeleton-init-sysv/skeleton/var/lock

diff --git a/package/skeleton-sysv/skeleton/var/log b/package/skeleton-init-sysv/skeleton/var/log
similarity index 100%
rename from package/skeleton-sysv/skeleton/var/log
rename to package/skeleton-init-sysv/skeleton/var/log

diff --git a/package/skeleton-sysv/skeleton/var/run b/package/skeleton-init-sysv/skeleton/var/run
similarity index 100%
rename from package/skeleton-sysv/skeleton/var/run
rename to package/skeleton-init-sysv/skeleton/var/run

diff --git a/package/skeleton-sysv/skeleton/var/spool b/package/skeleton-init-sysv/skeleton/var/spool
similarity index 100%
rename from package/skeleton-sysv/skeleton/var/spool
rename to package/skeleton-init-sysv/skeleton/var/spool

diff --git a/package/skeleton-sysv/skeleton/var/tmp b/package/skeleton-init-sysv/skeleton/var/tmp
similarity index 100%
rename from package/skeleton-sysv/skeleton/var/tmp
rename to package/skeleton-init-sysv/skeleton/var/tmp

diff --git a/system/Config.in b/system/Config.in
index cbde4118956a927070e2401311ef6ce8b5e0e471..b9714923c4b447af6c1c32366c59d67adf4da66c 100644 (file)
--- a/system/Config.in
+++ b/system/Config.in
@@ -9,8 +9,8 @@ choice
 
 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_INIT_SYSV if BR2_INIT_SYSV
+       select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_BUSYBOX
        select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD
        select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE
        help