From: Cam Hutchison Date: Sun, 13 Aug 2017 21:21:11 +0000 (+1000) Subject: skeleton: Rename skeleton-sysv to skeleton-init-sysv X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8bbb040e1e823debc4e92252de0b10ec2853dcf2;p=buildroot.git 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 Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- diff --git a/package/Config.in b/package/Config.in index 4bdfeeaedd..ed2a472cef 100644 --- 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 index 0000000000..60000e0e92 --- /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 index 0000000000..dcff2b8edf --- /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 index 0000000000..d96b3b1cb8 --- /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 index 0000000000..e69de29bb2 diff --git a/package/skeleton-init-sysv/skeleton/dev/shm/.empty b/package/skeleton-init-sysv/skeleton/dev/shm/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package/skeleton-init-sysv/skeleton/etc/fstab b/package/skeleton-init-sysv/skeleton/etc/fstab new file mode 100644 index 0000000000..169054b74f --- /dev/null +++ b/package/skeleton-init-sysv/skeleton/etc/fstab @@ -0,0 +1,8 @@ +# +/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 index 0000000000..1431b0e432 --- /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 index 0000000000..f1fde8c107 --- /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 index 0000000000..1431b0e432 --- /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 index 0000000000..1431b0e432 --- /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 index 0000000000..84ba55b912 --- /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 index 0000000000..1431b0e432 --- /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 index 0000000000..1431b0e432 --- /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 index 2f6dbd9673..0000000000 --- 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 index b5fa396ac2..0000000000 --- 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 index d96b3b1cb8..0000000000 --- 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 index e69de29bb2..0000000000 diff --git a/package/skeleton-sysv/skeleton/dev/shm/.empty b/package/skeleton-sysv/skeleton/dev/shm/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/package/skeleton-sysv/skeleton/etc/fstab b/package/skeleton-sysv/skeleton/etc/fstab deleted file mode 100644 index 169054b74f..0000000000 --- a/package/skeleton-sysv/skeleton/etc/fstab +++ /dev/null @@ -1,8 +0,0 @@ -# -/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 index 1431b0e432..0000000000 --- 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 index f1fde8c107..0000000000 --- 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 index 1431b0e432..0000000000 --- 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 index 1431b0e432..0000000000 --- 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 index 84ba55b912..0000000000 --- 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 index 1431b0e432..0000000000 --- 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 index 1431b0e432..0000000000 --- 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 cbde411895..b9714923c4 100644 --- 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