[Buildroot] [PATCH v4 1/3] skeleton: Clean up profile file

[Buildroot] [PATCH v4 1/3] skeleton: Clean up profile file

[Maxime Hadjinlian]

There's a lot of code in /etc/profile, which doesn't really belong in a
minimal default skeleton.

Also, add an 'unset i' to avoid clutter.

If the user has a specific needs, it needs to be added in
/etc/profile.d/ by a post-build script.

Signed-off-by Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v3 -> v4:
    - Enclose export PS1 in a "if [ "$PS1" ]; then" so it's only for an
      interactive session.
    - Fix commit log (add unset i)
v1 -> v2:
    - Don't change indent and don't fix 'pretty' stuff
    - Keep PS1 , PAGER and EDITOR setted.
    - At the end of the for loop, add unset i
---
 system/skeleton/etc/profile         | 56 +++++--------------------------------
 system/skeleton/etc/profile.d/umask |  1 +
 2 files changed, 8 insertions(+), 49 deletions(-)
 create mode 100644 system/skeleton/etc/profile.d/umask

diff --git a/system/skeleton/etc/profile b/system/skeleton/etc/profile
index c7438fe..e44e568 100644
--- a/system/skeleton/etc/profile
+++ b/system/skeleton/etc/profile
@@ -1,66 +1,24 @@
-# ~/.bashrc: executed by bash(1) for non-login interactive shells.
-
 export PATH=\
 /bin:\
 /sbin:\
 /usr/bin:\
-/usr/sbin:\
-/usr/local/bin
+/usr/sbin
 
-# If running interactively, then:
 if [ "$PS1" ]; then
-
-    if [ "$BASH" ]; then
-	export PS1="[\u@\h \W]\\$ "
-	alias ll='/bin/ls --color=tty -laFh'
-	alias ls='/bin/ls --color=tty -F'
-	export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:';
+    if [ "`id -u`" -eq 0 ]; then
+        export PS1='# '
     else
-      if [ "`id -u`" -eq 0 ]; then 
-	export PS1='# '
-      else
-	export PS1='$ '
-      fi
+        export PS1='$ '
     fi
