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-init-sysv/Config.in b/package/skeleton-init-sysv/Config.in
new file mode 100644 (file)
index 0000000..60000e0
--- /dev/null
+++ b/package/skeleton-init-sysv/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SKELETON_INIT_SYSV
+       bool
+       select BR2_PACKAGE_HAS_SKELETON
+       select BR2_PACKAGE_SKELETON_COMMON
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+       default "skeleton-init-sysv" if BR2_PACKAGE_SKELETON_INIT_SYSV

diff --git a/package/skeleton-init-sysv/skeleton-init-sysv.mk b/package/skeleton-init-sysv/skeleton-init-sysv.mk
new file mode 100644 (file)
index 0000000..dcff2b8
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton-init-sysv.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# skeleton-init-sysv
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# 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_INIT_SYSV_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_SYSV_ADD_SKELETON_DEPENDENCY = NO
+
+SKELETON_INIT_SYSV_DEPENDENCIES = skeleton-common
+
+SKELETON_INIT_SYSV_PROVIDES = skeleton
+
+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-init-sysv/skeleton/dev/log b/package/skeleton-init-sysv/skeleton/dev/log
new file mode 120000 (symlink)
index 0000000..d96b3b1
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/dev/log
@@ -0,0 +1 @@
+../tmp/log
\ No newline at end of file

diff --git a/package/skeleton-init-sysv/skeleton/dev/pts/.empty b/package/skeleton-init-sysv/skeleton/dev/pts/.empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/package/skeleton-init-sysv/skeleton/dev/shm/.empty b/package/skeleton-init-sysv/skeleton/dev/shm/.empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/package/skeleton-init-sysv/skeleton/etc/fstab b/package/skeleton-init-sysv/skeleton/etc/fstab
new file mode 100644 (file)
index 0000000..169054b
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/etc/fstab
@@ -0,0 +1,8 @@
+# <file system>        <mount pt>      <type>  <options>       <dump>  <pass>
+/dev/root      /               ext2    rw,noauto       0       1
+proc           /proc           proc    defaults        0       0
+devpts         /dev/pts        devpts  defaults,gid=5,mode=620,ptmxmode=0666   0       0
+tmpfs          /dev/shm        tmpfs   mode=0777       0       0
+tmpfs          /tmp            tmpfs   mode=1777       0       0
+tmpfs          /run            tmpfs   mode=0755,nosuid,nodev  0       0
+sysfs          /sys            sysfs   defaults        0       0

diff --git a/package/skeleton-init-sysv/skeleton/var/cache b/package/skeleton-init-sysv/skeleton/var/cache
new file mode 120000 (symlink)
index 0000000..1431b0e
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/var/cache
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file

diff --git a/package/skeleton-init-sysv/skeleton/var/lib/misc b/package/skeleton-init-sysv/skeleton/var/lib/misc
new file mode 120000 (symlink)
index 0000000..f1fde8c
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/var/lib/misc
@@ -0,0 +1 @@
+../../tmp
\ No newline at end of file

diff --git a/package/skeleton-init-sysv/skeleton/var/lock b/package/skeleton-init-sysv/skeleton/var/lock
new file mode 120000 (symlink)
index 0000000..1431b0e
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/var/lock
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file

diff --git a/package/skeleton-init-sysv/skeleton/var/log b/package/skeleton-init-sysv/skeleton/var/log
new file mode 120000 (symlink)
index 0000000..1431b0e
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/var/log
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file

diff --git a/package/skeleton-init-sysv/skeleton/var/run b/package/skeleton-init-sysv/skeleton/var/run
new file mode 120000 (symlink)
index 0000000..84ba55b
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/var/run
@@ -0,0 +1 @@
+../run
\ No newline at end of file

diff --git a/package/skeleton-init-sysv/skeleton/var/spool b/package/skeleton-init-sysv/skeleton/var/spool
new file mode 120000 (symlink)
index 0000000..1431b0e
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/var/spool
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file

diff --git a/package/skeleton-init-sysv/skeleton/var/tmp b/package/skeleton-init-sysv/skeleton/var/tmp
new file mode 120000 (symlink)
index 0000000..1431b0e
--- /dev/null
+++ b/package/skeleton-init-sysv/skeleton/var/tmp
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file

diff --git a/package/skeleton-sysv/Config.in b/package/skeleton-sysv/Config.in
deleted file mode 100644 (file)
index 2f6dbd9..0000000
--- a/package/skeleton-sysv/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_SKELETON_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

