[Astlinux-commits] SF.net SVN: astlinux:[6745] branches/1.0

[<abe...@us...>]

Revision: 6745
          http://sourceforge.net/p/astlinux/code/6745
Author:   abelbeck
Date:     2014-10-03 17:38:12 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
bash, add build option BR2_PACKAGE_BASH_DEFAULT_SHELL=y whether to link /bin/sh to bash

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux18.config
    branches/1.0/package/bash/Config.in
    branches/1.0/package/bash/bash.mk

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/astlinux-ast11.config	2014-10-03 17:38:12 UTC (rev 6745)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:48 2014
+# Buildroot 2011.08-svn6744-dirty Configuration
+# Fri Oct  3 12:31:36 2014
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -807,6 +807,7 @@
 #
 # BR2_PACKAGE_AT is not set
 BR2_PACKAGE_BASH=y
+BR2_PACKAGE_BASH_DEFAULT_SHELL=y
 BR2_PACKAGE_DIALOG=y
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_INOTIFY_TOOLS is not set

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/astlinux18.config	2014-10-03 17:38:12 UTC (rev 6745)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:47 2014
+# Buildroot 2011.08-svn6744-dirty Configuration
+# Fri Oct  3 12:31:33 2014
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -807,6 +807,7 @@
 #
 # BR2_PACKAGE_AT is not set
 BR2_PACKAGE_BASH=y
+BR2_PACKAGE_BASH_DEFAULT_SHELL=y
 BR2_PACKAGE_DIALOG=y
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_INOTIFY_TOOLS is not set

Modified: branches/1.0/package/bash/Config.in
===================================================================
--- branches/1.0/package/bash/Config.in	2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/package/bash/Config.in	2014-10-03 17:38:12 UTC (rev 6745)
@@ -5,3 +5,13 @@
 	  The standard GNU Bourne again shell.
 
 	  http://tiswww.case.edu/php/chet/bash/bashtop.html
+
+if BR2_PACKAGE_BASH
+
+config BR2_PACKAGE_BASH_DEFAULT_SHELL
+	bool "bash default shell"
+	default y
+	help
+	  Link /bin/sh to bash
+
+endif

Modified: branches/1.0/package/bash/bash.mk
===================================================================
--- branches/1.0/package/bash/bash.mk	2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/package/bash/bash.mk	2014-10-03 17:38:12 UTC (rev 6745)
@@ -18,22 +18,27 @@
 BASH_DEPENDENCIES += busybox
 endif
 
+ifeq ($(BR2_PACKAGE_BASH_DEFAULT_SHELL),y)
+define BASH_DEFAULT_SHELL
+	if [ -e $(TARGET_DIR)/bin/sh ]; then \
+		mv -f $(TARGET_DIR)/bin/sh $(TARGET_DIR)/bin/sh.prebash; \
+	fi
+	ln -sf bash $(TARGET_DIR)/bin/sh
+endef
+endif
+
 # Save the old sh file/link if there is one and symlink bash->sh
 define BASH_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		DESTDIR=$(TARGET_DIR) exec_prefix=/ install
 	rm -f $(TARGET_DIR)/bin/bashbug
-	if [ -e $(TARGET_DIR)/bin/sh ]; then \
-		mv -f $(TARGET_DIR)/bin/sh $(TARGET_DIR)/bin/sh.prebash; \
-	fi
-	ln -sf bash $(TARGET_DIR)/bin/sh
+	$(BASH_DEFAULT_SHELL)
 endef
 
 # Restore the old shell file/link if there was one
 define BASH_UNINSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) \
 		-C $(BASH_DIR) exec_prefix=/ uninstall
-	rm -f $(TARGET_DIR)/bin/sh
 	if [ -e $(TARGET_DIR)/bin/sh.prebash ]; then \
 		mv -f $(TARGET_DIR)/bin/sh.prebash $(TARGET_DIR)/bin/sh; \
 	fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.