-
-    export USER=`id -un`
-    export LOGNAME=$USER
-    export HOSTNAME=`/bin/hostname`
-    export HISTSIZE=1000
-    export HISTFILESIZE=1000
-    export PAGER='/bin/more '
-    export EDITOR='/bin/vi'
-    export INPUTRC=/etc/inputrc
-    export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
-
-fi;
-
-if [ -z "$LANG" ]; then
-  if [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
-    . "$HOME/.config/locale.conf"
-  elif [ -r /etc/locale.conf ]; then
-    . /etc/locale.conf
-  fi
 fi
 
-LANG=${LANG:-C}
-export LANG
-[ -n "$LC_CTYPE" ]          && export LC_CTYPE
-[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
-[ -n "$LC_TIME" ]           && export LC_TIME
-[ -n "$LC_COLLATE" ]        && export LC_COLLATE
-[ -n "$LC_MONETARY" ]       && export LC_MONETARY
-[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
-[ -n "$LC_PAPER" ]          && export LC_PAPER
-[ -n "$LC_NAME" ]           && export LC_NAME
-[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
-[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
-[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
-[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
+export PAGER='/bin/more '
+export EDITOR='/bin/vi'
 
 # Source configuration files from /etc/profile.d
 for i in /etc/profile.d/*.sh ; do
     if [ -r "$i" ]; then
         . $i
     fi
+    unset i
 done
diff --git a/system/skeleton/etc/profile.d/umask b/system/skeleton/etc/profile.d/umask
new file mode 100644
index 0000000..8e71ad5
--- /dev/null
+++ b/system/skeleton/etc/profile.d/umask
@@ -0,0 +1 @@
+umask 022
-- 
2.5.3

[Buildroot] [PATCH v4 2/3] skeleton: Remove bash specific files

[Maxime Hadjinlian]

Signed-off-by Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 system/skeleton/root/.bash_history | 0
 system/skeleton/root/.bash_logout  | 7 -------
 system/skeleton/root/.bash_profile | 7 -------
 3 files changed, 14 deletions(-)
 delete mode 100644 system/skeleton/root/.bash_history
 delete mode 100644 system/skeleton/root/.bash_logout
 delete mode 100644 system/skeleton/root/.bash_profile

diff --git a/system/skeleton/root/.bash_history b/system/skeleton/root/.bash_history
deleted file mode 100644
index e69de29..0000000
diff --git a/system/skeleton/root/.bash_logout b/system/skeleton/root/.bash_logout
deleted file mode 100644
index 77ef1f9..0000000
--- a/system/skeleton/root/.bash_logout
+++ /dev/null
@@ -1,7 +0,0 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
-
-# when leaving the console clear the screen to increase privacy
-
-case "`tty`" in
-    /dev/tty[0-9]*) clear
-esac
diff --git a/system/skeleton/root/.bash_profile b/system/skeleton/root/.bash_profile
deleted file mode 100644
index 0ee04a3..0000000
--- a/system/skeleton/root/.bash_profile
+++ /dev/null
@@ -1,7 +0,0 @@
-# .bash_profile
-
-umask 022
-
-if [ -f ~/.bashrc ]; then
-    source ~/.bashrc
-fi
-- 
2.5.3

[Buildroot] [PATCH v4 3/3] skeleton: Pretty fixes for /etc/profile

[Maxime Hadjinlian]

Fix indent and put PATH on a single line.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 system/skeleton/etc/profile | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/system/skeleton/etc/profile b/system/skeleton/etc/profile
index e44e568..3a97427 100644
--- a/system/skeleton/etc/profile
+++ b/system/skeleton/etc/profile
@@ -1,15 +1,11 @@
-export PATH=\
-/bin:\
-/sbin:\
-/usr/bin:\
-/usr/sbin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 if [ "$PS1" ]; then
-    if [ "`id -u`" -eq 0 ]; then
-        export PS1='# '
-    else
-        export PS1='$ '
-    fi
+	if [ "`id -u`" -eq 0 ]; then
+		export PS1='# '
+	else
+		export PS1='$ '
+	fi
 fi
 
 export PAGER='/bin/more '
@@ -17,8 +13,8 @@ export EDITOR='/bin/vi'
 
 # Source configuration files from /etc/profile.d
 for i in /etc/profile.d/*.sh ; do
-    if [ -r "$i" ]; then
-        . $i
-    fi
-    unset i
+	if [ -r "$i" ]; then
+		. $i
+	fi
+	unset i
 done
-- 
2.5.3

[Buildroot] [PATCH v4 1/3] skeleton: Clean up profile file

[Luca Ceresoli]

Dear Maxime,

Maxime Hadjinlian wrote:
> There's a lot of code in /etc/profile, which doesn't really belong in a
> minimal default skeleton.
>
> Also, add an 'unset i' to avoid clutter.
>
> If the user has a specific needs, it needs to be added in
> /etc/profile.d/ by a post-build script.
>
> Signed-off-by Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
[Build- and runtime-tested with qemu_arm_versatile_defconfig]
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>

-- 
Luca

[Buildroot] [PATCH v4 2/3] skeleton: Remove bash specific files

[Luca Ceresoli]

Dear Maxime,

Maxime Hadjinlian wrote:
> Signed-off-by Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

> ---> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>   system/skeleton/root/.bash_history | 0
>   system/skeleton/root/.bash_logout  | 7 -------
>   system/skeleton/root/.bash_profile | 7 -------
>   3 files changed, 14 deletions(-)
>   delete mode 100644 system/skeleton/root/.bash_history

...and I guess this one is not even useful when using bash.

Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
[Build- and runtime-tested with qemu_arm_versatile_defconfig]
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>

-- 
Luca

[Buildroot] [PATCH v4 3/3] skeleton: Pretty fixes for /etc/profile

[Luca Ceresoli]

Dear Maxime,

Maxime Hadjinlian wrote:
> Fix indent and put PATH on a single line.
>
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
[Build- and runtime-tested with qemu_arm_versatile_defconfig]
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>

-- 
Luca

[Buildroot] [PATCH v4 1/3] skeleton: Clean up profile file

[Thomas Petazzoni]

Maxime,

On Sat,  3 Oct 2015 16:53:20 +0200, Maxime Hadjinlian wrote:
> There's a lot of code in /etc/profile, which doesn't really belong in a
> minimal default skeleton.
> 
> Also, add an 'unset i' to avoid clutter.
> 
> If the user has a specific needs, it needs to be added in
> /etc/profile.d/ by a post-build script.
> 
> Signed-off-by Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> v3 -> v4:
>     - Enclose export PS1 in a "if [ "$PS1" ]; then" so it's only for an
>       interactive session.
>     - Fix commit log (add unset i)
> v1 -> v2:
>     - Don't change indent and don't fix 'pretty' stuff
>     - Keep PS1 , PAGER and EDITOR setted.
>     - At the end of the for loop, add unset i
> ---
>  system/skeleton/etc/profile         | 56 +++++--------------------------------
>  system/skeleton/etc/profile.d/umask |  1 +
>  2 files changed, 8 insertions(+), 49 deletions(-)
>  create mode 100644 system/skeleton/etc/profile.d/umask

All three patches applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com