diff --git a/package/skeleton-sysv/skeleton-sysv.mk b/package/skeleton-sysv/skeleton-sysv.mk
deleted file mode 100644 (file)
index b5fa396..0000000
--- a/package/skeleton-sysv/skeleton-sysv.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#
-# skeleton-sysv
-#
-################################################################################
-
-# The skeleton can't depend on the toolchain, since all packages depends on the
-# 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_SYSV_DEPENDENCIES = skeleton-common
-
-SKELETON_SYSV_PROVIDES = skeleton
-
-define SKELETON_SYSV_INSTALL_TARGET_CMDS
-       $(call SYSTEM_RSYNC,$(SKELETON_SYSV_PKGDIR)/skeleton,$(TARGET_DIR))
-endef
-
-$(eval $(generic-package))

diff --git a/package/skeleton-sysv/skeleton/dev/log b/package/skeleton-sysv/skeleton/dev/log
deleted file mode 120000 (symlink)
index d96b3b1..0000000
--- a/package/skeleton-sysv/skeleton/dev/log
+++ /dev/null
@@ -1 +0,0 @@
-../tmp/log
\ No newline at end of file

diff --git a/package/skeleton-sysv/skeleton/dev/pts/.empty b/package/skeleton-sysv/skeleton/dev/pts/.empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/package/skeleton-sysv/skeleton/dev/shm/.empty b/package/skeleton-sysv/skeleton/dev/shm/.empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/package/skeleton-sysv/skeleton/etc/fstab b/package/skeleton-sysv/skeleton/etc/fstab
deleted file mode 100644 (file)
index 169054b..0000000
--- a/package/skeleton-sysv/skeleton/etc/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
-# <file system>        <mount pt>      <type>  <options>       <dump>  <pass>
-/dev/root      /               ext2    rw,noauto       0       1
-proc           /proc           proc    defaults        0       0
-devpts         /dev/pts        devpts  defaults,gid=5,mode=620,ptmxmode=0666   0       0
-tmpfs          /dev/shm        tmpfs   mode=0777       0       0
-tmpfs          /tmp            tmpfs   mode=1777       0       0
-tmpfs          /run            tmpfs   mode=0755,nosuid,nodev  0       0
-sysfs          /sys            sysfs   defaults        0       0

diff --git a/package/skeleton-sysv/skeleton/var/cache b/package/skeleton-sysv/skeleton/var/cache
deleted file mode 120000 (symlink)
index 1431b0e..0000000
--- a/package/skeleton-sysv/skeleton/var/cache
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file

diff --git a/package/skeleton-sysv/skeleton/var/lib/misc b/package/skeleton-sysv/skeleton/var/lib/misc
deleted file mode 120000 (symlink)
index f1fde8c..0000000
--- a/package/skeleton-sysv/skeleton/var/lib/misc
+++ /dev/null
@@ -1 +0,0 @@
-../../tmp
\ No newline at end of file

diff --git a/package/skeleton-sysv/skeleton/var/lock b/package/skeleton-sysv/skeleton/var/lock
deleted file mode 120000 (symlink)
index 1431b0e..0000000
--- a/package/skeleton-sysv/skeleton/var/lock
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file

diff --git a/package/skeleton-sysv/skeleton/var/log b/package/skeleton-sysv/skeleton/var/log
deleted file mode 120000 (symlink)
index 1431b0e..0000000
--- a/package/skeleton-sysv/skeleton/var/log
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file

diff --git a/package/skeleton-sysv/skeleton/var/run b/package/skeleton-sysv/skeleton/var/run
deleted file mode 120000 (symlink)
index 84ba55b..0000000
--- a/package/skeleton-sysv/skeleton/var/run
+++ /dev/null
@@ -1 +0,0 @@
-../run
\ No newline at end of file

diff --git a/package/skeleton-sysv/skeleton/var/spool b/package/skeleton-sysv/skeleton/var/spool
deleted file mode 120000 (symlink)
index 1431b0e..0000000
--- a/package/skeleton-sysv/skeleton/var/spool
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file

diff --git a/package/skeleton-sysv/skeleton/var/tmp b/package/skeleton-sysv/skeleton/var/tmp
deleted file mode 120000 (symlink)
index 1431b0e..0000000
--- a/package/skeleton-sysv/skeleton/var/tmp
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file

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