Skip to contentSkip to conversation

Fix missing qstrip for KERNEL_DTS_NAME

PATCH New Jan Viktorin 2 participants 3 messages Mar 8, 2013 – Mar 9, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Fix missing qstrip for KERNEL_DTS_NAME

The BR2_LINUX_KERNEL_CUSTOM_DTS_PATH is quoted and the quotes prevent to build the kernel.

---
 linux/linux.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
linux/linux.mk +1 -1
index 0352acd..a854a63 100644
@@ -55,7 +55,7 @@ LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-
 ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
 KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
 else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
-KERNEL_DTS_NAME = $(basename $(notdir $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))
+KERNEL_DTS_NAME = $(basename $(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))
 endif
 
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
Signature · 1 line
1.7.1
#1 lore raw

PATCH 2/2 Fix PS1

Change prompt when switching to root by su.

---
 system/skeleton/etc/profile |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
system/skeleton/etc/profile +1 -5
index 31d3180..7586f39 100644
@@ -17,11 +17,7 @@ if [ "$PS1" ]; then
 	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:';
     else
-      if [ "`id -u`" -eq 0 ]; then 
-	export PS1='# '
-      else
-	export PS1='$ '
-      fi
+	export PS1='\$ '
     fi
 
     export USER=`id -un`
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/2 Fix PS1

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Jan" == Jan Viktorin <[email protected]> writes:

Jan> Change prompt when switching to root by su.

A more detailed commit message would be good.

The problem with \$ is that busybox (ash) only supports it if CONFIG_FEATURE_EDITING_FANCY_PROMPT is enabled, so that's not really nice.

Jan> Signed-off-by: Jan Viktorin <[email protected]> Jan> ---

 Jan>  system/skeleton/etc/profile |    6 +-----

Jan> 1 files changed, 1 insertions(+), 5 deletions(-)

Jan> diff --git a/system/skeleton/etc/profile b/system/skeleton/etc/profile Jan> index 31d3180..7586f39 100644
Jan> --- a/system/skeleton/etc/profile
Jan> +++ b/system/skeleton/etc/profile
Jan> @@ -17,11 +17,7 @@ if [ "$PS1" ]; then
Jan> alias ls='/bin/ls --color=tty -F'
Jan> 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:';
Jan> else
Jan> - if [ "id -u" -eq 0 ]; then
Jan> - export PS1='# '
Jan> - else
Jan> - export PS1='$ '
Jan> - fi
Jan> + export PS1='\$ '
Jan> fi

Jan> export USER=id -un
Jan> --
Jan> 1.7.1

Jan> _______________________________________________ Jan> buildroot mailing list
Jan> buildroot at busybox.net
Jan> http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 1 line
Bye, Peter Korsgaard