From cbfd0431a728e866a227dc1a01fe65059a469d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 7 Sep 2016 16:27:11 +0100
Subject: Move bash to build-essential

Change-Id: I1241352d459a7614bdf05cb2b4ba6544bfa63fe5
---
 strata/build-essential.morph      | 17 +++++++++++++++++
 strata/build-essential/bash.morph | 38 ++++++++++++++++++++++++++++++++++++++
 strata/core.morph                 |  5 -----
 strata/core/bash.morph            | 38 --------------------------------------
 4 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 strata/build-essential/bash.morph
 delete mode 100644 strata/core/bash.morph

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index aad52460..e9673d17 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -392,3 +392,20 @@ chunks:
   - stage2-reset-specs
   - glibc
   - zlib
+
+- name: bash
+  morph: strata/build-essential/bash.morph
+  repo: upstream:bash
+  ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
+  unpetrify-ref: baserock/bash-4.3-patch-27
+  build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-glibc
+  - stage2-fhs-dirs
+  - stage2-gawk
+  - stage2-gcc
+  - stage2-linux-api-headers
+  - stage2-make
+  - stage2-reset-specs
+  - glibc
diff --git a/strata/build-essential/bash.morph b/strata/build-essential/bash.morph
new file mode 100644
index 00000000..eb267007
--- /dev/null
+++ b/strata/build-essential/bash.morph
@@ -0,0 +1,38 @@
+name: bash
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  export CFLAGS="${CFLAGS}  -DSYS_BASHRC='\"/etc/bash.bashrc\"'";
+  ./configure --prefix="$PREFIX" \
+              --bindir=/bin \
+              --without-bash-malloc \
+              --with-installed-readline \
+              --enable-readline
+post-install-commands:
+- ln -sf /bin/bash "$DESTDIR"/bin/sh
+- |
+  cat <<'EOF' >> bash.bashrc
+  #
+  # /etc/bash.bashrc
+  #
+
+  # If not running interactively, don't do anything
+  [[ $- != *i* ]] && return
+
+  # Configure prompt for different terminals
+  case ${TERM} in
+    xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
+      PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+
+      ;;
+    screen)
+      PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+      ;;
+  esac
+
+  # Enable bash completion if present
+  [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
+  EOF
+- mkdir -p "$DESTDIR"/etc
+- install -m 644 bash.bashrc "$DESTDIR"/etc/bash.bashrc
diff --git a/strata/core.morph b/strata/core.morph
index fbc5cd13..caddb752 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -383,11 +383,6 @@ chunks:
   - autoconf
   - automake
   - perl
-- name: bash
-  morph: strata/core/bash.morph
-  repo: upstream:bash
-  ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
-  unpetrify-ref: baserock/bash-4.3-patch-27
 - name: cmake
   morph: strata/core/cmake.morph
   repo: upstream:cmake
diff --git a/strata/core/bash.morph b/strata/core/bash.morph
deleted file mode 100644
index eb267007..00000000
--- a/strata/core/bash.morph
+++ /dev/null
@@ -1,38 +0,0 @@
-name: bash
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
-  export CFLAGS="${CFLAGS}  -DSYS_BASHRC='\"/etc/bash.bashrc\"'";
-  ./configure --prefix="$PREFIX" \
-              --bindir=/bin \
-              --without-bash-malloc \
-              --with-installed-readline \
-              --enable-readline
-post-install-commands:
-- ln -sf /bin/bash "$DESTDIR"/bin/sh
-- |
-  cat <<'EOF' >> bash.bashrc
-  #
-  # /etc/bash.bashrc
-  #
-
-  # If not running interactively, don't do anything
-  [[ $- != *i* ]] && return
-
-  # Configure prompt for different terminals
-  case ${TERM} in
-    xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
-      PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
-
-      ;;
-    screen)
-      PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
-      ;;
-  esac
-
-  # Enable bash completion if present
-  [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
-  EOF
-- mkdir -p "$DESTDIR"/etc
-- install -m 644 bash.bashrc "$DESTDIR"/etc/bash.bashrc
-- 
cgit v1.2.1