From c2e50f8fb59356d619d2526c44da2b713e3715bd Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Sat, 11 Mar 2017 00:54:01 +0200 Subject: [PATCH] Bigfix: properly merge the default overlay directory and the overlay bundles. Minor enhancement for the 'static_get' bundle. Currently the 'wget' package from 'static_get' is required to be present in the default overlay directory in order to fix an incompatibility issue with the default implementation of 'wget' in BusyBox. Permanent solution will be to provide the 'wget' from 'static_get' as part of the build process of the 'static_get' overlay bundle. --- src/minimal_overlay/bundles/static_get/02_install.sh | 1 + src/minimal_overlay/overlay_clean.sh | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/minimal_overlay/bundles/static_get/02_install.sh b/src/minimal_overlay/bundles/static_get/02_install.sh index 9d46357dd..611a73ec5 100755 --- a/src/minimal_overlay/bundles/static_get/02_install.sh +++ b/src/minimal_overlay/bundles/static_get/02_install.sh @@ -23,6 +23,7 @@ cp static-get.sh $MAIN_SRC_DIR/work/overlay/staget/staget_installed/opt/staget cd $MAIN_SRC_DIR/work/overlay/staget/staget_installed ln -s ../opt/staget/static-get.sh bin/static-get +ln -s ../opt/staget/static-get.sh bin/mll-get cp -r $MAIN_SRC_DIR/work/overlay/staget/staget_installed/* \ $MAIN_SRC_DIR/work/src/minimal_overlay/rootfs diff --git a/src/minimal_overlay/overlay_clean.sh b/src/minimal_overlay/overlay_clean.sh index 1abc7742c..38c557806 100755 --- a/src/minimal_overlay/overlay_clean.sh +++ b/src/minimal_overlay/overlay_clean.sh @@ -18,6 +18,14 @@ for dir in $(ls -d */ 2>/dev/null) ; do echo "Overlay folder '$dir' has been removed." done +cd $SRC_DIR/../minimal_overlay/rootfs + +# Copy the files/folders from the default overlay folder +for dir in $(ls -d */ 2>/dev/null) ; do + cp -r $dir $SRC_DIR/../work/src/minimal_overlay/rootfs + echo "Default overlay folder '$dir' has been prepared." +done + echo "Ready to continue with the overlay software." cd $SRC_DIR