From 5528005736864a846e5a180891b3a6bae2dc8421 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael.steven.mcmahon@gmail.com>
Date: Thu, 16 Nov 2017 12:29:10 -0500
Subject: [PATCH 1/2] Add script to generate overlay_bundle template

---
 src/generate_bundle_skel.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100755 src/generate_bundle_skel.sh

diff --git a/src/generate_bundle_skel.sh b/src/generate_bundle_skel.sh
new file mode 100755
index 000000000..da6cfafc2
--- /dev/null
+++ b/src/generate_bundle_skel.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Generate basic template for a new overlay package
+
+# Rename the package and package version variables and run this script to
+# generate a new overlay template
+
+package=test
+ver=2.1
+
+packcaps=${package^^}
+
+echo "Generating new overlay bundle template for $package..."
+
+cp -r minimal_overlay/bundles/coreutils minimal_overlay/bundles/$package
+sed -i "s/.*Full path.*/# Full path will be something like \'work\/overlay\/$package\/$package-$ver\'./" minimal_overlay/bundles/$package/01_get.sh
+sed -i "s/.*Extract coreutils.*/# Extract coreutils to folder \'work\/overlay\/$package\'./" minimal_overlay/bundles/$package/01_get.sh
+sed -i "s/.*source directory which.*/# Change to the coreutils source directory which ls finds, e.g. \'$package-$ver\'./" minimal_overlay/bundles/$package/02_build.sh
+sed -i "s/COREUTILS/$packcaps/g" minimal_overlay/bundles/$package/01_get.sh
+sed -i "s/COREUTILS/$packcaps/g" minimal_overlay/bundles/$package/02_build.sh
+sed -i "s/coreutils/$package/g" minimal_overlay/bundles/$package/01_get.sh
+sed -i "s/coreutils/$package/g" minimal_overlay/bundles/$package/02_build.sh
+
+echo "Created new overlay bundle for $package."
+echo "Update .config with source location and a brief description."
+echo "Update README with package description and dependencies."

From ec6c3a3b81c434296bcf5e1f449467ff2ebdda99 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael.steven.mcmahon@gmail.com>
Date: Thu, 16 Nov 2017 13:10:02 -0500
Subject: [PATCH 2/2] Separated 01_get and 02_build changes

---
 src/generate_bundle_skel.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/generate_bundle_skel.sh b/src/generate_bundle_skel.sh
index da6cfafc2..0a28a3f26 100755
--- a/src/generate_bundle_skel.sh
+++ b/src/generate_bundle_skel.sh
@@ -13,12 +13,14 @@ packcaps=${package^^}
 echo "Generating new overlay bundle template for $package..."
 
 cp -r minimal_overlay/bundles/coreutils minimal_overlay/bundles/$package
+
 sed -i "s/.*Full path.*/# Full path will be something like \'work\/overlay\/$package\/$package-$ver\'./" minimal_overlay/bundles/$package/01_get.sh
 sed -i "s/.*Extract coreutils.*/# Extract coreutils to folder \'work\/overlay\/$package\'./" minimal_overlay/bundles/$package/01_get.sh
-sed -i "s/.*source directory which.*/# Change to the coreutils source directory which ls finds, e.g. \'$package-$ver\'./" minimal_overlay/bundles/$package/02_build.sh
 sed -i "s/COREUTILS/$packcaps/g" minimal_overlay/bundles/$package/01_get.sh
-sed -i "s/COREUTILS/$packcaps/g" minimal_overlay/bundles/$package/02_build.sh
 sed -i "s/coreutils/$package/g" minimal_overlay/bundles/$package/01_get.sh
+
+sed -i "s/.*source directory which.*/# Change to the coreutils source directory which ls finds, e.g. \'$package-$ver\'./" minimal_overlay/bundles/$package/02_build.sh
+sed -i "s/COREUTILS/$packcaps/g" minimal_overlay/bundles/$package/02_build.sh
 sed -i "s/coreutils/$package/g" minimal_overlay/bundles/$package/02_build.sh
 
 echo "Created new overlay bundle for $package."