Mercurial > vanilla
changeset 544:91df0731a3f5
vanilla: finalize new FHS
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 10 Apr 2019 20:33:00 +0200 |
parents | f555ed22a53b |
children | c0553584950e |
files | CHANGES.md HOWTO.md core/busybox/config core/etc/passwd core/etc/profile core/sysvinit/inittab |
diffstat | 6 files changed, 37 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES.md Wed Apr 10 20:32:00 2019 +0200 +++ b/CHANGES.md Wed Apr 10 20:33:00 2019 +0200 @@ -4,11 +4,18 @@ vanilla current ------------------------ +### New filesystem hierarchy + +Vanilla does not follow FHS anymore, /usr directory has been removed, /bin and +/sbin have been merged. + +### Default shell + The default toolchain was switched from GCC to LLVM. Templates have been updated accordingly. -The /usr/bin/sh default shell has been set to dash. It is only installed if it -does not already exist so user may set a different default shell if desired. +The /bin/sh default shell has been set to dash. It is only installed if it does +not already exist so user may set a different default shell if desired. vanilla 0.1.0 2019-04-01 ------------------------
--- a/HOWTO.md Wed Apr 10 20:32:00 2019 +0200 +++ b/HOWTO.md Wed Apr 10 20:33:00 2019 +0200 @@ -279,12 +279,12 @@ includes: - /etc/rc.d for service files -- /usr/lib/pkgconfig: for .pc files -- /usr/lib/cmake: for CMake config files -- /usr/lib: for libraries (no lib64 suffix) -- /usr/share/locale: for NLS files -- /usr/share/man/man{1,2,3,4,5,6,7,8}: for man pages (in uncompressed form) -- /usr/share/doc/PKGNAME (exact directory, no version) +- /lib/pkgconfig: for .pc files +- /lib/cmake: for CMake config files +- /lib: for libraries (no lib64 suffix) +- /share/locale: for NLS files +- /share/man/man{1,2,3,4,5,6,7,8}: for man pages (in uncompressed form) +- /share/doc/PKGNAME (exact directory, no version) ## Services @@ -297,7 +297,7 @@ Always add arguments with the invocation. - Starting foo: /usr/bin/foo -d + Starting foo: /bin/foo -d #### stop (required) @@ -310,7 +310,7 @@ Basically, this command just calls stop and start. Stopping foo. - Starting foo: /usr/bin/foo -d + Starting foo: /bin/foo -d #### status @@ -345,10 +345,10 @@ Example (BAD): - rm -f $DESTDIR/usr/lib/*.la + rm -f $DESTDIR/lib/*.la Example (BETTER): - rm -f $DESTDIR/usr/lib/libfoo.la + rm -f $DESTDIR/lib/libfoo.la Assuming the package is "foo".
--- a/core/busybox/config Wed Apr 10 20:32:00 2019 +0200 +++ b/core/busybox/config Wed Apr 10 20:33:00 2019 +0200 @@ -977,7 +977,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_DEFAULT_SCRIPT="/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
--- a/core/etc/passwd Wed Apr 10 20:32:00 2019 +0200 +++ b/core/etc/passwd Wed Apr 10 20:33:00 2019 +0200 @@ -1,8 +1,8 @@ -root:x:0:0:root:/root:/usr/bin/bash -bin:x:1:1:bin:/usr/sbin:/usr/sbin/nologin -daemon:x:2:2:daemon:/sbin:/usr/sbin/nologin -mail:x:3:3:mail:/var/spool/mail:/usr/sbin/nologin -ftp:x:4:4:ftp:/var/ftp:/usr/sbin/nologin -www:x:5:5:www:/var/www:/usr/sbin/nologin -messagebus:x:6:6::/var/empty:/usr/sbin/nologin -nobody:x:7:7:nobody:/var/empty:/usr/sbin/nologin +root:x:0:0:root:/root:/bin/bash +bin:x:1:1:bin:/bin:/bin/nologin +daemon:x:2:2:daemon:/sbin:/bin/nologin +mail:x:3:3:mail:/var/spool/mail:/bin/nologin +ftp:x:4:4:ftp:/var/ftp:/bin/nologin +www:x:5:5:www:/var/www:/bin/nologin +messagebus:x:6:6::/var/empty:/bin/nologin +nobody:x:7:7:nobody:/var/empty:/bin/nologin
--- a/core/etc/profile Wed Apr 10 20:32:00 2019 +0200 +++ b/core/etc/profile Wed Apr 10 20:33:00 2019 +0200 @@ -2,9 +2,4 @@ # /etc/profile: system-wide defaults for shells # -export PS1="\u@\H \w \\$ " -export PATH="/usr/bin:/usr/local/bin" - -if [ "$UID" -eq 0 ]; then - export PATH="$PATH:/usr/sbin:/usr/local/sbin" -fi +export PATH="/bin:/local/bin"
--- a/core/sysvinit/inittab Wed Apr 10 20:32:00 2019 +0200 +++ b/core/sysvinit/inittab Wed Apr 10 20:33:00 2019 +0200 @@ -24,7 +24,7 @@ si::sysinit:/etc/rc.init # Runlevels. -lS:S:wait:/usr/sbin/sulogin +lS:S:wait:/bin/sulogin l0:0:wait:/etc/rc.shutdown 0 l1:1:wait:/etc/rc.start 1 l2:2:wait:/etc/rc.start 2 @@ -34,12 +34,12 @@ l6:6:wait:/etc/rc.shutdown 6 # Shutdown on ctrl+alt+delete. -ca::ctrlaltdel:/usr/sbin/shutdown -t1 -h now +ca::ctrlaltdel:/bin/shutdown -t1 -h now # Console terminals. -c1:2345:respawn:/usr/sbin/agetty --noclear 38400 tty1 linux -c2:2345:respawn:/usr/sbin/agetty 38400 tty2 linux -c3:2345:respawn:/usr/sbin/agetty 38400 tty3 linux -c4:2345:respawn:/usr/sbin/agetty 38400 tty4 linux -c5:2345:respawn:/usr/sbin/agetty 38400 tty5 linux -c6:2345:respawn:/usr/sbin/agetty 38400 tty6 linux +c1:2345:respawn:/bin/agetty --noclear 38400 tty1 linux +c2:2345:respawn:/bin/agetty 38400 tty2 linux +c3:2345:respawn:/bin/agetty 38400 tty3 linux +c4:2345:respawn:/bin/agetty 38400 tty4 linux +c5:2345:respawn:/bin/agetty 38400 tty5 linux +c6:2345:respawn:/bin/agetty 38400 tty6 linux